summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2014-03-14 14:34:06 -0400
committerOz Linden <oz@lindenlab.com>2014-03-14 14:34:06 -0400
commita64b1d0d3069ff630b4bbb05d3ad4f1764033118 (patch)
tree7c867183b549e6d9c0afdab784ae99c34a01ede4 /indra/newview
parentcb91708332b8b8ddfe27808602ec5f43f11c24c2 (diff)
parentebac8c0a2a0fe8487892e3f2043bc7786c0dc3c9 (diff)
merge changes for storm-2007
Diffstat (limited to 'indra/newview')
-rwxr-xr-xindra/newview/skins/default/xui/en/floater_buy_object.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_buy_object.xml b/indra/newview/skins/default/xui/en/floater_buy_object.xml
index 5fdd4aa49d..49be4290c7 100755
--- a/indra/newview/skins/default/xui/en/floater_buy_object.xml
+++ b/indra/newview/skins/default/xui/en/floater_buy_object.xml
@@ -47,7 +47,7 @@
width="16" />
<scroll_list.columns
name="text"
- width="234" />
+ relative_width="1" />
</scroll_list>
<text
type="string"
@@ -77,7 +77,7 @@
width="16" />
<scroll_list.columns
name="text"
- width="234" />
+ relative_width="1" />
</scroll_list>
<text
type="string"