diff options
| author | Andrew Dyukov <adyukov@productengine.com> | 2010-02-19 22:17:31 +0200 |
|---|---|---|
| committer | Andrew Dyukov <adyukov@productengine.com> | 2010-02-19 22:17:31 +0200 |
| commit | cb95fc1f4892c492ce2db9521d57f960c70c4762 (patch) | |
| tree | 0944a90c35601a5dcec403977f3a75f865170fc6 /indra/newview/llpanelimcontrolpanel.cpp | |
| parent | 5e4c434099f370449571bbfa05026556f92c9984 (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/llpanelimcontrolpanel.cpp')
| -rw-r--r-- | indra/newview/llpanelimcontrolpanel.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llpanelimcontrolpanel.cpp b/indra/newview/llpanelimcontrolpanel.cpp index 8e305a5674..c34f0633b9 100644 --- a/indra/newview/llpanelimcontrolpanel.cpp +++ b/indra/newview/llpanelimcontrolpanel.cpp @@ -112,8 +112,10 @@ void LLPanelChatControlPanel::updateButtons(bool is_call_started) LLPanelChatControlPanel::~LLPanelChatControlPanel() { mVoiceChannelStateChangeConnection.disconnect(); - if(LLVoiceClient::getInstance()) + if(LLVoiceClient::instanceExists()) + { LLVoiceClient::getInstance()->removeObserver(this); + } } BOOL LLPanelChatControlPanel::postBuild() |