From 4cbef6d92877d99dc59ab88c22510d8611c31aa2 Mon Sep 17 00:00:00 2001 From: Kelly Washington Date: Thu, 10 Jan 2013 09:46:41 -0800 Subject: MAINT-2209 Parcel name not updating after teleport --- indra/newview/llviewerparcelmgr.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 -- cgit v1.2.3 From c36d3ea291260a418de48b0be82d9f8e1d0f2071 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Thu, 10 Jan 2013 16:56:02 -0500 Subject: tag merge of DRTVWR-280 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 9a0da76384..2df8c7ad4f 100644 --- a/.hgtags +++ b/.hgtags @@ -398,3 +398,4 @@ c374035d459af3c03dea2dd90880dfc25de64706 DRTVWR-275 7c6dfdc1b7a2ce0d8e3a8f3ce3058547ea065c0f DRTVWR-250 b9ff9730daa53a541925300cbd02bb14575a5705 DRTVWR-277 af6b711a97073431953b55ee808aaa09900c27e5 DRTVWR-276 +c296133849d1f103c0e2abc41e6599daed00b67b DRTVWR-280 -- cgit v1.2.3