Skip to content
Snippets Groups Projects
Commit fcd1ccd2 authored by Richard Linden's avatar Richard Linden
Browse files

Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-fui

parents b82d0abb a556fcf2
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
indra/newview/skins/default/xui/en/floater_chat_bar.xml
+ 53
− 47
View file @ fcd1ccd2
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
min_height="60" min_height="60"
min_width="150" min_width="150"
can_resize="true" can_resize="true"
default_tab_group="1"
name="chat_bar" name="chat_bar"
width="380"> width="380">
<panel <panel
...@@ -23,54 +24,59 @@ ...@@ -23,54 +24,59 @@
follow="all" follow="all"
width="380" width="380"
height="0" height="0"
visible="false" visible="true"
filename="panel_nearby_chat.xml" filename="panel_nearby_chat.xml"
name="nearby_chat" /> name="nearby_chat" />
<panel width="380" height="31" left="0" bottom="-1" follows="left|right|bottom"> <panel width="380"
<line_editor height="31"
border_style="line" left="0"
border_thickness="1" bottom="-1"
follows="left|right" follows="left|right|bottom"
height="23" tab_group="1">
label="Click here to chat." <line_editor
layout="topleft" border_style="line"
left_delta="7" border_thickness="1"
left="0" follows="left|right"
max_length_bytes="1023" height="23"
name="chat_box" label="Click here to chat."
text_pad_left="5" layout="topleft"
text_pad_right="25" left_delta="7"
tool_tip="Press Enter to say, Ctrl+Enter to shout" left="0"
top="2" max_length_bytes="1023"
width="335" /> name="chat_box"
<output_monitor text_pad_left="5"
auto_update="true" text_pad_right="25"
follows="right" tool_tip="Press Enter to say, Ctrl+Enter to shout"
draw_border="false" top="2"
height="16" width="335" />
layout="topleft" <output_monitor
left_pad="-24" auto_update="true"
mouse_opaque="true" follows="right"
name="chat_zone_indicator" draw_border="false"
top="6" height="16"
visible="true" layout="topleft"
width="20" /> left_pad="-24"
<button mouse_opaque="true"
follows="right" name="chat_zone_indicator"
is_toggle="true" top="6"
width="20" visible="true"
top="2" width="20" />
layout="topleft" <button
left_pad="12" follows="right"
image_disabled="ComboButton_UpOff" is_toggle="true"
image_unselected="ComboButton_UpOff" width="20"
image_selected="ComboButton_On" top="2"
image_pressed="ComboButton_UpSelected" layout="topleft"
image_pressed_selected="ComboButton_Selected" left_pad="12"
height="23" image_disabled="ComboButton_UpOff"
chrome="true" image_unselected="ComboButton_UpOff"
name="show_nearby_chat" image_selected="ComboButton_On"
tool_tip="Shows/hides nearby chat log"> image_pressed="ComboButton_UpSelected"
</button> image_pressed_selected="ComboButton_Selected"
height="23"
chrome="true"
name="show_nearby_chat"
tool_tip="Shows/hides nearby chat log">
</button>
</panel> </panel>
</floater> </floater>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment