summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorJames Cook <james@lindenlab.com>2010-03-29 17:34:00 -0700
committerJames Cook <james@lindenlab.com>2010-03-29 17:34:00 -0700
commit02f518c534ed89317d959ed6a1404da251efa3ef (patch)
tree39efd313d95f3fe5e1932d9505aa07b73e9360c0 /indra/newview
parent0b14880d14c412e9841284c357789a973e1f0f40 (diff)
Fix edit profile layout for Set Name... button, bad merge
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/skins/default/xui/en/panel_edit_profile.xml4
1 files changed, 2 insertions, 2 deletions
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">