diff options
| author | William Todd Stinson <stinson@lindenlab.com> | 2012-12-14 17:01:13 -0800 |
|---|---|---|
| committer | William Todd Stinson <stinson@lindenlab.com> | 2012-12-14 17:01:13 -0800 |
| commit | ba8d9afe17a5eb75b7c89b6a1400e412bb473379 (patch) | |
| tree | dc0469ba86649548176157122141e89154c94ac8 /indra/newview/lloutputmonitorctrl.cpp | |
| parent | d0dbdac41dffa8afbebaecb25d0e57e044bf61e6 (diff) | |
| parent | 080a77a0d98905b2eccf9a0a30dbcd691dab83bd (diff) | |
Pull and merge from ssh://stinson@hg.lindenlab.com/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)) |