diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-04-02 02:06:04 -0700 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-04-02 02:06:04 -0700 |
| commit | a7085418df1ada6e19b94b6df772ed21e663d119 (patch) | |
| tree | e660f0e1b310ac7ac53639c2789ddadae291903d /indra/newview/llcallfloater.cpp | |
| parent | 9523c70f9dd3b2db21f6578bbb2b1da6873004ea (diff) | |
| parent | 947bd994885ec59c138a2e3835b940a22ebaea1e (diff) | |
Automated merge
Diffstat (limited to 'indra/newview/llcallfloater.cpp')
| -rw-r--r-- | indra/newview/llcallfloater.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/newview/llcallfloater.cpp b/indra/newview/llcallfloater.cpp index 215f1b95aa..132e4f0933 100644 --- a/indra/newview/llcallfloater.cpp +++ b/indra/newview/llcallfloater.cpp @@ -131,9 +131,7 @@ LLCallFloater::~LLCallFloater() mAvatarListRefreshConnection.disconnect(); mVoiceChannelStateChangeConnection.disconnect(); - // Don't use LLVoiceClient::getInstance() here - // singleton MAY have already been destroyed. - if(LLVoiceClient::getInstance()) + if(LLVoiceClient::instanceExists()) { LLVoiceClient::getInstance()->removeObserver(this); } |