livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MAINT-5063 FIXED SLurl display text shows name of parcel in adjacent region when mousing over parcel after region crossing

meow-7.2.2
andreykproductengine 2015-04-08 17:05:47 +03:00
parent ca446ad0b7
commit 00f18efe75
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
indra/newview/llviewerparcelmgr.cpp
View File

@ -1594,8 +1594,14 @@ void LLViewerParcelMgr::processParcelProperties(LLMessageSystem *msg, void **use
}
else if (local_id == parcel_mgr.mAgentParcel->getLocalID())
{
// updated agent parcel
parcel_mgr.mAgentParcel->unpackMessage(msg);
// Parcels in different regions can have same ids.
LLViewerRegion* parcel_region = LLWorld::getInstance()->getRegion( msg->getSender() );
LLViewerRegion* agent_region = gAgent.getRegion();
if (parcel_region && agent_region && parcel_region->getRegionID() == agent_region->getRegionID())
{
// updated agent parcel
parcel_mgr.mAgentParcel->unpackMessage(msg);
}
}
}