diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-01 16:59:52 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-01 16:59:52 +0000 |
| commit | a8f42e51903bfc35dc56c4dc5f050d1570110634 (patch) | |
| tree | a010c7f3ed662f666a242d3056a811794d309350 /indra/newview/lloutputmonitorctrl.cpp | |
| parent | f7f73568b5b3d63ffe589aeabad02dcb2a6c671c (diff) | |
| parent | 7bcba326b32e1aca678edfb4495d1e2d4d44cb71 (diff) | |
merge
Diffstat (limited to 'indra/newview/lloutputmonitorctrl.cpp')
| -rw-r--r-- | indra/newview/lloutputmonitorctrl.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/lloutputmonitorctrl.cpp b/indra/newview/lloutputmonitorctrl.cpp index f816dc589d..388fdeea7a 100644 --- a/indra/newview/lloutputmonitorctrl.cpp +++ b/indra/newview/lloutputmonitorctrl.cpp @@ -251,6 +251,11 @@ void LLOutputMonitorCtrl::setSpeakerId(const LLUUID& speaker_id) { if (speaker_id.isNull() || speaker_id == mSpeakerId) return; + if (mSpeakerId.notNull()) + { + // Unregister previous registration to avoid crash. EXT-4782. + LLSpeakingIndicatorManager::unregisterSpeakingIndicator(mSpeakerId, this); + } mSpeakerId = speaker_id; LLSpeakingIndicatorManager::registerSpeakingIndicator(mSpeakerId, this); |