1 files changed, 9 insertions, 13 deletions
diff --git a/indra/newview/llconversationview.cpp b/indra/newview/llconversationview.cpp
index 1abebc996b..03eb9f0652 100644
--- a/indra/newview/llconversationview.cpp
+++ b/indra/newview/llconversationview.cpp
@@ -57,7 +57,7 @@ public:
     :   conversation(conv)
     {}
 
-    virtual void onChange(EStatusType status, const std::string &channelURI, bool proximal)
+    virtual void onChange(EStatusType status, const LLSD& channelInfo, bool proximal)
     {
         conversation->showVoiceIndicator(conversation
             && status != STATUS_JOINING
@@ -98,10 +98,7 @@ LLConversationViewSession::~LLConversationViewSession()
 
     if (mVoiceClientObserver)
     {
-        if (LLVoiceClient::instanceExists())
-        {
-            LLVoiceClient::getInstance()->removeObserver(mVoiceClientObserver);
-        }
+        LLVoiceClient::removeObserver(mVoiceClientObserver);
         delete mVoiceClientObserver;
     }
 
@@ -259,16 +256,15 @@ BOOL LLConversationViewSession::postBuild()
             icon->setVisible(true);
             mSpeakingIndicator->setSpeakerId(gAgentID, LLUUID::null, true);
             mIsInActiveVoiceChannel = true;
-            if(LLVoiceClient::instanceExists())
+
+            if (mVoiceClientObserver)
             {
-                if (mVoiceClientObserver)
-                {
-                    LLVoiceClient::getInstance()->removeObserver(mVoiceClientObserver);
-                    delete mVoiceClientObserver;
-                }
-                mVoiceClientObserver = new LLNearbyVoiceClientStatusObserver(this);
-                LLVoiceClient::getInstance()->addObserver(mVoiceClientObserver);
+                LLVoiceClient::removeObserver(mVoiceClientObserver);
+                delete mVoiceClientObserver;
             }
+            mVoiceClientObserver = new LLNearbyVoiceClientStatusObserver(this);
+            LLVoiceClient::addObserver(mVoiceClientObserver);
+
             break;
         }
         default: