summaryrefslogtreecommitdiff
path: root/indra/newview/llvoiceclient.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-03-19 15:25:22 -0400
committerOz Linden <oz@lindenlab.com>2013-03-19 15:25:22 -0400
commit6807214bb988e09e678534f23c8380e811df8831 (patch)
treefc030ee780f7c929c70d7a65d0343fa57b2c739d /indra/newview/llvoiceclient.cpp
parentca17a74f1848b16b8a4f2412ed093aef4bad5830 (diff)
parent04e78ce4fdd3bbc0e4daa1daabbff2de1c425601 (diff)
merge changes for 3.5.0-beta3 (chui)
Diffstat (limited to 'indra/newview/llvoiceclient.cpp')
-rw-r--r--indra/newview/llvoiceclient.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp
index 730f022c50..b46c55321c 100644
--- a/indra/newview/llvoiceclient.cpp
+++ b/indra/newview/llvoiceclient.cpp
@@ -541,6 +541,7 @@ void LLVoiceClient::setMuteMic(bool muted)
{
mMuteMic = muted;
updateMicMuteLogic();
+ mMicroChangedSignal();
}
@@ -551,6 +552,7 @@ void LLVoiceClient::setUserPTTState(bool ptt)
{
mUserPTTState = ptt;
updateMicMuteLogic();
+ mMicroChangedSignal();
}
bool LLVoiceClient::getUserPTTState()