diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-19 14:51:22 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-19 14:51:22 +0000 |
| commit | 603b5a9fcc57c8248740b43d9f4298cfd1c42715 (patch) | |
| tree | 1a5448d2a1742b52fe221b2769ed87ef1616617f /indra/newview/llvoicechannel.cpp | |
| parent | bbbf3ee86786c6e564f785b7e73091a1c7ca8922 (diff) | |
| parent | 22676e6d38fe938f394a9764b226793b5862768c (diff) | |
PE merge.
Diffstat (limited to 'indra/newview/llvoicechannel.cpp')
| -rw-r--r-- | indra/newview/llvoicechannel.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llvoicechannel.cpp b/indra/newview/llvoicechannel.cpp index dfd67d0c38..fac7fa6a18 100644 --- a/indra/newview/llvoicechannel.cpp +++ b/indra/newview/llvoicechannel.cpp @@ -140,7 +140,10 @@ LLVoiceChannel::LLVoiceChannel(const LLUUID& session_id, const std::string& sess LLVoiceChannel::~LLVoiceChannel() { // Don't use LLVoiceClient::getInstance() here -- this can get called during atexit() time and that singleton MAY have already been destroyed. - if(gVoiceClient) + // Using call of instanceExists() instead of gVoiceClient in check to avoid crash in LLVoiceClient::removeObserver() + // when quitting viewer by closing console window before login (though in case of such quit crash will occur + // later in other destructors anyway). EXT-5524 + if(LLVoiceClient::instanceExists()) { gVoiceClient->removeObserver(this); } |