diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-03-18 10:46:52 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-03-18 10:46:52 -0400 |
| commit | d60519d253dfc8c1add572952f5b4c8517699873 (patch) | |
| tree | 5e64415875bd674089eb895a645450594b1bab5a | |
| parent | c617a2aa338058fa43211af27640909876e5139c (diff) | |
| parent | a64b1d0d3069ff630b4bbb05d3ad4f1764033118 (diff) | |
merge changes for STORM-2007
| -rwxr-xr-x | doc/contributions.txt | 1 | ||||
| -rwxr-xr-x | indra/newview/skins/default/xui/en/floater_buy_object.xml | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 9105c0f26b..6ebd6ca50a 100755 --- 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 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" |