diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-06-14 16:59:05 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-06-14 16:59:05 -0700 |
| commit | 22133d281d0c70f13f63d0db2083d6d3cbf002da (patch) | |
| tree | 7f964f3817091833ca337c5b40a5526e0fb883dd /indra/newview/skins/default/xui/en | |
| parent | c238027dd9917b1633ff5f16911fbdbe437f9a55 (diff) | |
| parent | d34746b596bad717f7d0c10e263700738a06aa43 (diff) | |
Pull merge from richard/viewer-chui
Diffstat (limited to 'indra/newview/skins/default/xui/en')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_im_session.xml | 16 |
1 files changed, 7 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 21fc2d25d4..a4695b8c09 100644 --- a/indra/newview/skins/default/xui/en/floater_im_session.xml +++ b/indra/newview/skins/default/xui/en/floater_im_session.xml @@ -15,6 +15,9 @@ can_tear_off="false" min_width="250" min_height="190"> + <floater.string + name="NearbyChatTitle" + value="Nearby Chat"/> <floater.string name="call_btn_start">VoicePTT_Off</floater.string> <floater.string name="call_btn_stop">VoicePTT_On</floater.string> <floater.string @@ -131,9 +134,7 @@ name="im_panels" tab_group="1" top_pad="0" - left="0" - auto_resize="true" - user_resize="true"> + left="0"> <layout_panel name="speakers_list_panel" follows="all" @@ -185,8 +186,6 @@ orientation="vertical" name="translate_and_chat_stack" tab_group="1" - auto_resize="true" - user_resize="true" left_pad="0" top="0" left="0"> @@ -236,10 +235,9 @@ </layout_panel> </layout_stack> </panel> - <panel width="228" + <panel width="225" height="31" - left="4" - right="4" + left="4" name="bottom_panel" bottom="-1" follows="left|right|bottom" @@ -254,7 +252,7 @@ layout="bottomleft" name="chat_editor" tab_group="3" - width="240"> + width="220"> </line_editor> </panel> </layout_panel> |