diff options
| author | James Cook <james@lindenlab.com> | 2010-02-11 10:09:23 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2010-02-11 10:09:23 -0800 |
| commit | 9dd7924b19651abf393f7b0dee632904a6b8e52a (patch) | |
| tree | b22f8ca3ecdf4ec8e5288102912dccdd7289f51f /indra/newview/lloutputmonitorctrl.cpp | |
| parent | 301f250c1cd77711c0234d8ed4089453712f834e (diff) | |
| parent | 39fe664b97b946daf7984b946fede6f04ae731c4 (diff) | |
Merge
Diffstat (limited to 'indra/newview/lloutputmonitorctrl.cpp')
| -rw-r--r-- | indra/newview/lloutputmonitorctrl.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/lloutputmonitorctrl.cpp b/indra/newview/lloutputmonitorctrl.cpp index 388fdeea7a..9857e37bc3 100644 --- a/indra/newview/lloutputmonitorctrl.cpp +++ b/indra/newview/lloutputmonitorctrl.cpp @@ -249,6 +249,11 @@ void LLOutputMonitorCtrl::draw() void LLOutputMonitorCtrl::setSpeakerId(const LLUUID& speaker_id) { + if (speaker_id.isNull() && mSpeakerId.notNull()) + { + LLSpeakingIndicatorManager::unregisterSpeakingIndicator(mSpeakerId, this); + } + if (speaker_id.isNull() || speaker_id == mSpeakerId) return; if (mSpeakerId.notNull()) @@ -256,6 +261,7 @@ void LLOutputMonitorCtrl::setSpeakerId(const LLUUID& speaker_id) // Unregister previous registration to avoid crash. EXT-4782. LLSpeakingIndicatorManager::unregisterSpeakingIndicator(mSpeakerId, this); } + mSpeakerId = speaker_id; LLSpeakingIndicatorManager::registerSpeakingIndicator(mSpeakerId, this); |