diff options
| author | Ychebotarev ProductEngine <ychebotarev@productengine.com> | 2010-02-02 11:15:56 +0200 |
|---|---|---|
| committer | Ychebotarev ProductEngine <ychebotarev@productengine.com> | 2010-02-02 11:15:56 +0200 |
| commit | 7f83000ea13bac5b4cccb9a6f12e764ac8d69b2a (patch) | |
| tree | 9ca8e77a8b67f85a959a867ea9f400c7c11746a2 /indra/newview/lloutputmonitorctrl.cpp | |
| parent | ff4b80f27126adfc11e6facfa53aa1fafd3d19ec (diff) | |
| parent | a359db96eb0273bf67fe48bae2665ea65831cf67 (diff) | |
merge
--HG--
branch : product-engine
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); |