Commits

Scott Lawrence committed 40a2265 Draft Merge

merge changes for DRTVWR-280

  • Participants
  • Parent commits 3ad7ae8, 08288c8
  • Tags 3.4.5-beta1

Comments (0)

Files changed (2)

 b9ff9730daa53a541925300cbd02bb14575a5705 DRTVWR-277
 af6b711a97073431953b55ee808aaa09900c27e5 DRTVWR-276
 8302fefde6c8f4a64bfc7f04929f8bc85f5c6c7b DRTVWR-279
+c296133849d1f103c0e2abc41e6599daed00b67b DRTVWR-280

File indra/newview/llviewerparcelmgr.cpp

 	// Actually extract the data.
 	if (parcel)
 	{
-		if (parcel->getLocalID() != INVALID_PARCEL_ID
+		if (sequence_id == SELECTED_PARCEL_SEQ_ID
+			&& parcel->getLocalID() != INVALID_PARCEL_ID
 			&& parcel->getLocalID() != local_id)
 		{
 			// The parcel has a valid parcel ID but it doesn't match the parcel