1 files changed, 2 insertions, 16 deletions
diff --git a/indra/newview/llpanelprofile.cpp b/indra/newview/llpanelprofile.cpp
index 08605f7cf4..5c54a3fc27 100644
--- a/indra/newview/llpanelprofile.cpp
+++ b/indra/newview/llpanelprofile.cpp
@@ -754,8 +754,6 @@ void LLPanelProfileSecondLife::onOpen(const LLSD& key)
 
     resetData();
 
-    LLUUID avatar_id = getAvatarId();
-
     bool own_profile = getSelfProfile();
 
     mGroupList->setShowNone(!own_profile);
@@ -772,7 +770,7 @@ void LLPanelProfileSecondLife::onOpen(const LLSD& key)
     }
 
     // Init menu, menu needs to be created in scope of a registar to work correctly.
-    LLUICtrl::CommitCallbackRegistry::ScopedRegistrar commit;
+    ScopedRegistrarHelper commit;
     commit.add("Profile.Commit", [this](LLUICtrl*, const LLSD& userdata) { onCommitMenu(userdata); });
 
     LLUICtrl::EnableCallbackRegistry::ScopedRegistrar enable;
@@ -793,7 +791,6 @@ void LLPanelProfileSecondLife::onOpen(const LLSD& key)
 
     if (!own_profile)
     {
-        mVoiceStatus = LLAvatarActions::canCall() && (LLAvatarActions::isFriend(avatar_id) ? LLAvatarTracker::instance().isBuddyOnline(avatar_id) : true);
         updateOnlineStatus();
         fillRightsData();
     }
@@ -1214,17 +1211,6 @@ void LLPanelProfileSecondLife::changed(U32 mask)
     }
 }
 
-// virtual, called by LLVoiceClient
-void LLPanelProfileSecondLife::onChange(EStatusType status, const LLSD& channelInfo, bool proximal)
-{
-    if(status == STATUS_JOINING || status == STATUS_LEFT_CHANNEL)
-    {
-        return;
-    }
-
-    mVoiceStatus = LLAvatarActions::canCall() && (LLAvatarActions::isFriend(getAvatarId()) ? LLAvatarTracker::instance().isBuddyOnline(getAvatarId()) : true);
-}
-
 void LLPanelProfileSecondLife::setAvatarId(const LLUUID& avatar_id)
 {
     if (avatar_id.notNull())
@@ -1502,7 +1488,7 @@ bool LLPanelProfileSecondLife::onEnableMenu(const LLSD& userdata)
     }
     else if (item_name == "voice_call")
     {
-        return mVoiceStatus;
+        return LLAvatarActions::canCallTo(agent_id);
     }
     else if (item_name == "chat_history")
     {