summaryrefslogtreecommitdiff
path: root/indra/newview/skins
diff options
context:
space:
mode:
authorRichard Linden <none@none>2011-05-04 18:10:09 -0700
committerRichard Linden <none@none>2011-05-04 18:10:09 -0700
commit47b010fde1f9e94a95cd4a1dc59cde2e99a73c1c (patch)
treea77fcbd4d6b98314d01bb9441d73e279107b8309 /indra/newview/skins
parent3063c1be4105feab28e6d6abf745b5ab6043ba25 (diff)
parentefca808b0c95aa2406960cb60a25ab90b14bde90 (diff)
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
Diffstat (limited to 'indra/newview/skins')
-rw-r--r--indra/newview/skins/minimal/xui/en/panel_bottomtray.xml8
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/skins/minimal/xui/en/panel_bottomtray.xml b/indra/newview/skins/minimal/xui/en/panel_bottomtray.xml
index 1756f9db90..9c14edb306 100644
--- a/indra/newview/skins/minimal/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/minimal/xui/en/panel_bottomtray.xml
@@ -202,7 +202,7 @@
height="28"
layout="topleft"
min_width="17"
- name="splitter_panel"
+ name="splitter_panel_1"
user_resize="false"
width="17">
<icon
@@ -222,7 +222,7 @@
min_height="28"
min_width="83"
mouse_opaque="false"
- name="avatar_and_destinations_panel"
+ name="destinations_panel"
user_resize="false"
width="103">
<bottomtray_button
@@ -253,7 +253,7 @@
min_height="28"
min_width="73"
mouse_opaque="false"
- name="avatar_and_destinations_panel"
+ name="avatar_panel"
user_resize="false"
width="103">
<bottomtray_button
@@ -282,7 +282,7 @@
height="28"
layout="topleft"
min_width="17"
- name="splitter_panel"
+ name="splitter_panel_2"
user_resize="false"
width="17">
<icon