Skip to content
Snippets Groups Projects
Commit c1ea91fb authored by James Cook's avatar James Cook
Browse files

Show SLID in side panel full avatar profile

parent 596196c6
No related branches found
No related tags found
No related merge requests found
......@@ -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
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment