#2303 An error occured while trying to connect to voice

Author: LLGuru

indra/newview/llavataractions.cpp

@@ -303,7 +303,21 @@ bool LLAvatarActions::isCalling(const LLUUID &id)
 //static
 bool LLAvatarActions::canCall()
 {
-    return LLVoiceClient::getInstance()->voiceEnabled() && LLVoiceClient::getInstance()->isVoiceWorking();
+    if (LLVoiceClient* voice_client = LLVoiceClient::getInstance())
+    {
+        return voice_client->voiceEnabled() && voice_client->isVoiceWorking();
+    }
+    return false;
+}
+
+//static
+bool LLAvatarActions::canCallTo(const LLUUID& id)
+{
+    if (LLVoiceClient* voice_client = LLVoiceClient::getInstance())
+    {
+        return voice_client->voiceEnabled() && voice_client->isVoiceWorking() && voice_client->getVoiceEnabled(id);
+    }
+    return false;
 }
 
 // static

indra/newview/llavataractions.h

@@ -184,6 +184,8 @@ class LLAvatarActions
      */
 
     static bool canCall();
+    static bool canCallTo(const LLUUID& id);
+
     /**
      * Invite avatar to a group.
      */

indra/newview/llfloaterbump.cpp

@@ -56,7 +56,7 @@ LLFloaterBump::LLFloaterBump(const LLSD& key)
     mCommitCallbackRegistrar.add("ShowAgentProfile", { boost::bind(&LLFloaterBump::showProfile, this), cb_info::UNTRUSTED_THROTTLE });
     mCommitCallbackRegistrar.add("Avatar.InviteToGroup", { boost::bind(&LLFloaterBump::inviteToGroup, this), cb_info::UNTRUSTED_THROTTLE });
     mCommitCallbackRegistrar.add("Avatar.Call", { boost::bind(&LLFloaterBump::startCall, this), cb_info::UNTRUSTED_BLOCK });
-    mEnableCallbackRegistrar.add("Avatar.EnableCall", boost::bind(&LLAvatarActions::canCall));
+    mEnableCallbackRegistrar.add("Avatar.EnableCall", { boost::bind(&LLFloaterBump::canCall, this), cb_info::UNTRUSTED_BLOCK });
     mCommitCallbackRegistrar.add("Avatar.AddFriend", { boost::bind(&LLFloaterBump::addFriend, this), cb_info::UNTRUSTED_THROTTLE });
     mEnableCallbackRegistrar.add("Avatar.EnableAddFriend", boost::bind(&LLFloaterBump::enableAddFriend, this));
     mCommitCallbackRegistrar.add("Avatar.Mute", { boost::bind(&LLFloaterBump::muteAvatar, this), cb_info::UNTRUSTED_BLOCK });
@@ -214,6 +214,11 @@ void LLFloaterBump::startCall()
     LLAvatarActions::startCall(mItemUUID);
 }
 
+bool LLFloaterBump::canCall()
+{
+    return LLAvatarActions::canCallTo(mItemUUID);
+}
+
 void LLFloaterBump::reportAbuse()
 {
     LLFloaterReporter::showFromAvatar(mItemUUID, "av_name");

indra/newview/llfloaterbump.h

@@ -52,6 +52,7 @@ class LLFloaterBump
 
     void startIM();
     void startCall();
+    bool canCall();
     void reportAbuse();
     void showProfile();
     void addFriend();

indra/newview/llfloaterimcontainer.cpp

@@ -1592,15 +1592,15 @@ bool LLFloaterIMContainer::enableContextMenuItem(const std::string& item, uuid_v
     }
     else if ("can_call" == item)
     {
+        if (is_single_select)
+        {
+            return LLAvatarActions::canCallTo(single_id);
+        }
         return LLAvatarActions::canCall();
     }
     else if ("can_open_voice_conversation" == item)
     {
-        return is_single_select && LLAvatarActions::canCall();
-    }
-    else if ("can_open_voice_conversation" == item)
-    {
-        return is_single_select && LLAvatarActions::canCall();
+        return is_single_select && LLAvatarActions::canCallTo(single_id);
     }
     else if ("can_zoom_in" == item)
     {

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);
@@ -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")
     {

indra/newview/llpanelprofile.h

@@ -33,7 +33,6 @@
 #include "llpanel.h"
 #include "llpanelavatar.h"
 #include "llmediactrl.h"
-#include "llvoiceclient.h"
 
 // class LLPanelProfileClassifieds;
 // class LLTabContainer;
@@ -70,7 +69,6 @@ class LLViewerFetchedTexture;
 class LLPanelProfileSecondLife
     : public LLPanelProfilePropertiesProcessorTab
     , public LLFriendObserver
-    , public LLVoiceClientStatusObserver
 {
 public:
     LLPanelProfileSecondLife();
@@ -89,10 +87,6 @@ class LLPanelProfileSecondLife
      */
     void changed(U32 mask) override;
 
-    // Implements LLVoiceClientStatusObserver::onChange() to enable the call
-    // button when voice is available
-    void onChange(EStatusType status, const LLSD& channelInfo, bool proximal) override;
-
     void setAvatarId(const LLUUID& avatar_id) override;
 
     bool postBuild() override;
@@ -203,7 +197,6 @@ class LLPanelProfileSecondLife
     LLHandle<LLFloater> mFloaterTexturePickerHandle;
 
     bool                mHasUnsavedDescriptionChanges;
-    bool                mVoiceStatus;
     bool                mWaitingForImageUpload;
     bool                mAllowPublish;
     bool                mHideAge;

indra/newview/llviewermenu.cpp

@@ -7808,15 +7808,29 @@ class LLAvatarSendIM : public view_listener_t
 
 class LLAvatarCall : public view_listener_t
 {
+    static LLVOAvatar* findAvatar()
+    {
+        return find_avatar_from_object(LLSelectMgr::getInstance()->getSelection()->getPrimaryObject());
+    }
+
     bool handleEvent(const LLSD& userdata)
     {
-        LLVOAvatar* avatar = find_avatar_from_object( LLSelectMgr::getInstance()->getSelection()->getPrimaryObject() );
-        if(avatar)
+        if (LLVOAvatar* avatar = findAvatar())
         {
             LLAvatarActions::startCall(avatar->getID());
         }
         return true;
     }
+
+public:
+    static bool isAvailable()
+    {
+        if (LLVOAvatar* avatar = findAvatar())
+        {
+            return LLAvatarActions::canCallTo(avatar->getID());
+        }
+        return LLAvatarActions::canCall();
+    }
 };
 
 namespace
@@ -10075,7 +10089,7 @@ void initialize_menus()
     registrar.add("Avatar.ShowInspector", boost::bind(&handle_avatar_show_inspector));
     view_listener_t::addMenu(new LLAvatarSendIM(), "Avatar.SendIM");
     view_listener_t::addMenu(new LLAvatarCall(), "Avatar.Call", cb_info::UNTRUSTED_BLOCK);
-    enable.add("Avatar.EnableCall", boost::bind(&LLAvatarActions::canCall));
+    enable.add("Avatar.EnableCall", boost::bind(&LLAvatarCall::isAvailable));
     view_listener_t::addMenu(new LLAvatarReportAbuse(), "Avatar.ReportAbuse", cb_info::UNTRUSTED_THROTTLE);
     view_listener_t::addMenu(new LLAvatarToggleMyProfile(), "Avatar.ToggleMyProfile");
     view_listener_t::addMenu(new LLAvatarTogglePicks(), "Avatar.TogglePicks");