diff options
| author | Merov Linden <merov@lindenlab.com> | 2015-02-27 15:32:37 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2015-02-27 15:32:37 -0800 |
| commit | 11d9bf65171016f8c248567dfc743f00b82e9896 (patch) | |
| tree | cc0dbed061ff8da81eaff44707d4e8e7593640c1 /indra/newview/llviewerparcelmgr.cpp | |
| parent | 0177f56fc92536b7fe0c8139ae1e081fd09eacfe (diff) | |
| parent | 9b45bc992edf8d049d8a1abe2e778870a493295a (diff) | |
Pull merge from lindenlab/viewer-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 7c94442f09..2f4365036c 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. |