1 files changed, 16 insertions, 6 deletions
diff --git a/indra/newview/llfloaterimsession.cpp b/indra/newview/llfloaterimsession.cpp
index a2d1cb7036..f954e72376 100644
--- a/indra/newview/llfloaterimsession.cpp
+++ b/indra/newview/llfloaterimsession.cpp
@@ -94,6 +94,7 @@ LLFloaterIMSession::LLFloaterIMSession(const LLUUID& session_id)
     mEnableCallbackRegistrar.add("Avatar.EnableGearItem", boost::bind(&LLFloaterIMSession::enableGearMenuItem, this, _2));
     mCommitCallbackRegistrar.add("Avatar.GearDoToSelected", boost::bind(&LLFloaterIMSession::GearDoToSelected, this, _2));
     mEnableCallbackRegistrar.add("Avatar.CheckGearItem", boost::bind(&LLFloaterIMSession::checkGearMenuItem, this, _2));
+    mVoiceChannelChanged = LLVoiceChannel::setCurrentVoiceChannelChangedCallback(boost::bind(&LLFloaterIMSession::onVoiceChannelChanged, this, _1));
 
     setDocked(true);
 }
@@ -286,12 +287,12 @@ void LLFloaterIMSession::sendMsg(const std::string& msg)
 LLFloaterIMSession::~LLFloaterIMSession()
 {
     mVoiceChannelStateChangeConnection.disconnect();
-    if(LLVoiceClient::instanceExists())
-    {
-        LLVoiceClient::getInstance()->removeObserver(this);
-    }
+
+    LLVoiceClient::removeObserver(this);
 
     LLTransientFloaterMgr::getInstance()->removeControlView(LLTransientFloaterMgr::IM, this);
+
+    mVoiceChannelChanged.disconnect();
 }
 
 
@@ -363,7 +364,7 @@ BOOL LLFloaterIMSession::postBuild()
 
     childSetAction("voice_call_btn", boost::bind(&LLFloaterIMSession::onCallButtonClicked, this));
 
-    LLVoiceClient::getInstance()->addObserver(this);
+    LLVoiceClient::addObserver(this);
 
     //*TODO if session is not initialized yet, add some sort of a warning message like "starting session...blablabla"
     //see LLFloaterIMPanel for how it is done (IB)
@@ -521,11 +522,20 @@ void LLFloaterIMSession::sendParticipantsAddedNotification(const uuid_vec_t& uui
     sendMsg(getString(uuids.size() > 1 ? "multiple_participants_added" : "participant_added", args));
 }
 
+void LLFloaterIMSession::onVoiceChannelChanged(const LLUUID &session_id)
+{
+    if (session_id == mSessionID)
+    {
+        boundVoiceChannel();
+    }
+}
+
 void LLFloaterIMSession::boundVoiceChannel()
 {
     LLVoiceChannel* voice_channel = LLIMModel::getInstance()->getVoiceChannel(mSessionID);
     if(voice_channel)
     {
+        mVoiceChannelStateChangeConnection.disconnect();
         mVoiceChannelStateChangeConnection = voice_channel->setStateChangedCallback(
                 boost::bind(&LLFloaterIMSession::onVoiceChannelStateChanged, this, _1, _2));
 
@@ -552,7 +562,7 @@ void LLFloaterIMSession::onCallButtonClicked()
     }
 }
 
-void LLFloaterIMSession::onChange(EStatusType status, const std::string &channelURI, bool proximal)
+void LLFloaterIMSession::onChange(EStatusType status, const LLSD& channelInfo, bool proximal)
 {
     if(status != STATUS_JOINING && status != STATUS_LEFT_CHANNEL)
     {