diff options
| author | James Cook <james@lindenlab.com> | 2010-02-19 14:41:03 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2010-02-19 14:41:03 -0800 |
| commit | c1ea91fb44653749a382c89aeed6054ac547b064 (patch) | |
| tree | 5cfd3fa9e52527a52921e25ad2f201b8df50af0e /indra | |
| parent | 596196c6e7a167b6dfaef8f2fbf6c76048314e0d (diff) | |
Show SLID in side panel full avatar profile
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llpanelprofileview.cpp | 19 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_profile_view.xml | 11 |
2 files changed, 27 insertions, 3 deletions
diff --git a/indra/newview/llpanelprofileview.cpp b/indra/newview/llpanelprofileview.cpp index 7c9b7aed36..5688c6960b 100644 --- a/indra/newview/llpanelprofileview.cpp +++ b/indra/newview/llpanelprofileview.cpp @@ -32,11 +32,12 @@ #include "llviewerprecompiledheaders.h" +#include "llpanelprofileview.h" + #include "llavatarconstants.h" +#include "llavatarnamecache.h" // IDEVO #include "lluserrelations.h" -#include "llpanelprofileview.h" - #include "llavatarpropertiesprocessor.h" #include "llcallingcard.h" #include "llpanelavatar.h" @@ -201,7 +202,19 @@ void LLPanelProfileView::processOnlineStatus(bool online) void LLPanelProfileView::onNameCache(const LLUUID& id, const std::string& full_name, bool is_group) { llassert(getAvatarId() == id); - getChild<LLUICtrl>("user_name", FALSE)->setValue(full_name); + // IDEVO + LLAvatarName av_name; + if (LLAvatarNameCache::useDisplayNames() + && LLAvatarNameCache::get(id, &av_name)) + { + getChild<LLUICtrl>("user_name")->setValue( av_name.mDisplayName ); + getChild<LLUICtrl>("user_slid")->setValue( av_name.mSLID ); + } + else + { + getChild<LLUICtrl>("user_name")->setValue(full_name); + getChild<LLUICtrl>("user_slid")->setValue(""); + } } // EOF diff --git a/indra/newview/skins/default/xui/en/panel_profile_view.xml b/indra/newview/skins/default/xui/en/panel_profile_view.xml index 607de65c5c..96c7ba39ed 100644 --- a/indra/newview/skins/default/xui/en/panel_profile_view.xml +++ b/indra/newview/skins/default/xui/en/panel_profile_view.xml @@ -45,8 +45,19 @@ height="13" layout="topleft" left="45" + name="user_slid" + text_color="LtGray" + value="" + width="150" /> + <text + follows="top|left" + halign="right" + height="13" + layout="topleft" + left="150" name="status" text_color="LtGray_50" + top_delta="0" value="Online" width="150" /> <tab_container |