summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelpeople.cpp
diff options
context:
space:
mode:
authorAndrew Dyukov <adyukov@productengine.com>2010-02-19 22:17:31 +0200
committerAndrew Dyukov <adyukov@productengine.com>2010-02-19 22:17:31 +0200
commitcb95fc1f4892c492ce2db9521d57f960c70c4762 (patch)
tree0944a90c35601a5dcec403977f3a75f865170fc6 /indra/newview/llpanelpeople.cpp
parent5e4c434099f370449571bbfa05026556f92c9984 (diff)
No ticket. Replaced calls of LLVoiceClient::getInstance() to LLVoiceClient::instanceExists() in checks before
removal of voice client status observers. These checks were introduced in changeset bc6a6ab2ce54. --HG-- branch : product-engine
Diffstat (limited to 'indra/newview/llpanelpeople.cpp')
-rw-r--r--indra/newview/llpanelpeople.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llpanelpeople.cpp b/indra/newview/llpanelpeople.cpp
index 36fab86280..d2a518a06a 100644
--- a/indra/newview/llpanelpeople.cpp
+++ b/indra/newview/llpanelpeople.cpp
@@ -463,8 +463,10 @@ LLPanelPeople::~LLPanelPeople()
delete mFriendListUpdater;
delete mRecentListUpdater;
- if(LLVoiceClient::getInstance())
+ if(LLVoiceClient::instanceExists())
+ {
LLVoiceClient::getInstance()->removeObserver(this);
+ }
LLView::deleteViewByHandle(mGroupPlusMenuHandle);
LLView::deleteViewByHandle(mNearbyViewSortMenuHandle);