diff options
| author | Palmer Truelson <palmer@lindenlab.com> | 2010-02-22 14:20:50 -0800 |
|---|---|---|
| committer | Palmer Truelson <palmer@lindenlab.com> | 2010-02-22 14:20:50 -0800 |
| commit | dcbbf64c41aac85613591b51071b9453bdb1df0f (patch) | |
| tree | 4c6d654770aa53a2e1f1ca4b24ed9fa8d0a247dc /indra/newview/llpanelavatar.cpp | |
| parent | ca12b3d971db20559cb242417dc6c3f64d63c1d6 (diff) | |
| parent | 722c5fb92ebcf61190edc7ec29c8f5ea1f826cf9 (diff) | |
merge
Diffstat (limited to 'indra/newview/llpanelavatar.cpp')
| -rw-r--r-- | indra/newview/llpanelavatar.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/newview/llpanelavatar.cpp b/indra/newview/llpanelavatar.cpp index 86f101e012..6b07409676 100644 --- a/indra/newview/llpanelavatar.cpp +++ b/indra/newview/llpanelavatar.cpp @@ -352,8 +352,10 @@ LLPanelAvatarNotes::~LLPanelAvatarNotes() if(getAvatarId().notNull()) { LLAvatarTracker::instance().removeParticularFriendObserver(getAvatarId(), this); - if(LLVoiceClient::getInstance()) + if(LLVoiceClient::instanceExists()) + { LLVoiceClient::getInstance()->removeObserver((LLVoiceClientStatusObserver*)this); + } } } @@ -795,8 +797,10 @@ LLPanelAvatarProfile::~LLPanelAvatarProfile() if(getAvatarId().notNull()) { LLAvatarTracker::instance().removeParticularFriendObserver(getAvatarId(), this); - if(LLVoiceClient::getInstance()) + if(LLVoiceClient::instanceExists()) + { LLVoiceClient::getInstance()->removeObserver((LLVoiceClientStatusObserver*)this); + } } } |