From 3791745054546dbebb3373371aaf7a0ddad608a3 Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Mon, 22 Feb 2010 16:41:56 -0800
Subject: Simple button to change your display name Talks to web service so
 other people can see the change, but for now they need to relog or toggle
 display names on/off to clear their cache.

---
 .../skins/default/xui/en/panel_edit_profile.xml    | 38 +++++++++++++++++++---
 1 file changed, 34 insertions(+), 4 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/panel_edit_profile.xml')

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 2a2199fc87..f400acc1d4 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_profile.xml
@@ -87,12 +87,42 @@
      min_height="300"
          left="0"
          width="290">
-     <panel
+      <text
+       follows="top|left"
+       font="SansSerifHuge"
+       height="13"
+       layout="topleft"
+       left="10"
+       name="user_name"
+       text_color="LtGray"
+       top="0"
+       value="James Linden"
+       width="150" />
+      <button
+       follows="top|left"
+       height="23"
+       label="Set Name..."
+       left="170"
+       name="set_name"
+       top="0"
+       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"
          height="244"
          layout="topleft"
-         top="0"
+         top="37"
          left="0"
          width="290">
 	 <panel
@@ -145,7 +175,7 @@
        height="102"
        layout="topleft"
        left="123"
-       top="25"
+       top="62"
        max_length="512"
        name="sl_description_edit"
        width="157"
@@ -201,7 +231,7 @@
        layout="topleft"
        left="123"
        max_length="512"
-       top="157"
+       top="195"
        name="fl_description_edit"
        width="157"
        word_wrap="true">
-- 
cgit v1.2.3


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

---
 .../skins/default/xui/en/panel_edit_profile.xml    | 32 +++++++++++-----------
 1 file changed, 16 insertions(+), 16 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/panel_edit_profile.xml')

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


From 639b234762133e4d09d6d7b1bac9d25c5a681926 Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Thu, 18 Mar 2010 17:19:57 -0700
Subject: Partial support for Set Name returning error msg from service

---
 indra/newview/skins/default/xui/en/panel_edit_profile.xml | 1 -
 1 file changed, 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en/panel_edit_profile.xml')

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 1b624da68a..bce988da9d 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_profile.xml
@@ -115,7 +115,6 @@
        left="170"
        name="set_name"
        top_delta="-4"
-       visible="false" 
        width="110" />
      <panel
        name="lifes_images_panel"
-- 
cgit v1.2.3


From 02f518c534ed89317d959ed6a1404da251efa3ef Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Mon, 29 Mar 2010 17:34:00 -0700
Subject: Fix edit profile layout for Set Name... button, bad merge

---
 indra/newview/skins/default/xui/en/panel_edit_profile.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/panel_edit_profile.xml')

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 97faa16ab1..bce988da9d 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_profile.xml
@@ -174,7 +174,7 @@
        height="102"
        layout="topleft"
        left="123"
-       top="25"
+       top="62"
        max_length="512"
        name="sl_description_edit"
        width="157"
@@ -230,7 +230,7 @@
        layout="topleft"
        left="123"
        max_length="512"
-       top="157"
+       top="195"
        name="fl_description_edit"
        width="157"
        word_wrap="true">
-- 
cgit v1.2.3


From f39d10dc3333ed781b8795fa7dfe3f19b53f875a Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Wed, 26 May 2010 16:23:56 -0700
Subject: LLNameBox -> LLTextBox

---
 indra/newview/skins/default/xui/en/panel_edit_profile.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en/panel_edit_profile.xml')

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 bce988da9d..8afdec690b 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_profile.xml
@@ -328,7 +328,7 @@
          left="10"
          name="partner_data_panel"
          width="200">
-            <name_box
+            <text
              follows="left|top|right"
              height="30"
              initial_value="(retrieving)"
-- 
cgit v1.2.3


From 2965b5b64e0c293dad50b656654a07b5eb3e00b8 Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Mon, 2 Aug 2010 15:41:58 -0700
Subject: DEV-52362 Long display name gets cut off in Partners listing in
 profile page

---
 .../skins/default/xui/en/panel_edit_profile.xml    | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/panel_edit_profile.xml')

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 e3cf25634b..6fcf1b0e92 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_profile.xml
@@ -330,17 +330,17 @@
          left="10"
          name="partner_data_panel"
          width="200">
-            <text
-             follows="left|top|right"
-             height="30"
-             initial_value="(retrieving)"
-             layout="topleft"
-             left="0"
-             link="true"
-             name="partner_text"
-             top="0"
-             width="200"
-             word_wrap="true" />
+          <text
+           follows="left|top|right"
+           height="12"
+           initial_value="(retrieving)"
+           layout="topleft"
+           left="0"
+           link="true"
+           name="partner_text"
+           top="0"
+           use_ellipses="true"
+           width="280"/>
          </panel>
         <text
          follows="left|top"
-- 
cgit v1.2.3


From 574a5c682c16fb748755ebc222e37b1084fbb695 Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Tue, 3 Aug 2010 10:34:21 -0700
Subject: DEV-52361 Edit link option in Edit My Profile page not active

---
 indra/newview/skins/default/xui/en/panel_edit_profile.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/panel_edit_profile.xml')

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 6fcf1b0e92..1e69ecaed8 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_profile.xml
@@ -3,7 +3,7 @@
  background_visible="true"
  class="edit_profile_panel"
   follows="all"
- height="535"
+ height="548"
  label="Profile Edit"
  layout="topleft"
  left="0"
@@ -60,7 +60,7 @@
  <scroll_container
      color="DkGray2"
      follows="all"
-     height="494"
+     height="507"
      min_height="300"
      layout="topleft"
      left="8"
@@ -74,7 +74,7 @@
          follows="left|top|right"
          layout="topleft"
          top="0"
-     height="494"
+     height="507"
      min_height="300"
          left="0"
          width="292">
@@ -83,7 +83,7 @@
      follows="left|top|right"
          layout="topleft"
          top="0"
-     height="494"
+     height="507"
      min_height="300"
          left="0"
          width="292">
-- 
cgit v1.2.3


From 7f4350655224f0c626a7445fef0369324512f324 Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Fri, 6 Aug 2010 10:59:19 -0700
Subject: Set Name... to Set Display Name...

---
 indra/newview/skins/default/xui/en/panel_edit_profile.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/panel_edit_profile.xml')

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 1e69ecaed8..399e91432f 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_profile.xml
@@ -111,11 +111,11 @@
       <button
        follows="top|left"
        height="20"
-       label="Set Name..."
-       left="170"
+       label="Set Display Name..."
+       left="165"
        name="set_name"
        top_delta="-4"
-       width="110" />
+       width="120" />
      <panel
        name="lifes_images_panel"
          follows="left|top|right"
-- 
cgit v1.2.3


From 9c7a1c78045cc4741dc7cad01b02773cff014d7c Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Thu, 16 Sep 2010 00:43:32 -0700
Subject: deprecated text_enabled_color and text_disabled_color from
 LLCheckBoxCtrl in favor of label_text.text_color and
 label_text.text_readonly_color, respectively

---
 indra/newview/skins/default/xui/en/panel_edit_profile.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en/panel_edit_profile.xml')

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 5072ec3a66..48bd9ace21 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_profile.xml
@@ -242,7 +242,7 @@
        left="8"
        name="show_in_search_checkbox"
        height="15"
-       text_enabled_color="white"
+       label_text.text_color="white"
        top_pad="12"
        width="100" />
       <text
-- 
cgit v1.2.3


From 239194b0627f5a4ae1b2b9256c6fe83a1c1e23c6 Mon Sep 17 00:00:00 2001
From: eli_linden <eli@lindenlab.com>
Date: Tue, 14 Sep 2010 16:51:38 -0700
Subject: VWR-22372 fix widen width for partner edit link for all languages

---
 indra/newview/skins/default/xui/en/panel_edit_profile.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en/panel_edit_profile.xml')

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 8715a3a7a8..903dcd4c24 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_profile.xml
@@ -320,7 +320,7 @@
          left="10"
          name="partner_edit_link"
          value="[[URL] Edit]"
-         width="50" />
+         width="70" />
     </panel>
     </panel>
     </scroll_container>
-- 
cgit v1.2.3


From 8961223a371fa9f02ad30b0e4625e7a7e3310977 Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Fri, 24 Sep 2010 14:04:50 -0700
Subject: Adding profile username and display name labels and emphasis coloring

---
 .../skins/default/xui/en/panel_edit_profile.xml    | 60 +++++++++++++++-------
 1 file changed, 42 insertions(+), 18 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/panel_edit_profile.xml')

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 bb67d68c8e..caf5cb8817 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_profile.xml
@@ -88,40 +88,64 @@
          left="0"
          width="292">
       <text
+     top="5"
+     follows="top|left"
+     height="13"
+     layout="topleft"
+     left="10"
+     name="user_label"
+     text_color="LtGray"
+     value="Display Name:"
+     width="80" />
+      <button
+         name="set_name"
+         layout="topleft"
+         follows="top|left"
+         image_overlay="Edit_Wrench"
+         top="21"
+         left="10"
+         height="23"
+         width="23"
+         tool_tip="Set Display Name"/>
+      <text
        follows="top|left"
        font="SansSerifBigBold"
        height="20"
        layout="topleft"
-       left="10"
+       left_pad="10"
        name="user_name"
        text_color="white"
-       top="4"
+       top_delta="3"
        value="Hamilton Hitchings"
-       width="280" />
+       use_ellipses="true" 
+       width="265" />
+      <text
+    follows="top|left"
+    height="13"
+    layout="topleft"
+    left="10"
+    name="user_label"
+    text_color="LtGray"
+    top_pad="4" 
+    value="Username:"
+    width="70" />
       <text
        follows="top|left"
        height="13"
        layout="topleft"
-       left="10"
+       left_pad="0"
        name="user_slid"
-       text_color="LtGray"
-       top_pad="5"
-       value="(hamilton.linden)"
+       text_color="EmphasisColor"
+        font="SansSerifBold"
+       top_delta="-2"
+       value="hamilton.linden"
        width="150" />
-      <button
-       follows="top|left"
-       height="20"
-       label="Set Display Name..."
-       left="165"
-       name="set_name"
-       top_delta="-4"
-       width="120" />
      <panel
        name="lifes_images_panel"
          follows="left|top|right"
          height="244"
          layout="topleft"
-         top="37"
+         top="65"
          left="0"
          width="292">
 	 <panel
@@ -175,7 +199,7 @@
        height="102"
        layout="topleft"
        left="123"
-       top="62"
+       top="90"
        max_length="512"
        name="sl_description_edit"
        width="157"
@@ -232,7 +256,7 @@
        layout="topleft"
        left="123"
        max_length="512"
-       top="195"
+       top="223"
        name="fl_description_edit"
        width="157"
        word_wrap="true">
-- 
cgit v1.2.3


From 7fc48fb1259d3dbceed5248d8ccda39048d6ba8d Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Mon, 27 Sep 2010 15:40:22 -0700
Subject: Fixed username clipping issues in profile

---
 indra/newview/skins/default/xui/en/panel_edit_profile.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en/panel_edit_profile.xml')

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 caf5cb8817..acbc6ff7ad 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_profile.xml
@@ -138,8 +138,9 @@
        text_color="EmphasisColor"
         font="SansSerifBold"
        top_delta="-2"
+       use_ellipses="true" 
        value="hamilton.linden"
-       width="150" />
+       width="215" />
      <panel
        name="lifes_images_panel"
          follows="left|top|right"
-- 
cgit v1.2.3


From 9ef927831de63c42cfd5cf1ac5cdae6484ff976b Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Tue, 28 Sep 2010 11:27:55 -0700
Subject: fixed super long username clipping

---
 indra/newview/skins/default/xui/en/panel_edit_profile.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en/panel_edit_profile.xml')

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 0adaa662aa..5f16101132 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_profile.xml
@@ -131,7 +131,7 @@
     width="70" />
       <text
        follows="top|left"
-       height="13"
+       height="20"
        layout="topleft"
        left_pad="0"
        name="user_slid"
@@ -140,6 +140,7 @@
        top_delta="-2"
        use_ellipses="true" 
        value="hamilton.linden"
+       wrap="true" 
        width="215" />
      <panel
        name="lifes_images_panel"
-- 
cgit v1.2.3


From 366b390a9be2b56e84c6cd5f85f5e2740d364cd1 Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Wed, 29 Sep 2010 11:52:43 -0700
Subject: DN-116 Long user name wraps at far right edge in profile panel

---
 indra/newview/skins/default/xui/en/panel_edit_profile.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en/panel_edit_profile.xml')

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 5f16101132..665af93876 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_profile.xml
@@ -141,7 +141,7 @@
        use_ellipses="true" 
        value="hamilton.linden"
        wrap="true" 
-       width="215" />
+       width="205" />
      <panel
        name="lifes_images_panel"
          follows="left|top|right"
-- 
cgit v1.2.3


From 7a43f0983d6906efcea56370e927912461ab898b Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Wed, 29 Sep 2010 14:26:01 -0700
Subject: edit profile display name now sizes down if too long

---
 .../skins/default/xui/en/panel_edit_profile.xml       | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/panel_edit_profile.xml')

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 665af93876..cf075b8aae 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_profile.xml
@@ -118,7 +118,22 @@
        top_delta="3"
        value="Hamilton Hitchings"
        use_ellipses="true" 
-       width="265" />
+       visible="true" 
+       width="250" />
+      <text
+       follows="top|left"
+       font="SansSerifBold"
+       height="20"
+       layout="topleft"
+       left_delta="0"
+       name="user_name_small"
+       text_color="white"
+       top_delta="-4"
+       value="Hamilton Hitchings"
+       use_ellipses="true"
+       visible="false" 
+       wrap="true"
+       width="245" />
       <text
     follows="top|left"
     height="13"
@@ -126,7 +141,7 @@
     left="10"
     name="user_label"
     text_color="LtGray"
-    top_pad="4" 
+    top_pad="8" 
     value="Username:"
     width="70" />
       <text
-- 
cgit v1.2.3


From f01ba3cf29b45ed312cc7f383a60819b1a8026c6 Mon Sep 17 00:00:00 2001
From: leyla_linden <none@none>
Date: Mon, 11 Oct 2010 14:03:14 -0700
Subject: 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

---
 indra/newview/skins/default/xui/en/panel_edit_profile.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en/panel_edit_profile.xml')

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 cf075b8aae..a863f1cc56 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_profile.xml
@@ -93,7 +93,7 @@
      height="13"
      layout="topleft"
      left="10"
-     name="user_label"
+     name="display_name_label"
      text_color="LtGray"
      value="Display Name:"
      width="80" />
-- 
cgit v1.2.3


From def038f0071bf80c2ce399255b662b7314e042e8 Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Tue, 12 Oct 2010 10:20:17 -0700
Subject: DN-164 Edit Partner link not active in Edit Profile Panel

---
 indra/newview/skins/default/xui/en/panel_edit_profile.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/panel_edit_profile.xml')

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 cf075b8aae..d216bd9b2e 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_profile.xml
@@ -3,7 +3,7 @@
  background_visible="true"
  class="edit_profile_panel"
   follows="all"
- height="548"
+ height="585"
  label="Profile Edit"
  layout="topleft"
  left="0"
@@ -60,7 +60,7 @@
  <scroll_container
      color="DkGray2"
      follows="all"
-     height="507"
+     height="537"
      min_height="300"
      layout="topleft"
      left="8"
@@ -74,7 +74,7 @@
          follows="left|top|right"
          layout="topleft"
          top="0"
-     height="507"
+     height="537"
      min_height="300"
          left="0"
          width="292">
@@ -83,7 +83,7 @@
      follows="left|top|right"
          layout="topleft"
          top="0"
-     height="507"
+     height="537"
      min_height="300"
          left="0"
          width="292">
@@ -377,7 +377,6 @@
            initial_value="(retrieving)"
            layout="topleft"
            left="0"
-           link="true"
            name="partner_text"
            top="0"
            use_ellipses="true"
@@ -387,6 +386,7 @@
          follows="left|top"
          height="15"
          layout="topleft"
+           link="true"
          left="10"
          name="partner_edit_link"
          value="[[URL] Edit]"
-- 
cgit v1.2.3


From 330ea83c3dd8f56f4cef56481f951b705d28f027 Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Wed, 13 Oct 2010 15:39:16 -0700
Subject: making profiles look nicer when display names isn't on

---
 .../skins/default/xui/en/panel_edit_profile.xml    | 36 ++++++++++++++++++----
 1 file changed, 30 insertions(+), 6 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/panel_edit_profile.xml')

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 70c7bae662..90dbddaff7 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_profile.xml
@@ -96,6 +96,17 @@
      name="display_name_label"
      text_color="LtGray"
      value="Display Name:"
+     width="80" />
+      <text
+     top="5"
+     follows="top|left"
+     height="13"
+     layout="topleft"
+     left="10"
+     name="solo_username_label"
+     text_color="LtGray"
+     value="Username:"
+     visible="false" 
      width="80" />
       <button
          name="set_name"
@@ -112,13 +123,26 @@
        font="SansSerifBigBold"
        height="20"
        layout="topleft"
-       left_pad="10"
-       name="user_name"
+       left="10"
+       name="solo_user_name"
        text_color="white"
        top_delta="3"
        value="Hamilton Hitchings"
-       use_ellipses="true" 
-       visible="true" 
+       use_ellipses="true"
+       visible="false"
+       width="275" />
+      <text
+       follows="top|left"
+       font="SansSerifBigBold"
+       height="20"
+       layout="topleft"
+       left="43"
+       name="user_name"
+       text_color="white"
+       top_delta="0"
+       value="Hamilton Hitchings"
+       use_ellipses="true"
+       visible="true"
        width="250" />
       <text
        follows="top|left"
@@ -131,7 +155,7 @@
        top_delta="-4"
        value="Hamilton Hitchings"
        use_ellipses="true"
-       visible="false" 
+       visible="false"
        wrap="true"
        width="245" />
       <text
@@ -141,7 +165,7 @@
     left="10"
     name="user_label"
     text_color="LtGray"
-    top_pad="8" 
+    top_pad="8"
     value="Username:"
     width="70" />
       <text
-- 
cgit v1.2.3