diff options
author | Don Kjer <don@lindenlab.com> | 2011-05-17 19:21:55 +0000 |
---|---|---|
committer | Don Kjer <don@lindenlab.com> | 2011-05-17 19:21:55 +0000 |
commit | ae8ed3fc2d4a7dda92ad8fdb34bc559478eb9177 (patch) | |
tree | 64cd5d3328dbb56b03a03cf873a613005d0394dc /indra/newview/llavataractions.cpp | |
parent | c62ef53863bd01cb96de55e0250c8a8193b6c72b (diff) | |
parent | 113f532ee57eeeca4dc7eb6ca05f923f1f3543d3 (diff) |
Merge with viewer-development
Diffstat (limited to 'indra/newview/llavataractions.cpp')
-rwxr-xr-x | indra/newview/llavataractions.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/indra/newview/llavataractions.cpp b/indra/newview/llavataractions.cpp index ca7ec7cc30..cbbdcb2983 100755 --- 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()); |