diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-20 21:49:27 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-20 21:49:27 +0000 |
| commit | b05a2dc76acc6c1ca4bfc09de37326027dbf038d (patch) | |
| tree | d0b49adb34e8e163a799d83978fce8bead92d1af /indra/newview/llpanelpeople.cpp | |
| parent | ea8c0d2d7113376efe32e1d9b71c4b03b2ad803f (diff) | |
| parent | f62821fadd50333c367dc5c8de2929273842f9b0 (diff) | |
merge from viewer2
Diffstat (limited to 'indra/newview/llpanelpeople.cpp')
| -rw-r--r-- | indra/newview/llpanelpeople.cpp | 4 |
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); |