diff options
| author | Kitty Barnett <develop@catznip.com> | 2010-12-15 20:40:47 +0100 |
|---|---|---|
| committer | Kitty Barnett <develop@catznip.com> | 2010-12-15 20:40:47 +0100 |
| commit | 0f1d337a1e20d2d0f2b16e5df7e94c64a95ca6f0 (patch) | |
| tree | 839424485fc65f5f5094da192dce08943ef2bc78 /indra/newview | |
| parent | fb8ba15801f0620699fecdf2ed08668df0be7210 (diff) | |
STORM-799 FIXED Crash in LLVivoxVoiceClient::notifyStatusObservers()
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llpanelavatar.cpp | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/indra/newview/llpanelavatar.cpp b/indra/newview/llpanelavatar.cpp index 1249d5d856..a9bcdef47c 100644 --- a/indra/newview/llpanelavatar.cpp +++ b/indra/newview/llpanelavatar.cpp @@ -341,10 +341,11 @@ LLPanelAvatarNotes::~LLPanelAvatarNotes() if(getAvatarId().notNull()) { LLAvatarTracker::instance().removeParticularFriendObserver(getAvatarId(), this); - if(LLVoiceClient::instanceExists()) - { - LLVoiceClient::getInstance()->removeObserver((LLVoiceClientStatusObserver*)this); - } + } + + if(LLVoiceClient::instanceExists()) + { + LLVoiceClient::getInstance()->removeObserver((LLVoiceClientStatusObserver*)this); } } @@ -758,10 +759,11 @@ LLPanelAvatarProfile::~LLPanelAvatarProfile() if(getAvatarId().notNull()) { LLAvatarTracker::instance().removeParticularFriendObserver(getAvatarId(), this); - if(LLVoiceClient::instanceExists()) - { - LLVoiceClient::getInstance()->removeObserver((LLVoiceClientStatusObserver*)this); - } + } + + if(LLVoiceClient::instanceExists()) + { + LLVoiceClient::getInstance()->removeObserver((LLVoiceClientStatusObserver*)this); } } |