From 8cfb11ab91a5710c180b6a894d192f09f596cc2f Mon Sep 17 00:00:00 2001
From: Leslie Linden <none@none>
Date: Wed, 6 Apr 2011 16:55:44 -0700
Subject: WEB-3796 FIX - First click in session on "Profile" button doesn't do
anything * Updated to use the avatar name get callback function so it will
always open the profile after the info has been properly cached, rather
than silently passing through the function without doing anything.
Reviewed by Leyla
---
indra/newview/llavataractions.cpp | 41 +++++++++++----------------------------
1 file changed, 11 insertions(+), 30 deletions(-)
(limited to 'indra')
diff --git a/indra/newview/llavataractions.cpp b/indra/newview/llavataractions.cpp
index afa8b62c74..ca7ec7cc30 100755
--- a/indra/newview/llavataractions.cpp
+++ b/indra/newview/llavataractions.cpp
@@ -279,7 +279,7 @@ bool LLAvatarActions::isCalling(const LLUUID &id)
//static
bool LLAvatarActions::canCall()
{
- return LLVoiceClient::getInstance()->voiceEnabled() && LLVoiceClient::getInstance()->isVoiceWorking();
+ return LLVoiceClient::getInstance()->voiceEnabled() && LLVoiceClient::getInstance()->isVoiceWorking();
}
// static
@@ -300,40 +300,21 @@ void LLAvatarActions::startConference(const uuid_vec_t& ids)
make_ui_sound("UISndStartIM");
}
+static void on_avatar_name_show_profile(const LLUUID& agent_id, const LLAvatarName& av_name)
+{
+ llinfos << "opening web profile for " << av_name.mUsername << llendl;
+ std::string url = getProfileURL(av_name.mUsername);
+
+ // PROFILES: open in webkit window
+ LLWeb::loadWebURLInternal(url, "", agent_id.asString());
+}
+
// static
void LLAvatarActions::showProfile(const LLUUID& id)
{
if (id.notNull())
{
- LLSD params;
- params["id"] = id;
- params["open_tab_name"] = "panel_profile";
-
- // PROFILES: open in webkit window
- std::string full_name;
- if (gCacheName->getFullName(id,full_name))
- {
- std::string agent_name = LLCacheName::buildUsername(full_name);
- llinfos << "opening web profile for " << agent_name << llendl;
- std::string url = getProfileURL(agent_name);
- LLWeb::loadWebURLInternal(url, "", id.asString());
- }
- else
- {
- llwarns << "no name info for agent id " << id << llendl;
- }
-#if 0
- //Show own profile
- if(gAgent.getID() == id)
- {
- LLSideTray::getInstance()->showPanel("panel_me", params);
- }
- //Show other user profile
- else
- {
- LLSideTray::getInstance()->showPanel("panel_profile_view", params);
- }
-#endif
+ LLAvatarNameCache::get(id, boost::bind(&on_avatar_name_show_profile, _1, _2));
}
}
--
cgit v1.2.3