diff options
Diffstat (limited to 'indra/newview/skins/default/xui/en')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_chat_bar.xml | 23 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_nearby_chat.xml | 35 |
2 files changed, 51 insertions, 7 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_chat_bar.xml b/indra/newview/skins/default/xui/en/floater_chat_bar.xml index d0059b281e..9d61c94eb1 100644 --- a/indra/newview/skins/default/xui/en/floater_chat_bar.xml +++ b/indra/newview/skins/default/xui/en/floater_chat_bar.xml @@ -3,16 +3,27 @@ height="60" layout="topleft" legacy_header_height="20" + single_instance="true" title="Nearby chat" + save_rect="true" can_close="true" can_minimize="true" help_topic="chat_bar" - save_rect="true" min_height="60" min_width="150" can_resize="true" name="chat_bar" width="380"> + <panel + top="20" + class="panel_nearby_chat" + follow="all" + width="380" + height="0" + visible="false" + filename="panel_nearby_chat.xml" + name="nearby_chat" /> + <panel width="380" height="31" left="0" bottom="-1" follows="left|right|bottom"> <line_editor border_style="line" border_thickness="1" @@ -27,7 +38,7 @@ text_pad_left="5" text_pad_right="25" tool_tip="Press Enter to say, Ctrl+Enter to shout" - top="27" + top="0" width="335" /> <output_monitor auto_update="true" @@ -38,14 +49,14 @@ left_pad="-24" mouse_opaque="true" name="chat_zone_indicator" - top="31" + top="4" visible="true" width="20" /> <button follows="right" is_toggle="true" width="20" - top="27" + top="0" layout="topleft" left_pad="12" image_disabled="ComboButton_UpOff" @@ -56,8 +67,6 @@ height="23" name="show_nearby_chat" tool_tip="Shows/hides nearby chat log"> - <button.init_callback - function="Button.SetDockableFloaterToggle" - parameter="nearby_chat" /> </button> + </panel> </floater> diff --git a/indra/newview/skins/default/xui/en/panel_nearby_chat.xml b/indra/newview/skins/default/xui/en/panel_nearby_chat.xml new file mode 100644 index 0000000000..f766236b2e --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_nearby_chat.xml @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel + height="300" + follows="all" + layout="topleft" + name="nearby_chat" + help_topic="nearby_chat" + width="320"> + <check_box + bottom_delta="36" + control_name="TranslateChat" + enabled="true" + height="16" + label="Translate chat (powered by Google)" + layout="topleft" + left="5" + name="translate_chat_checkbox" + width="230" /> + <chat_history + parse_urls="true" + bg_readonly_color="ChatHistoryBgColor" + bg_writeable_color="ChatHistoryBgColor" + follows="all" + left="5" + top_delta="17" + layout="topleft" + height="260" + name="chat_history" + parse_highlights="true" + text_color="ChatHistoryTextColor" + text_readonly_color="ChatHistoryTextColor" + right_widget_pad="5" + left_widget_pad="0" + width="315" /> +</panel> |