diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2011-04-26 14:02:41 -0700 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2011-04-26 14:02:41 -0700 |
| commit | f7bd5b98949fc72ac1fd4b97ecd4907e14c04315 (patch) | |
| tree | 41d141344a5b447c9a7f0ee3d202e6d5df93837d | |
| parent | 3f44e78fbe5b27858d63111ab556e961c6f5c703 (diff) | |
EXP-752 FIX -- When "View Display Names" is disabled, only my own profile loads, when I click others profiles
Avatar username is now looked up in the name cache when it is blank, which happens when display names are turned off apparently.
Reviewed by Fredrik.
| -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()); |