diff options
| author | leyla_linden <none@none> | 2010-10-11 14:03:14 -0700 |
|---|---|---|
| committer | leyla_linden <none@none> | 2010-10-11 14:03:14 -0700 |
| commit | f01ba3cf29b45ed312cc7f383a60819b1a8026c6 (patch) | |
| tree | b34bf8ba9088bbd8477b36f74cebc3a64ae77a74 /indra/newview/llpanelprofileview.cpp | |
| parent | 1d08fa4cd72c17dfbe7906fa8f5e2bc44d0fb7cd (diff) | |
DN-161 Display Name and Username labels shown in profiles when View Display Names setting is off and when Display Names disabled on Simulator
DN-163 Set display name error if user changes View Display Name setting to off in preferences with Edit profile panel open
Diffstat (limited to 'indra/newview/llpanelprofileview.cpp')
| -rw-r--r-- | indra/newview/llpanelprofileview.cpp | 16 |
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 |