From ddbd1ab47ea6cd76ed3e6bf32ffaeb73a32b4a97 Mon Sep 17 00:00:00 2001
From: Roxie Linden <roxie@lindenlab.com>
Date: Sun, 19 May 2024 02:30:45 -0700
Subject: More session shutdown cleanup

---
 indra/newview/llimview.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'indra/newview/llimview.cpp')

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;
-- 
cgit v1.2.3