diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-03-14 14:34:06 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-03-14 14:34:06 -0400 |
| commit | a64b1d0d3069ff630b4bbb05d3ad4f1764033118 (patch) | |
| tree | 7c867183b549e6d9c0afdab784ae99c34a01ede4 | |
| parent | cb91708332b8b8ddfe27808602ec5f43f11c24c2 (diff) | |
| parent | ebac8c0a2a0fe8487892e3f2043bc7786c0dc3c9 (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 89390d9977..5318326a00 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -679,6 +679,7 @@ Jonathan Yap STORM-1953 STORM-1957 STORM-1993 + 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" |