3739639295
Conflicts: indra/newview/llfloateractivespeakers.h - llparticipantlist.h got changed from a panel to a layoutpanel indra/newview/lloverlaybar.cpp - Silly conflict, I change one line, Shyotl changes the next two. Compile fixies: indra/newview/llavataractions.cpp needed to include llnotifications.h indra/newview/llvoicechannel.cpp needed to include llnotifications.h
35 lines
1.8 KiB
XML
35 lines
1.8 KiB
XML
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
|
|
<panel bottom="0" default_tab_group="1" follows="left|bottom|right" height="25"
|
|
left="0" name="chat_bar" width="395">
|
|
<panel bottom="1" follows="left|right|bottom" height="23" left="0"
|
|
use_bounding_rect="true" width="397" bg_visible="false" border="false" border_visible="false">
|
|
<panel bottom="0" filename="panel_bg_tab.xml" height="22" left="-398" width="396" />
|
|
</panel>
|
|
<button bottom="-23" follows="left|bottom" font="SansSerif" halign="center" height="20"
|
|
label="Local Chat" left="7" name="History"
|
|
tool_tip="Click here to see what has been said" width="93" />
|
|
<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-23"
|
|
follows="left|right|bottom" font="SansSerif"
|
|
handle_edit_keys_directly="false" height="20" label="Click here to chat."
|
|
left="107" max_length="2147483647" name="Chat Editor"
|
|
select_all_on_focus_received="false" select_on_focus="false" tab_group="1"
|
|
tool_tip="Press Enter to say, Shift-Enter to whisper, Ctrl-Enter to shout." width="105" spell_check="true" />
|
|
<flyout_button bottom="-23" follows="right|bottom" height="20" label="Say" left_delta="110"
|
|
list_position="above" mouse_opaque="true" name="Say" tool_tip="(Enter)"
|
|
width="80">
|
|
<flyout_button_item value="shout" name="shout_item">
|
|
Shout
|
|
</flyout_button_item>
|
|
<flyout_button_item value="say" name="say_item">
|
|
Say
|
|
</flyout_button_item>
|
|
<flyout_button_item value="whisper" name="whisper_item">
|
|
Whisper
|
|
</flyout_button_item>
|
|
</flyout_button>
|
|
<combo_box allow_text_entry="false" bottom="-23" follows="right|bottom" height="20"
|
|
label="Gestures" left_delta="85" max_chars="20" name="Gesture" width="90">
|
|
</combo_box>
|
|
<string name="gesture_label">Gestures</string>
|
|
</panel>
|