summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorandreykproductengine <akleshchev@productengine.com>2014-09-11 17:31:15 +0300
committerandreykproductengine <akleshchev@productengine.com>2014-09-11 17:31:15 +0300
commit7615008efa39786aabf35b13e9717ff5651f43ff (patch)
tree9fe1f4d44fcc0338b4a8468f7f62cc5cbd5a3c9a /indra
parent71baa9cdf4d74a7ab1d194b4f823416f5f450c39 (diff)
MAINT-4415 FIXED Speak button does not become enabled after enabling voice on parcel, if voice was disabled upon parcel entry
Diffstat (limited to 'indra')
-rwxr-xr-xindra/newview/llviewerparcelmgr.cpp6
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.