diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-03-21 22:10:38 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-03-21 22:10:38 -0400 |
| commit | 515f0e5a559ff3f0cb7d02e1d40b0f71425800ea (patch) | |
| tree | f187952efe45d88e509c04379a5b20c666332c90 /indra/newview/skins/default | |
| parent | 50f199e45d0524b59fc9246a3160c5676c8d3942 (diff) | |
| parent | ef544a22218d59c6a121d4bf88c49868a2b9a713 (diff) | |
merge changes for 3.5.0-beta5
Diffstat (limited to 'indra/newview/skins/default')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_im_session.xml | 20 |
1 files changed, 11 insertions, 9 deletions
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 e081ea8e74..d8b085063f 100644 --- a/indra/newview/skins/default/xui/en/floater_im_session.xml +++ b/indra/newview/skins/default/xui/en/floater_im_session.xml @@ -14,7 +14,6 @@ width="394" can_resize="true" can_tear_off="false" - min_width="340" min_height="190" positioning="relative"> <floater.string name="call_btn_start">Conv_toolbar_open_call</floater.string> @@ -223,9 +222,10 @@ <layout_panel name="speakers_list_panel" follows="all" - min_width="115" + expanded_min_dim="115" + min_dim="0" width="150" - height="275" + height="275" user_resize="true" auto_resize="false"> </layout_panel> @@ -241,7 +241,7 @@ user_resize="true" auto_resize="true" visible="true" - name="left_part_holder" + name="right_part_holder" min_width="221"> <panel name="trnsAndChat_panel" @@ -266,6 +266,7 @@ left="0"> <layout_panel auto_resize="false" + user_resize="false" height="26" layout="topleft" left_delta="0" @@ -285,7 +286,6 @@ width="230" /> </layout_panel> <layout_panel - height="233" width="210" layout="topleft" follows="all" @@ -293,19 +293,21 @@ top_delta="0" bottom="0" visible="true" - user_resize="true" + user_resize="false" auto_resize="true" name="chat_holder"> <chat_history font="SansSerifSmall" follows="all" visible="true" - height="225" name="chat_history" parse_highlights="true" parse_urls="true" + layout="topleft" right="-5" - left="5"> + left="5" + top="0" + bottom="1"> </chat_history> </layout_panel> </layout_stack> @@ -348,7 +350,6 @@ auto_resize="true" name="input_editor_layout_panel"> <chat_editor - top="6" expand_lines_count="5" follows="left|right|bottom" font="SansSerifSmall" @@ -363,6 +364,7 @@ spellcheck="true" tab_group="3" width="160" + top="6" left="5" right="-5" wrap="true"> |