diff options
Diffstat (limited to 'indra')
4 files changed, 69 insertions, 64 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 4792a1a476..e972cf39bf 100644 --- a/indra/newview/skins/default/xui/en/floater_im_session.xml +++ b/indra/newview/skins/default/xui/en/floater_im_session.xml @@ -8,67 +8,71 @@ left="0" name="panel_im" top="0" - can_close="false" + can_close="true" can_dock="true" - can_minimize="false" + can_minimize="true" visible="true" - width="320" + width="350" can_resize="true" min_width="300" min_height="350"> - <layout_stack follows="all" - height="350" - width="300" - layout="topleft" - orientation="horizontal" - name="im_panels" - top="20" - left="0"> + <layout_stack + follows="all" + height="350" + width="300" + layout="topleft" + orientation="horizontal" + name="im_panels" + top="20" + left="0"> <layout_panel name="panel_im_control_panel" layout="topleft" - top_delta="-3" - height="350" follows="left" label="IM Control Panel" auto_resize="false" user_resize="false" /> - <layout_panel height="350" - width="" - left_delta="110" - top="0" - user_resize="false"> - <button height="20" - follows="left|top" - top="0" - image_overlay="TabIcon_Open_Off" - layout="topleft" - width="25" - name="slide_left_btn" /> - <button height="20" - follows="left|top" - top="0" - image_overlay="TabIcon_Close_Off" - width="25" - name="slide_right_btn" /> - <chat_history - length="1" - follows="all" - height="275" - layout="topleft" - name="chat_history" - parse_highlights="true" - allow_html="true" - width="160"> - </chat_history> - <line_editor - follows="left|right" - height="20" - label="To" - layout="topleft" - name="chat_editor" - width="160"> - </line_editor> + <layout_panel + left="0" + top="0" + user_resize="false"> + <button + height="20" + follows="left|top" + top="0" + left="2" + image_overlay="TabIcon_Open_Off" + layout="topleft" + width="25" + name="slide_left_btn" /> + <button + height="20" + follows="left|top" + top="0" + left="2" + image_overlay="TabIcon_Close_Off" + width="25" + name="slide_right_btn" /> + <chat_history + length="1" + font="SansSerifSmall" + follows="left|right|top" + height="280" + name="chat_history" + parse_highlights="true" + allow_html="true" + left="1" + width="180"> + </chat_history> + <line_editor + follows="left|right|top" + font="SansSerifSmall" + height="20" + label="To" + name="chat_editor" + top_pad="1" + width="180"> + </line_editor> </layout_panel> </layout_stack> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml index 69b015a727..d8534bfe0b 100644 --- a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml +++ b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml @@ -5,7 +5,7 @@ can_tear_off="false" can_resize="true" can_drag_on_left="false" - can_close="false" + can_close="true" can_dock="true" bevel_style="in" height="300" diff --git a/indra/newview/skins/default/xui/en/panel_chat_header.xml b/indra/newview/skins/default/xui/en/panel_chat_header.xml index 323ee957e7..7a3eae35a9 100644 --- a/indra/newview/skins/default/xui/en/panel_chat_header.xml +++ b/indra/newview/skins/default/xui/en/panel_chat_header.xml @@ -3,13 +3,13 @@ background_visible="true" bevel_style="in" bg_alpha_color="black" - follows="top" + follows="top|left|right" height="24" - label="im_header" - layout="topleft" - name="im_header" - width="300"> - <avatar_icon + label="im_header" + layout="topleft" + name="im_header" + width="300"> + <avatar_icon follows="left" height="18" image_name="Generic_Person" diff --git a/indra/newview/skins/default/xui/en/panel_im_control_panel.xml b/indra/newview/skins/default/xui/en/panel_im_control_panel.xml index 9573904c93..73d843e6dd 100644 --- a/indra/newview/skins/default/xui/en/panel_im_control_panel.xml +++ b/indra/newview/skins/default/xui/en/panel_im_control_panel.xml @@ -38,28 +38,29 @@ label="Teleport" name="teleport_btn" width="100" /> - <button + <!-- <button follows="left|top" height="20" label="Share" name="share_btn" - width="100" /> - <button + width="100" />--> + <!--Removing pay button to save space - will update spec - verified by Erica/Steve --> + <!-- <button follows="left|top" height="20" label="Pay" name="pay_btn" - width="100" /> + width="100" />--> <panel background_visible="true" bg_alpha_color="DkGray2" border="false" - follows="left|top" + top_pad="10" + follows="left|bottom" height="70" - left="0" - left_pad="0" + left="1" name="panel_call_buttons" - width="110"> + width="109"> <button bottom="10" height="20" |