From 60d4870f59abbe081e36a50ffedbdea068aec75b Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Fri, 26 Feb 2010 14:12:23 -0800
Subject: Cleaned up Edit Profile > Set Name layout and feel

---
 indra/newview/llpanelme.cpp                        |  6 ++--
 .../skins/default/xui/en/panel_edit_profile.xml    | 32 +++++++++++-----------
 2 files changed, 20 insertions(+), 18 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llpanelme.cpp b/indra/newview/llpanelme.cpp
index 19eddb8c51..84ed7356f1 100644
--- a/indra/newview/llpanelme.cpp
+++ b/indra/newview/llpanelme.cpp
@@ -289,8 +289,10 @@ void LLPanelMyProfileEdit::resetData()
 {
 	LLPanelMyProfile::resetData();
 
-	childSetTextArg("name_text", "[FIRST]", LLStringUtil::null);
-	childSetTextArg("name_text", "[LAST]", LLStringUtil::null);
+	//childSetTextArg("name_text", "[FIRST]", LLStringUtil::null);
+	//childSetTextArg("name_text", "[LAST]", LLStringUtil::null);
+	getChild<LLUICtrl>("user_name")->setValue( LLSD() );
+	getChild<LLUICtrl>("user_slid")->setValue( LLSD() );
 }
 
 void LLPanelMyProfileEdit::onTexturePickerMouseEnter(LLUICtrl* ctrl)
diff --git a/indra/newview/skins/default/xui/en/panel_edit_profile.xml b/indra/newview/skins/default/xui/en/panel_edit_profile.xml
index f400acc1d4..c6403c66dd 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_profile.xml
@@ -89,34 +89,34 @@
          width="290">
       <text
        follows="top|left"
-       font="SansSerifHuge"
-       height="13"
+       font="SansSerifBigBold"
+       height="20"
        layout="topleft"
        left="10"
        name="user_name"
+       text_color="white"
+       top="4"
+       value="Hamilton Hitchings"
+       width="280" />
+      <text
+       follows="top|left"
+       height="13"
+       layout="topleft"
+       left="10"
+       name="user_slid"
        text_color="LtGray"
-       top="0"
-       value="James Linden"
+       top_pad="5"
+       value="(hamilton.linden)"
        width="150" />
       <button
        follows="top|left"
-       height="23"
+       height="20"
        label="Set Name..."
        left="170"
        name="set_name"
-       top="0"
+       top_delta="-4"
        visible="false" 
        width="110" />
-      <text
-       follows="top|left"
-       height="13"
-       layout="topleft"
-       left="10"
-       name="user_slid"
-       text_color="LtGray"
-       top_pad="4"
-       value="(james.linden)"
-       width="150" />
       <panel
        name="lifes_images_panel"
          follows="left|top|right"
-- 
cgit v1.2.3