merge changes for STORM-2007

2014-03-18 10:46:52 -04:00 · 2014-03-18 10:46:52 -04:00 · d60519d253
parent c617a2aa33 a64b1d0d30
commit d60519d253
2 changed files with 3 additions and 2 deletions
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@ -686,6 +686,7 @@ Jonathan Yap
 	STORM-1957
 	STORM-1993
 	STORM-2017
+	STORM-2007
 	STORM-1980
 	OPEN-113
 	STORM-1975
--- 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"