summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorLeyla Farazha <leyla@lindenlab.com>2011-04-27 16:20:44 -0700
committerLeyla Farazha <leyla@lindenlab.com>2011-04-27 16:20:44 -0700
commitd4ee7ac7489df97d006c5bba8ee00ef63ec9e4b0 (patch)
treee33a1660a399ad8b86a66c2f420cad13319c805b /indra/newview
parent368173b7d602aa1d790a4510c4bf9e6d9e102d1d (diff)
parentd952f97459a04d64b698380b777406f1644f9bb2 (diff)
Merge
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llavataractions.cpp10
1 files changed, 8 insertions, 2 deletions
diff --git a/indra/newview/llavataractions.cpp b/indra/newview/llavataractions.cpp
index ca7ec7cc30..cbbdcb2983 100644
--- a/indra/newview/llavataractions.cpp
+++ b/indra/newview/llavataractions.cpp
@@ -302,8 +302,14 @@ void LLAvatarActions::startConference(const uuid_vec_t& ids)
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);
+ std::string username = av_name.mUsername;
+ if (username.empty())
+ {
+ username = LLCacheName::buildUsername(av_name.mDisplayName);
+ }
+
+ llinfos << "opening web profile for " << username << llendl;
+ std::string url = getProfileURL(username);
// PROFILES: open in webkit window
LLWeb::loadWebURLInternal(url, "", agent_id.asString());