diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-12-16 13:30:56 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-12-16 13:30:56 -0500 |
| commit | f1acdc56b2209f1cbc0887d4bf64be9aef765cb8 (patch) | |
| tree | a18650b5fd1ec9d79d3686939996f735c1179dd9 | |
| parent | 8df635f8bf3ca99347239638845a0b2ba2d93291 (diff) | |
| parent | e390255de640827f3f4f1c39c7ebb443142e490f (diff) | |
merge changes for storm-1992
| -rwxr-xr-x | doc/contributions.txt | 1 | ||||
| -rwxr-xr-x | indra/newview/skins/default/xui/en/floater_im_session.xml | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 2ec53d5c6f..6ad7cb0449 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -675,6 +675,7 @@ Jonathan Yap STORM-1953 STORM-1957 OPEN-113 + STORM-1992 STORM-1989 STORM-1987 STORM-1986 diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml index 43d0f2fb18..7076de55e3 100755 --- a/indra/newview/skins/default/xui/en/floater_im_session.xml +++ b/indra/newview/skins/default/xui/en/floater_im_session.xml @@ -210,7 +210,7 @@ default_tab_group="3" tab_group="2" name="right_part_holder" - min_width="172"> + min_width="230"> <layout_stack animate="true" default_tab_group="2" |