summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/floater_tools.xml
diff options
context:
space:
mode:
authorGraham Madarasz <graham@lindenlab.com>2013-04-30 19:50:05 -0700
committerGraham Madarasz <graham@lindenlab.com>2013-04-30 19:50:05 -0700
commit806d09b1143894ad66cea2c228f467e8c39a8adf (patch)
tree512bfa5d5a8fe92ac4616fd9169e1c458b0e8b87 /indra/newview/skins/default/xui/en/floater_tools.xml
parentb06ec66a5d11628905da256e084d0036f39ba529 (diff)
Merge 3.5.1 into Materials
Diffstat (limited to 'indra/newview/skins/default/xui/en/floater_tools.xml')
-rw-r--r--indra/newview/skins/default/xui/en/floater_tools.xml12
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index 3b501e1ece..8b9733df17 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -2,7 +2,7 @@
<floater
positioning="cascading"
legacy_header_height="18"
- height="615"
+ height="590"
layout="topleft"
bg_opaque_image="Window_NoTitle_Foreground"
bg_alpha_image="Window_NoTitle_Background"
@@ -830,7 +830,7 @@
width="282"/>
<tab_container
follows="left|top"
- height="435"
+ height="410"
halign="center"
left="0"
name="Object Info Tabs"
@@ -1353,7 +1353,7 @@ even though the user gets a free copy.
<panel
border="false"
follows="all"
- height="592"
+ height="567"
label="Object"
layout="topleft"
left_delta="0"
@@ -2110,7 +2110,7 @@ even though the user gets a free copy.
<panel
border="false"
follows="all"
- height="392"
+ height="367"
label="Features"
layout="topleft"
left_delta="0"
@@ -2530,7 +2530,7 @@ even though the user gets a free copy.
border_visible="true"
bevel_style="in"
follows="left|top|right"
- height="350"
+ height="325"
layout="topleft"
left="10"
name="contents_inventory"
@@ -2540,7 +2540,7 @@ even though the user gets a free copy.
</tab_container>
<panel
follows="left|top"
- height="409"
+ height="384"
layout="topleft"
left_delta="0"
name="land info panel"