summaryrefslogtreecommitdiff
path: root/indra/newview/llavataractions.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2011-05-04 10:06:34 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2011-05-04 10:06:34 -0400
commit0be3b1fdd9821929fc537e1c812f26268979dbf0 (patch)
tree2848e2c95a4006e6c9e5fcad11fe9b1ab2488db3 /indra/newview/llavataractions.cpp
parent8decd5a4e6c94e27381186e581cf199ba3ede437 (diff)
parenta23ad02cf568b680a409cf40f69cfb1b1591082c (diff)
merge
Diffstat (limited to 'indra/newview/llavataractions.cpp')
-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());