diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2024-05-19 02:30:45 -0700 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2024-05-19 02:30:45 -0700 |
| commit | ddbd1ab47ea6cd76ed3e6bf32ffaeb73a32b4a97 (patch) | |
| tree | 2dc638dae2efac22cc3b4783b9ff0a371d58a044 /indra/newview/llimview.cpp | |
| parent | 2b275d43fb70f396bba4249c34442e7d70a76e19 (diff) | |
More session shutdown cleanup
Diffstat (limited to 'indra/newview/llimview.cpp')
| -rw-r--r-- | indra/newview/llimview.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index a411329ffb..5e7814df51 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -789,10 +789,15 @@ LLIMModel::LLIMSession::LLIMSession(const LLUUID& session_id, void LLIMModel::LLIMSession::initVoiceChannel(const LLSD& voiceChannelInfo) { - mVoiceChannelStateChangeConnection.disconnect(); if (mVoiceChannel) { + if (mVoiceChannel->isThisVoiceChannel(voiceChannelInfo)) + { + return; + } + mVoiceChannelStateChangeConnection.disconnect(); + mVoiceChannel->deactivate(); delete mVoiceChannel; |