diff options
author | Merov Linden <merov@lindenlab.com> | 2012-12-14 21:26:02 -0800 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2012-12-14 21:26:02 -0800 |
commit | f8b51f40289255ce38f65830f5bb0f29def3b757 (patch) | |
tree | 43712a7aa38e35d297eba4c74eaa7f03930f777c /indra/newview/lloutputmonitorctrl.cpp | |
parent | d0d8ee87e7648e80b83b125202d6270495e955b6 (diff) | |
parent | ba8d9afe17a5eb75b7c89b6a1400e412bb473379 (diff) |
Pull merge from richard/viewer-chui
Diffstat (limited to 'indra/newview/lloutputmonitorctrl.cpp')
-rw-r--r-- | indra/newview/lloutputmonitorctrl.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/lloutputmonitorctrl.cpp b/indra/newview/lloutputmonitorctrl.cpp index 02841e9831..f6e3c0cac0 100644 --- a/indra/newview/lloutputmonitorctrl.cpp +++ b/indra/newview/lloutputmonitorctrl.cpp @@ -260,6 +260,8 @@ void LLOutputMonitorCtrl::setSpeakerId(const LLUUID& speaker_id, const LLUUID& s if (speaker_id.isNull() && mSpeakerId.notNull()) { LLSpeakingIndicatorManager::unregisterSpeakingIndicator(mSpeakerId, this); + switchIndicator(false); + mSpeakerId = speaker_id; } if (speaker_id.isNull() || (speaker_id == mSpeakerId)) |