diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-01-10 16:56:06 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-01-10 16:56:06 -0500 |
| commit | fca9b867335c92adf7543b69489dbb9e9bf7b67c (patch) | |
| tree | 29f5a005ec805320ddbe680acc30de28b0f05fc5 | |
| parent | f3b362a6d4888a47fb59617447a0a59995b39d58 (diff) | |
| parent | c36d3ea291260a418de48b0be82d9f8e1d0f2071 (diff) | |
merge changes for DRTVWR-280
| -rw-r--r-- | .hgtags | 1 | ||||
| -rw-r--r-- | indra/newview/llviewerparcelmgr.cpp | 3 |
2 files changed, 3 insertions, 1 deletions
@@ -400,3 +400,4 @@ e1bb1ae7d8b12faeb37933a737c199cc9b9f89cc 3.4.4-release b9ff9730daa53a541925300cbd02bb14575a5705 DRTVWR-277 af6b711a97073431953b55ee808aaa09900c27e5 DRTVWR-276 8302fefde6c8f4a64bfc7f04929f8bc85f5c6c7b DRTVWR-279 +c296133849d1f103c0e2abc41e6599daed00b67b DRTVWR-280 diff --git a/indra/newview/llviewerparcelmgr.cpp b/indra/newview/llviewerparcelmgr.cpp index 7e524df3f6..33f632b25d 100644 --- a/indra/newview/llviewerparcelmgr.cpp +++ b/indra/newview/llviewerparcelmgr.cpp @@ -1540,7 +1540,8 @@ void LLViewerParcelMgr::processParcelProperties(LLMessageSystem *msg, void **use // 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 |