summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelprofileview.cpp
diff options
context:
space:
mode:
authorLeyla Farazha <leyla@lindenlab.com>2010-10-12 10:46:47 -0700
committerLeyla Farazha <leyla@lindenlab.com>2010-10-12 10:46:47 -0700
commit0f7ca61386e4cf0f9efda7c380c40cc608f26ea3 (patch)
tree5fb51a7ab9416ba40cd7a09b054f53cae707941e /indra/newview/llpanelprofileview.cpp
parentf1c41c7945456e0647fac3ae631034cf1ffb0e65 (diff)
parentf01ba3cf29b45ed312cc7f383a60819b1a8026c6 (diff)
Merge
Diffstat (limited to 'indra/newview/llpanelprofileview.cpp')
-rw-r--r--indra/newview/llpanelprofileview.cpp16
1 files changed, 16 insertions, 0 deletions
diff --git a/indra/newview/llpanelprofileview.cpp b/indra/newview/llpanelprofileview.cpp
index 2c4270090c..9011583a60 100644
--- a/indra/newview/llpanelprofileview.cpp
+++ b/indra/newview/llpanelprofileview.cpp
@@ -225,6 +225,22 @@ void LLPanelProfileView::onAvatarNameCache(const LLUUID& agent_id,
}
+ if (LLAvatarNameCache::useDisplayNames())
+ {
+ getChild<LLUICtrl>("user_label")->setVisible( true );
+ getChild<LLUICtrl>("user_slid")->setVisible( true );
+ getChild<LLUICtrl>("display_name_label")->setVisible( true );
+ getChild<LLUICtrl>("copy_to_clipboard")->setVisible( true );
+ getChild<LLUICtrl>("copy_to_clipboard")->setEnabled( true );
+ }
+ else
+ {
+ getChild<LLUICtrl>("user_label")->setVisible( false );
+ getChild<LLUICtrl>("user_slid")->setVisible( false );
+ getChild<LLUICtrl>("display_name_label")->setVisible( false );
+ getChild<LLUICtrl>("copy_to_clipboard")->setVisible( false );
+ getChild<LLUICtrl>("copy_to_clipboard")->setEnabled( false );
+ }
}
// EOF