1 files changed, 24 insertions, 27 deletions

diff --git a/indra/newview/llpanelprofile.cpp b/indra/newview/llpanelprofile.cpp
index b184668290..628ae46a00 100644
--- a/indra/newview/llpanelprofile.cpp
+++ b/indra/newview/llpanelprofile.cpp
@@ -702,10 +702,7 @@ LLPanelProfileSecondLife::~LLPanelProfileSecondLife()
         LLAvatarTracker::instance().removeParticularFriendObserver(getAvatarId(), this);
     }
 
-    if (LLVoiceClient::instanceExists())
-    {
-        LLVoiceClient::getInstance()->removeObserver((LLVoiceClientStatusObserver*)this);
-    }
+    LLVoiceClient::removeObserver((LLVoiceClientStatusObserver*)this);
 
     if (mAvatarNameCacheConnection.connected())
     {
@@ -974,7 +971,7 @@ void LLPanelProfileSecondLife::fillCommonData(const LLAvatarData* avatar_data)
 
     setDescriptionText(avatar_data->about_text);
 
-    mSecondLifePic->setValue(avatar_data->image_id);
+        mSecondLifePic->setValue(avatar_data->image_id);
 
     if (getSelfProfile())
     {
@@ -1122,10 +1119,10 @@ void LLPanelProfileSecondLife::fillAgeData(const LLAvatarData* avatar_data)
     }
     else
     {
-        std::string register_date = getString("age_format");
-        LLSD args_age;
+    std::string register_date = getString("age_format");
+    LLSD args_age;
         args_age["[AGE]"] = LLDateUtil::ageFromDate(avatar_data->born_on, LLDate::now());
-        LLStringUtil::format(register_date, args_age);
+    LLStringUtil::format(register_date, args_age);
         userAgeCtrl->setValue(register_date);
     }
 
@@ -1172,7 +1169,7 @@ void LLPanelProfileSecondLife::changed(U32 mask)
 }
 
 // virtual, called by LLVoiceClient
-void LLPanelProfileSecondLife::onChange(EStatusType status, const std::string &channelURI, bool proximal)
+void LLPanelProfileSecondLife::onChange(EStatusType status, const LLSD& channelInfo, bool proximal)
 {
     if(status == STATUS_JOINING || status == STATUS_LEFT_CHANNEL)
     {
@@ -1575,10 +1572,10 @@ void LLPanelProfileSecondLife::onShowInSearchCallback()
 
     mAllowPublish = value;
     saveAgentUserInfoCoro("allow_publish", value);
-}
+    }
 
 void LLPanelProfileSecondLife::onHideAgeCallback()
-{
+    {
     bool value = mHideAgeCombo->getValue().asInteger();
     if (value == mHideAge)
         return;
@@ -1728,34 +1725,34 @@ void LLPanelProfileSecondLife::onCommitProfileImage(const LLUUID& id)
         return;
 
     std::function<void(bool)> callback = [id](bool result)
-    {
-        if (result)
         {
-            LLAvatarIconIDCache::getInstance()->add(gAgentID, id);
+            if (result)
+            {
+                LLAvatarIconIDCache::getInstance()->add(gAgentID, id);
             // Should trigger callbacks in icon controls (or request Legacy)
-            LLAvatarPropertiesProcessor::getInstance()->sendAvatarPropertiesRequest(gAgentID);
-        }
-    };
+                LLAvatarPropertiesProcessor::getInstance()->sendAvatarPropertiesRequest(gAgentID);
+            }
+        };
 
     if (!saveAgentUserInfoCoro("sl_image_id", id, callback))
         return;
 
     mSecondLifePic->setValue(id);
 
-    LLFloater *floater = mFloaterProfileTextureHandle.get();
-    if (floater)
-    {
-        LLFloaterProfileTexture * texture_view = dynamic_cast<LLFloaterProfileTexture*>(floater);
-        if (id == LLUUID::null)
-        {
-            texture_view->resetAsset();
-        }
-        else
+        LLFloater *floater = mFloaterProfileTextureHandle.get();
+        if (floater)
         {
+            LLFloaterProfileTexture * texture_view = dynamic_cast<LLFloaterProfileTexture*>(floater);
+        if (id == LLUUID::null)
+            {
+                texture_view->resetAsset();
+            }
+            else
+            {
             texture_view->loadAsset(id);
+            }
         }
     }
-}
 
 //////////////////////////////////////////////////////////////////////////
 // LLPanelProfileWeb