diff options
| author | Richard Linden <none@none> | 2011-04-28 15:12:38 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-04-28 15:12:38 -0700 |
| commit | 09594aa3d5510e5c7d9254277977cb0bdd418d2f (patch) | |
| tree | 0523ef3b59d71f4068044d3d5e2fcd4efdc23bd4 /indra/newview/llavataractions.cpp | |
| parent | 363e296dde5fbd56f9bf4382285b162712d582e2 (diff) | |
| parent | 1128a15f0be3e12104fdb49e0a3417ecea6faccb (diff) | |
Automated merge with bundle:E:\code\viewer-experience-merge+c:\users\richard\appdata\local\temp\thg.ia7ixc\http__hg.secondlife.com_viewer-development_csqen8.hg
Diffstat (limited to 'indra/newview/llavataractions.cpp')
| -rw-r--r-- | 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 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()); |