summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelavatar.cpp
diff options
context:
space:
mode:
authorSteven Bennetts <steve@lindenlab.com>2009-08-14 22:40:13 +0000
committerSteven Bennetts <steve@lindenlab.com>2009-08-14 22:40:13 +0000
commit3b65da1fad46eda2c97681879fce8880f7462082 (patch)
tree9c9a5b69ea5f3d90883c39acdd0f856e75105fd1 /indra/newview/llpanelavatar.cpp
parent73caee4208a4e05f66583de099502012fd8415ea (diff)
merge -r 1341-1350 https://svn.aws.productengine.com/secondlife/pe/stable-1 -> viewer-2.0.0-3
EXT-456 EXT-480 EXT-481 EXT-497 EXT-498 EXT-509 EXT-511
Diffstat (limited to 'indra/newview/llpanelavatar.cpp')
-rw-r--r--indra/newview/llpanelavatar.cpp6
1 files changed, 0 insertions, 6 deletions
diff --git a/indra/newview/llpanelavatar.cpp b/indra/newview/llpanelavatar.cpp
index 6c7fb8a0be..6e94b087a6 100644
--- a/indra/newview/llpanelavatar.cpp
+++ b/indra/newview/llpanelavatar.cpp
@@ -369,7 +369,6 @@ void LLPanelAvatarProfile::resetControls()
childSetVisible("sl_groups", true);
childSetEnabled("add_friend", true);
- childSetVisible("user_name", false);
childSetVisible("status_me_panel", false);
childSetVisible("profile_me_buttons_panel", false);
childSetVisible("account_actions_panel", false);
@@ -609,10 +608,6 @@ BOOL LLPanelAvatarMeProfile::postBuild()
void LLPanelAvatarMeProfile::onOpen(const LLSD& key)
{
LLPanelProfileTab::onOpen(key);
-
- std::string full_name;
- gCacheName->getFullName(getAvatarId(), full_name);
- childSetValue("user_name", full_name);
}
void LLPanelAvatarMeProfile::processProfileProperties(const LLAvatarData* avatar_data)
@@ -647,7 +642,6 @@ void LLPanelAvatarMeProfile::fillStatusData(const LLAvatarData* avatar_data)
void LLPanelAvatarMeProfile::resetControls()
{
- childSetVisible("user_name", true);
childSetVisible("status_panel", false);
childSetVisible("profile_buttons_panel", false);
childSetVisible("title_groups_text", false);