diff options
| author | Mark Palange (Mani) <palange@lindenlab.com> | 2010-11-18 17:03:01 -0800 |
|---|---|---|
| committer | Mark Palange (Mani) <palange@lindenlab.com> | 2010-11-18 17:03:01 -0800 |
| commit | c893c55d8a1328a134c956b70e6fef7fd7053d47 (patch) | |
| tree | b8d3b9eac7f87cce344a96a1fcb0865a557246a1 /indra/newview/llspeakingindicatormanager.cpp | |
| parent | 6802775bc4952874e26f320e1ec7ce9f7ed2e2fb (diff) | |
Fixing bugs discovered in merge with viewer development
Diffstat (limited to 'indra/newview/llspeakingindicatormanager.cpp')
| -rw-r--r-- | indra/newview/llspeakingindicatormanager.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llspeakingindicatormanager.cpp b/indra/newview/llspeakingindicatormanager.cpp index ede1d6bebe..9b38bf22ff 100644 --- a/indra/newview/llspeakingindicatormanager.cpp +++ b/indra/newview/llspeakingindicatormanager.cpp @@ -308,7 +308,10 @@ void LLSpeakingIndicatorManager::registerSpeakingIndicator(const LLUUID& speaker void LLSpeakingIndicatorManager::unregisterSpeakingIndicator(const LLUUID& speaker_id, const LLSpeakingIndicator* const speaking_indicator) { - SpeakingIndicatorManager::instance().unregisterSpeakingIndicator(speaker_id, speaking_indicator); + if(SpeakingIndicatorManager::instanceExists()) + { + SpeakingIndicatorManager::instance().unregisterSpeakingIndicator(speaker_id, speaking_indicator); + } } // EOF |