summaryrefslogtreecommitdiff
path: root/indra/newview/skins
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/skins')
-rw-r--r--indra/newview/skins/default/xui/en/floater_im_container.xml3
-rw-r--r--indra/newview/skins/default/xui/en/floater_nearby_chat.xml8
-rw-r--r--indra/newview/skins/default/xui/en/floater_voice_controls.xml43
-rw-r--r--indra/newview/skins/default/xui/en/menu_bottomtray.xml53
-rw-r--r--indra/newview/skins/default/xui/en/menu_imchiclet_adhoc.xml19
-rw-r--r--indra/newview/skins/default/xui/en/notifications.xml7
-rw-r--r--indra/newview/skins/default/xui/en/panel_chat_header.xml2
-rw-r--r--indra/newview/skins/default/xui/en/panel_picks.xml11
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_chat.xml33
9 files changed, 159 insertions, 20 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_im_container.xml b/indra/newview/skins/default/xui/en/floater_im_container.xml
index cf6a4e45bd..cd297af99d 100644
--- a/indra/newview/skins/default/xui/en/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_container.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<multi_floater
-background_visible="true"
-bg_color="yellow"
+ can_minimize="false"
can_resize="true"
height="390"
layout="topleft"
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 d8534bfe0b..0856049374 100644
--- a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml
@@ -22,13 +22,15 @@
bg_readonly_color="ChatHistoryBgColor"
bg_writeable_color="ChatHistoryBgColor"
follows="all"
- left="1"
+ left="5"
top="20"
layout="topleft"
- height="280"
+ height="275"
name="chat_history"
parse_highlights="true"
text_color="ChatHistoryTextColor"
text_readonly_color="ChatHistoryTextColor"
- width="320" />
+ right_widget_pad="5"
+ left_widget_pad="0"
+ width="315" />
</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_voice_controls.xml b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
index 04696ca2e7..1ebc51f504 100644
--- a/indra/newview/skins/default/xui/en/floater_voice_controls.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
@@ -1,8 +1,10 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater
can_resize="true"
- height="300"
+ height="270"
layout="topleft"
+ min_height="146"
+ min_width="190"
name="floater_voice_controls"
title="Voice Controls"
save_visibility="true"
@@ -21,6 +23,10 @@
Conference Call
</string>
<string
+ name="title_peer_2_peer">
+ Call with [NAME]
+ </string>
+ <string
name="no_one_near">
No one near
</string>
@@ -74,6 +80,7 @@
width="20" />
</panel>
<layout_stack
+ animate="false"
bottom="10"
clip="false"
follows="left|right|top"
@@ -82,9 +89,11 @@
orientation="horizontal"
width="262">
<layout_panel
+ auto_resize="false"
follows="left"
layout="topleft"
min_width="24"
+ name="microphone_icon_panel"
top="0"
user_resize="false"
width="24">
@@ -98,9 +107,10 @@
</layout_panel>
<layout_panel
layout="topleft"
+ name="volume_slider_panel"
top="0"
user_resize="false"
- width="258">
+ width="138">
<slider_bar
control_name="AudioLevelMic"
follows="left|right|top"
@@ -113,7 +123,25 @@
tool_tip="Master Volume"
top="0"
value="0.75"
- width="258" />
+ width="138" />
+ </layout_panel>
+ <layout_panel
+ auto_resize="false"
+ layout="topleft"
+ min_width="100"
+ name="leave_btn_panel"
+ top="0"
+ user_resize="false"
+ visible="false"
+ width="100">
+ <button
+ follows="left|right|top"
+ height="24"
+ label="Leave Call"
+ left="0"
+ name="leave_call_btn"
+ top="0"
+ width="100" />
</layout_panel>
</layout_stack>
</panel>
@@ -126,4 +154,13 @@
multi_select="true"
name="speakers_list"
width="282" />
+ <panel
+ filename="panel_avatar_list_item.xml"
+ follows="left|right|top"
+ height="24"
+ layout="topleft"
+ left="0"
+ name="non_avatar_caller"
+ top="70"
+ width="282" />
</floater>
diff --git a/indra/newview/skins/default/xui/en/menu_bottomtray.xml b/indra/newview/skins/default/xui/en/menu_bottomtray.xml
index a7abb223ba..7ef91a1d85 100644
--- a/indra/newview/skins/default/xui/en/menu_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/menu_bottomtray.xml
@@ -52,4 +52,57 @@
function="CheckControl"
parameter="ShowSnapshotButton" />
</menu_item_check>
+ <menu_item_separator
+ name="Separator" />
+ <menu_item_call
+ label="Cut"
+ name="NearbyChatBar_Cut">
+ <menu_item_call.on_click
+ function="NearbyChatBar.Action"
+ parameter="cut" />
+ <menu_item_call.on_enable
+ function="NearbyChatBar.EnableMenuItem"
+ parameter="can_cut" />
+ </menu_item_call>
+ <menu_item_call
+ label="Copy"
+ name="NearbyChatBar_Copy">
+ <menu_item_call.on_click
+ function="NearbyChatBar.Action"
+ parameter="copy" />
+ <menu_item_call.on_enable
+ function="NearbyChatBar.EnableMenuItem"
+ parameter="can_copy" />
+ </menu_item_call>
+ <menu_item_call
+ label="Paste"
+ name="NearbyChatBar_Paste">
+ <menu_item_call.on_click
+ function="NearbyChatBar.Action"
+ parameter="paste" />
+ <menu_item_call.on_enable
+ function="NearbyChatBar.EnableMenuItem"
+ parameter="can_paste" />
+ </menu_item_call>
+ <menu_item_call
+ label="Delete"
+ name="NearbyChatBar_Delete">
+ <menu_item_call.on_click
+ function="NearbyChatBar.Action"
+ parameter="delete" />
+ <menu_item_call.on_enable
+ function="NearbyChatBar.EnableMenuItem"
+ parameter="can_delete" />
+ </menu_item_call>
+ <menu_item_call
+ label="Select All"
+ name="NearbyChatBar_Select_All">
+ <menu_item_call.on_click
+ function="NearbyChatBar.Action"
+ parameter="select_all" />
+ <menu_item_call.on_enable
+ function="NearbyChatBar.EnableMenuItem"
+ parameter="can_select_all" />
+ </menu_item_call>
+
</menu>
diff --git a/indra/newview/skins/default/xui/en/menu_imchiclet_adhoc.xml b/indra/newview/skins/default/xui/en/menu_imchiclet_adhoc.xml
new file mode 100644
index 0000000000..eb5e31b57d
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_imchiclet_adhoc.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu
+ height="101"
+ layout="topleft"
+ left="100"
+ mouse_opaque="false"
+ name="IMChiclet AdHoc Menu"
+ top="724"
+ visible="false"
+ width="128">
+ <menu_item_call
+ label="End Session"
+ layout="topleft"
+ name="End Session">
+ <menu_item_call.on_click
+ function="IMChicletMenu.Action"
+ parameter="end" />
+ </menu_item_call>
+</menu>
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 895df62926..f48cc6d4bf 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -4598,6 +4598,13 @@ Please select at least one type of content to search (PG, Mature, or Adult).
<notification
icon="notify.tga"
+ name="PaymentRecived"
+ type="notify">
+[MESSAGE]
+ </notification>
+
+ <notification
+ icon="notify.tga"
name="EventNotification"
type="notify">
Event Notification:
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 95d8b9cb1e..3e6ea84bf2 100644
--- a/indra/newview/skins/default/xui/en/panel_chat_header.xml
+++ b/indra/newview/skins/default/xui/en/panel_chat_header.xml
@@ -8,7 +8,7 @@
label="im_header"
layout="topleft"
name="im_header"
- width="300">
+ width="310">
<avatar_icon
follows="left"
height="18"
diff --git a/indra/newview/skins/default/xui/en/panel_picks.xml b/indra/newview/skins/default/xui/en/panel_picks.xml
index 4f0d155876..4c2bd67337 100644
--- a/indra/newview/skins/default/xui/en/panel_picks.xml
+++ b/indra/newview/skins/default/xui/en/panel_picks.xml
@@ -162,16 +162,5 @@
tab_stop="false"
top="0"
width="50" />
- <button
- enabled="false"
- follows="bottom|right"
- height="25"
- label="▼"
- layout="topleft"
- name="overflow_btn"
- right="-10"
- tab_stop="false"
- top="0"
- width="30" />
</panel>
</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
index fac0d5c60f..3aa5d3fae4 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -318,4 +318,37 @@
name="plain_text_chat_history"
top_pad="5"
width="400" />
+ <text
+ left="30"
+ height="20"
+ width="300"
+ top_pad="20">
+ Show IMs in:
+ </text>
+ <radio_group
+ height="30"
+ layout="topleft"
+ left="30"
+ control_name="ChatWindow"
+ name="chat_window"
+ top_pad="10"
+ tool_tip="Show chat in multiple windows(by default) or in one multi-tabbed window (requires restart)"
+ width="331">
+ <radio_item
+ height="16"
+ label="Multiple windows"
+ layout="topleft"
+ left="0"
+ name="radio"
+ top="0"
+ width="150" />
+ <radio_item
+ height="16"
+ label="One window"
+ layout="topleft"
+ left_delta="145"
+ name="radio2"
+ top_delta="0"
+ width="150" />
+ </radio_group>
</panel>