summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorJustin C. Rounds (Chuck) <chuck@lindenlab.com>2009-12-01 12:24:44 -0500
committerJustin C. Rounds (Chuck) <chuck@lindenlab.com>2009-12-01 12:24:44 -0500
commit16d947e473b34315e1f7ecd4108aafe19fa5dfd5 (patch)
tree29d8f9ae335369c3143c6c03d58c124263bf041c /indra/newview
parent5e11affddb1b8816f57f9314381486c00033e080 (diff)
parentaa1cbd144fcfe4dce7a95a2b8259f149b92380e7 (diff)
Automated merge with ssh://chuck@hg.lindenlab.com/james/gooey/
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/skins/default/xui/en/floater_tools.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index 636e9d465a..b6996fdb10 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -2780,7 +2780,7 @@ even though the user gets a free copy.
width="130" />
<panel_inventory_object
follows="left|top"
- height="210"
+ height="325"
layout="topleft"
left="10"
name="contents_inventory"