summaryrefslogtreecommitdiff
path: root/indra/newview/skins
diff options
context:
space:
mode:
authorLeyla Farazha <leyla@lindenlab.com>2011-05-06 14:27:24 -0700
committerLeyla Farazha <leyla@lindenlab.com>2011-05-06 14:27:24 -0700
commite068e81f9f2c87c54a40020370b7c0105514dda2 (patch)
treec38946df42b7d631c9c09078b2a4487261edec34 /indra/newview/skins
parent02c1a6a515c5a18eece01aafb8de7a88b8c8c83f (diff)
parent8a1fabd5a604244bca2910cdb54fb9df22b1bba7 (diff)
merge
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