diff options
| author | Oz Linden <oz@lindenlab.com> | 2015-02-24 15:48:28 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2015-02-24 15:48:28 -0500 |
| commit | 905431cf60c5670b6b069f0881778ada6ceaa035 (patch) | |
| tree | 59cc1d383cc9025a499cae686bc5786992d7febe /indra/newview/llviewerparcelmgr.cpp | |
| parent | a91482f0afa38c39a027f5b54bca652147917f2a (diff) | |
| parent | 9b45bc992edf8d049d8a1abe2e778870a493295a (diff) | |
merge changes for 3.7.25-release
Diffstat (limited to 'indra/newview/llviewerparcelmgr.cpp')
| -rwxr-xr-x | indra/newview/llviewerparcelmgr.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llviewerparcelmgr.cpp b/indra/newview/llviewerparcelmgr.cpp index e85d8198aa..991f1c77a5 100755 --- a/indra/newview/llviewerparcelmgr.cpp +++ b/indra/newview/llviewerparcelmgr.cpp @@ -1562,6 +1562,7 @@ void LLViewerParcelMgr::processParcelProperties(LLMessageSystem *msg, void **use if (parcel == parcel_mgr.mAgentParcel) { + // new agent parcel S32 bitmap_size = parcel_mgr.mParcelsPerEdge * parcel_mgr.mParcelsPerEdge / 8; @@ -1591,6 +1592,11 @@ void LLViewerParcelMgr::processParcelProperties(LLMessageSystem *msg, void **use } } } + else if (local_id == parcel_mgr.mAgentParcel->getLocalID()) + { + // updated agent parcel + parcel_mgr.mAgentParcel->unpackMessage(msg); + } } // Handle updating selections, if necessary. |