Skip to content
Snippets Groups Projects
Commit fca9b867 authored by Oz Linden's avatar Oz Linden
Browse files

merge changes for DRTVWR-280

parents f3b362a6 c36d3ea2
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
.hgtags
+ 1
− 0
View file @ fca9b867
...@@ -400,3 +400,4 @@ e1bb1ae7d8b12faeb37933a737c199cc9b9f89cc 3.4.4-release ...@@ -400,3 +400,4 @@ e1bb1ae7d8b12faeb37933a737c199cc9b9f89cc 3.4.4-release
b9ff9730daa53a541925300cbd02bb14575a5705 DRTVWR-277 b9ff9730daa53a541925300cbd02bb14575a5705 DRTVWR-277
af6b711a97073431953b55ee808aaa09900c27e5 DRTVWR-276 af6b711a97073431953b55ee808aaa09900c27e5 DRTVWR-276
8302fefde6c8f4a64bfc7f04929f8bc85f5c6c7b DRTVWR-279 8302fefde6c8f4a64bfc7f04929f8bc85f5c6c7b DRTVWR-279
c296133849d1f103c0e2abc41e6599daed00b67b DRTVWR-280
indra/newview/llviewerparcelmgr.cpp
+ 2
− 1
View file @ fca9b867
...@@ -1540,7 +1540,8 @@ void LLViewerParcelMgr::processParcelProperties(LLMessageSystem *msg, void **use ...@@ -1540,7 +1540,8 @@ void LLViewerParcelMgr::processParcelProperties(LLMessageSystem *msg, void **use
// Actually extract the data. // Actually extract the data.
if (parcel) if (parcel)
{ {
if (parcel->getLocalID() != INVALID_PARCEL_ID if (sequence_id == SELECTED_PARCEL_SEQ_ID
&& parcel->getLocalID() != INVALID_PARCEL_ID
&& parcel->getLocalID() != local_id) && parcel->getLocalID() != local_id)
{ {
// The parcel has a valid parcel ID but it doesn't match the parcel // The parcel has a valid parcel ID but it doesn't match the parcel
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment