summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/skins/default/xui/en')
-rw-r--r--indra/newview/skins/default/xui/en/floater_aaa.xml1
-rw-r--r--indra/newview/skins/default/xui/en/floater_about_land.xml4
-rw-r--r--indra/newview/skins/default/xui/en/floater_im_session.xml12
-rw-r--r--indra/newview/skins/default/xui/en/floater_incoming_call.xml4
-rw-r--r--indra/newview/skins/default/xui/en/floater_media_browser.xml2
-rw-r--r--indra/newview/skins/default/xui/en/floater_search.xml4
-rw-r--r--indra/newview/skins/default/xui/en/floater_select_key.xml2
-rw-r--r--indra/newview/skins/default/xui/en/floater_sell_land.xml71
-rw-r--r--indra/newview/skins/default/xui/en/floater_snapshot.xml167
-rw-r--r--indra/newview/skins/default/xui/en/menu_participant_list.xml22
-rw-r--r--indra/newview/skins/default/xui/en/menu_people_groups_view_sort.xml2
-rw-r--r--indra/newview/skins/default/xui/en/menu_people_nearby.xml3
-rw-r--r--indra/newview/skins/default/xui/en/menu_people_nearby_multiselect.xml3
-rw-r--r--indra/newview/skins/default/xui/en/menu_viewer.xml153
-rw-r--r--indra/newview/skins/default/xui/en/notifications.xml8
-rw-r--r--indra/newview/skins/default/xui/en/panel_media_settings_general.xml10
-rw-r--r--indra/newview/skins/default/xui/en/panel_media_settings_security.xml4
-rw-r--r--indra/newview/skins/default/xui/en/panel_outfits_inventory.xml157
-rw-r--r--indra/newview/skins/default/xui/en/panel_picks.xml7
-rw-r--r--indra/newview/skins/default/xui/en/panel_places.xml2
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_advanced.xml2
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_general.xml147
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_setup.xml4
-rw-r--r--indra/newview/skins/default/xui/en/panel_prim_media_controls.xml11
-rw-r--r--indra/newview/skins/default/xui/en/panel_teleport_history.xml2
-rw-r--r--indra/newview/skins/default/xui/en/sidepanel_appearance.xml76
-rw-r--r--indra/newview/skins/default/xui/en/sidepanel_task_info.xml20
-rw-r--r--indra/newview/skins/default/xui/en/strings.xml19
-rw-r--r--indra/newview/skins/default/xui/en/widgets/accordion_tab.xml2
29 files changed, 427 insertions, 494 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_aaa.xml b/indra/newview/skins/default/xui/en/floater_aaa.xml
index f89ad2f997..6956b73371 100644
--- a/indra/newview/skins/default/xui/en/floater_aaa.xml
+++ b/indra/newview/skins/default/xui/en/floater_aaa.xml
@@ -18,6 +18,7 @@
single_instance="true"
width="320">
<string name="nudge_parabuild">Nudge 1</string>
+ <string name="test_the_vlt">This string is extracted.</string>
<chat_history
allow_html="true"
bg_readonly_color="ChatHistoryBgColor"
diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml
index 62edfb57e9..70018d2295 100644
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@@ -1561,7 +1561,7 @@ Only large parcels can be listed in search.
left="10"
name="at URL:"
width="100">
- Home URL:
+ Home Page:
</text>
<line_editor
follows="left|top"
@@ -1590,7 +1590,7 @@ Only large parcels can be listed in search.
left="10"
name="CurrentURL:"
width="100">
- Current URL:
+ Current Page:
</text>
<button
follows="top|right"
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 db97dc2054..e015419118 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -12,14 +12,14 @@
can_minimize="true"
can_close="true"
visible="true"
- width="300"
+ width="360"
can_resize="true"
- min_width="300"
+ min_width="360"
min_height="350">
<layout_stack
follows="all"
height="320"
- width="300"
+ width="360"
layout="topleft"
orientation="horizontal"
name="im_panels"
@@ -36,7 +36,7 @@
left="0"
top="0"
height="200"
- width="185"
+ width="245"
user_resize="false">
<button
height="20"
@@ -63,7 +63,7 @@
parse_highlights="true"
allow_html="true"
left="1"
- width="180">
+ width="240">
</chat_history>
<line_editor
bottom="0"
@@ -73,7 +73,7 @@
label="To"
layout="bottomleft"
name="chat_editor"
- width="180">
+ width="240">
</line_editor>
</layout_panel>
</layout_stack>
diff --git a/indra/newview/skins/default/xui/en/floater_incoming_call.xml b/indra/newview/skins/default/xui/en/floater_incoming_call.xml
index acd59b6f09..81c54ae55e 100644
--- a/indra/newview/skins/default/xui/en/floater_incoming_call.xml
+++ b/indra/newview/skins/default/xui/en/floater_incoming_call.xml
@@ -26,6 +26,10 @@
name="VoiceInviteAdHoc">
has joined a Voice Chat call with a conference chat.
</floater.string>
+ <floater.string
+ name="VoiceInviteGroup">
+ has joined a Voice Chat call with the group [GROUP].
+ </floater.string>
<avatar_icon
enabled="false"
follows="left|top"
diff --git a/indra/newview/skins/default/xui/en/floater_media_browser.xml b/indra/newview/skins/default/xui/en/floater_media_browser.xml
index d6b20c8015..4b280ac59f 100644
--- a/indra/newview/skins/default/xui/en/floater_media_browser.xml
+++ b/indra/newview/skins/default/xui/en/floater_media_browser.xml
@@ -171,7 +171,7 @@
enabled="false"
follows="left|top"
height="20"
- label="Send Current URL to Parcel"
+ label="Send Current Page to Parcel"
layout="topleft"
left="0"
name="assign"
diff --git a/indra/newview/skins/default/xui/en/floater_search.xml b/indra/newview/skins/default/xui/en/floater_search.xml
index e6bdcdf78e..9c1a5499db 100644
--- a/indra/newview/skins/default/xui/en/floater_search.xml
+++ b/indra/newview/skins/default/xui/en/floater_search.xml
@@ -13,10 +13,6 @@
title="FIND"
width="670">
<floater.string
- name="search_url">
- http://int.searchwww-phx0.damballah.lindenlab.com/viewer
- </floater.string>
- <floater.string
name="loading_text">
Loading...
</floater.string>
diff --git a/indra/newview/skins/default/xui/en/floater_select_key.xml b/indra/newview/skins/default/xui/en/floater_select_key.xml
index 6050aede79..93aa1f0e31 100644
--- a/indra/newview/skins/default/xui/en/floater_select_key.xml
+++ b/indra/newview/skins/default/xui/en/floater_select_key.xml
@@ -21,7 +21,7 @@
word_wrap="true"
width="220">
Press a key to set your
-Speak button toggle
+Speak button trigger.
</text>
<button
height="23"
diff --git a/indra/newview/skins/default/xui/en/floater_sell_land.xml b/indra/newview/skins/default/xui/en/floater_sell_land.xml
index 409f46b960..afc44c41b8 100644
--- a/indra/newview/skins/default/xui/en/floater_sell_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_sell_land.xml
@@ -2,7 +2,8 @@
<floater
legacy_header_height="18"
can_minimize="false"
- height="450"
+ can_resize="true"
+ height="535"
layout="topleft"
name="sell land"
help_topic="sell_land"
@@ -12,7 +13,7 @@
<scroll_container
color="DkGray2"
follows="left|top|right|bottom"
- height="435"
+ height="520"
layout="topleft"
name="profile_scroll"
reserve_scroll_corner="true"
@@ -31,63 +32,47 @@
enabled="false"
follows="top|left"
height="135"
- layout="topleft"
left="60"
name="info_image"
top="20"
width="180" />
<text
- type="string"
- length="1"
top="150"
follows="top|left"
- layout="topleft"
left="16"
name="info_parcel_label"
width="48">
Parcel:
</text>
<text
- type="string"
- length="1"
top_delta="0"
follows="top|left"
height="16"
- layout="topleft"
left="56"
name="info_parcel"
right="-20">
PARCEL NAME
</text>
<text
- type="string"
- length="1"
follows="top|left"
- layout="topleft"
left="16"
name="info_size_label"
width="48">
Size:
</text>
<text
- type="string"
- length="1"
follows="top|left"
top_delta="0"
height="32"
- layout="topleft"
left="56"
name="info_size"
right="-20">
[AREA] m²
</text>
<text
- type="string"
- length="1"
follows="top|left"
font="SansSerifBig"
height="24"
- layout="topleft"
left="16"
name="info_action"
text_color="white"
@@ -96,42 +81,30 @@
To sell this parcel:
</text>
<text
- type="string"
- length="1"
follows="top|left"
font="SansSerif"
height="16"
- layout="topleft"
left="30"
name="price_label">
1. Set a price:
</text>
<text
- type="string"
- length="1"
follows="top|left"
height="16"
- layout="topleft"
left="40"
name="price_text">
Choose an appropriate price.
</text>
<text
- type="string"
- length="1"
height="16"
- layout="topleft"
left="40"
name="price_ld"
width="20">
L$
</text>
<line_editor
- type="string"
- length="1"
follows="top|left"
height="18"
- layout="topleft"
left_delta="20"
name="price"
top_delta="0"
@@ -139,10 +112,7 @@
0
</line_editor>
<text
- type="string"
- length="1"
height="16"
- layout="topleft"
left="40"
name="price_per_m"
top_delta="25"
@@ -150,22 +120,16 @@
(L$[PER_METER] per m²)
</text>
<text
- type="string"
- length="1"
follows="top|left"
font="SansSerif"
height="16"
- layout="topleft"
left="30"
name="sell_to_label">
2. Sell the land to:
</text>
<text
- type="string"
- length="1"
follows="top|left"
height="25"
- layout="topleft"
left="40"
word_wrap="true"
name="sell_to_text"
@@ -173,9 +137,8 @@
Choose whether to sell to anyone or a particular buyer.
</text>
<combo_box
- follows="top|right"
+ follows="top|left"
height="18"
- layout="topleft"
left_delta="0"
name="sell_to"
top_delta="32"
@@ -196,9 +159,8 @@
</combo_box>
<line_editor
enabled="false"
- follows="top|right"
+ follows="top|left"
height="18"
- layout="topleft"
left_delta="0"
name="sell_to_agent"
top_pad="4"
@@ -206,29 +168,22 @@
<button
height="20"
label="Select"
- layout="topleft"
left_pad="5"
name="sell_to_select_agent"
top_delta="0"
width="60" />
<text
- type="string"
- length="1"
follows="top|left"
font="SansSerif"
height="16"
- layout="topleft"
left="30"
name="sell_objects_label">
3. Sell the objects with the land?
</text>
<text
- type="string"
- length="1"
font="SansSerifSmall"
follows="top|left"
height="25"
- layout="topleft"
word_wrap="true"
left="40"
name="sell_objects_text">
@@ -236,16 +191,14 @@
</text>
<radio_group
top_pad="5"
- follows="top|right"
+ follows="top|left"
height="40"
- layout="topleft"
left="40"
name="sell_objects"
- right="420">
+ right="-20">
<radio_item
bottom="40"
height="0"
- layout="topleft"
left="10"
name="none"
visible="false" />
@@ -253,33 +206,27 @@
bottom="20"
height="16"
label="No, keep ownership of objects"
- layout="topleft"
left="10"
name="no" />
<radio_item
bottom="40"
height="16"
label="Yes, sell objects with land"
- layout="topleft"
left="10"
name="yes" />
</radio_group>
<button
height="20"
label="Show Objects"
- layout="topleft"
name="show_objects"
left="70"
top_pad="10"
width="110" />
<text
- type="string"
- length="1"
bottom_delta="30"
follows="top|left"
font="SansSerifBig"
height="16"
- layout="topleft"
left="16"
name="nag_message_label"
right="-20">
@@ -289,16 +236,14 @@
follows="bottom|left"
height="20"
label="Set Land For Sale"
- layout="topleft"
left_delta="0"
name="sell_btn"
top_pad="10"
width="130" />
<button
- follows="bottom|right"
+ follows="bottom|left"
height="20"
label="Cancel"
- layout="topleft"
left_pad="30"
name="cancel_btn"
top_delta="0"
diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml
index 8860ac1e50..ec54522d3e 100644
--- a/indra/newview/skins/default/xui/en/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml
@@ -2,8 +2,9 @@
<floater
legacy_header_height="18"
can_minimize="false"
+ can_close="true"
follows="left|top"
- height="526"
+ height="516"
layout="topleft"
name="Snapshot"
help_topic="snapshot"
@@ -14,94 +15,84 @@
name="unknown">
unknown
</floater.string>
- <text
- type="string"
- length="1"
- follows="top|left"
- height="15"
- layout="topleft"
- left="10"
- name="type_label"
- top="25"
- width="195">
- Snapshot destination
- </text>
<radio_group
- height="60"
+ height="58"
label="Snapshot type"
layout="topleft"
- left_delta="0"
+ left="10"
name="snapshot_type_radio"
- top_pad="5"
- width="195">
+ top="25"
+ width="205">
<radio_item
bottom="19"
height="16"
- label="Send via email"
+ label="Email"
layout="topleft"
name="postcard" />
<radio_item
bottom="38"
height="16"
- label="Save to your inventory (L$[AMOUNT])"
+ label="My inventory (L$[AMOUNT])"
layout="topleft"
name="texture" />
<radio_item
bottom="57"
height="16"
- label="Save to your hard drive"
+ label="Save to my computer"
layout="topleft"
name="local" />
</radio_group>
<text
type="string"
+ font="SansSerifSmall"
length="1"
follows="left|top"
- height="25"
+ height="14"
layout="topleft"
+ right="-5"
left_delta="0"
+ halign="right"
name="file_size_label"
top_pad="106"
width="195">
- File size: [SIZE] KB
+ [SIZE] KB
</text>
<button
follows="left|top"
- height="20"
- label="Refresh Snapshot"
+ height="22"
+ image_overlay="Refresh_Off"
layout="topleft"
- left_delta="0"
+ left="10"
name="new_snapshot_btn"
- top_delta="15"
- width="195" />
+ width="23" />
<button
follows="left|top"
- height="20"
+ height="23"
label="Send"
layout="topleft"
- left_delta="0"
+ left_pad="5"
+ right="-5"
name="send_btn"
- top_pad="2"
- width="105" />
+ width="100" />
<button
follows="left|top"
- height="20"
+ height="23"
label="Save (L$[AMOUNT])"
layout="topleft"
- left_delta="0"
+ right="-5"
name="upload_btn"
top_delta="0"
- width="105" />
+ width="100" />
<flyout_button
follows="left|top"
- height="20"
+ height="23"
label="Save"
layout="topleft"
- left_delta="0"
+ right="-5"
name="save_btn"
tool_tip="Save image to a file"
top_delta="0"
- width="105">
+ width="100">
<flyout_button.item
label="Save"
value="save" />
@@ -109,52 +100,51 @@
label="Save As..."
value="save as" />
</flyout_button>
- <button
+ <button
follows="left|top"
- height="20"
- label="Cancel"
- layout="topleft"
- left_pad="5"
- name="discard_btn"
- top_delta="0"
- width="85" />
- <button
- follows="left|top"
- height="20"
- label="More &gt;&gt;"
+ height="23"
+ label="More"
layout="topleft"
left="10"
name="more_btn"
tool_tip="Advanced options"
- top="270"
width="80" />
<button
follows="left|top"
- height="20"
- label="&lt;&lt; Less"
+ height="23"
+ label="Less"
layout="topleft"
left_delta="0"
name="less_btn"
tool_tip="Advanced options"
top_delta="0"
width="80" />
+ <button
+ follows="left|top"
+ height="23"
+ label="Cancel"
+ layout="topleft"
+ right="-5"
+ left_pad="5"
+ name="discard_btn"
+ width="100" />
<text
type="string"
length="1"
follows="top|left"
- height="15"
+ height="12"
layout="topleft"
- left_delta="0"
+ left="10"
name="type_label2"
top_pad="5"
- width="115">
+ width="120">
Size
</text>
<text
type="string"
length="1"
follows="top|left"
- height="15"
+ height="12"
layout="topleft"
left_pad="5"
name="format_label"
@@ -163,13 +153,12 @@
Format
</text>
<combo_box
- height="20"
+ height="23"
label="Resolution"
layout="topleft"
left="10"
name="postcard_size_combo"
- top="312"
- width="115">
+ width="120">
<combo_box.item
label="Current Window"
name="CurrentWindow"
@@ -192,13 +181,13 @@
value="[i-1,i-1]" />
</combo_box>
<combo_box
- height="20"
+ height="23"
label="Resolution"
layout="topleft"
left_delta="0"
name="texture_size_combo"
top_delta="0"
- width="115">
+ width="120">
<combo_box.item
label="Current Window"
name="CurrentWindow"
@@ -221,13 +210,13 @@
value="[i-1,i-1]" />
</combo_box>
<combo_box
- height="20"
+ height="23"
label="Resolution"
layout="topleft"
left_delta="0"
name="local_size_combo"
top_delta="0"
- width="115">
+ width="120">
<combo_box.item
label="Current Window"
name="CurrentWindow"
@@ -262,12 +251,11 @@
value="[i-1,i-1]" />
</combo_box>
<combo_box
- height="20"
+ height="23"
label="Format"
layout="topleft"
left_pad="5"
name="local_format_combo"
- top_delta="0"
width="70">
<combo_box.item
label="PNG"
@@ -286,13 +274,13 @@
height="20"
increment="32"
label="Width"
- label_width="30"
+ label_width="40"
layout="topleft"
left="10"
max_val="6016"
min_val="32"
name="snapshot_width"
- top="337"
+ top_pad="10"
width="95" />
<spinner
allow_text_entry="false"
@@ -301,7 +289,7 @@
height="20"
increment="32"
label="Height"
- label_width="35"
+ label_width="40"
layout="topleft"
left_pad="5"
max_val="6016"
@@ -311,7 +299,7 @@
width="95" />
<check_box
bottom_delta="20"
- label="Constrain Proportions"
+ label="Constrain proportions"
layout="topleft"
left="10"
name="keep_aspect_check" />
@@ -321,32 +309,32 @@
height="15"
increment="1"
initial_value="75"
- label="Image Quality"
+ label="Image quality"
+ label_width="100"
layout="topleft"
left_delta="0"
max_val="100"
name="image_quality_slider"
top_pad="5"
- width="210" />
+ width="205" />
<text
type="string"
length="1"
follows="left|top"
- height="20"
+ height="13"
layout="topleft"
- left_delta="0"
+ left="10"
name="layer_type_label"
- top_pad="8"
+ top_pad="5"
width="50">
Capture:
</text>
<combo_box
- height="20"
+ height="23"
label="Image Layers"
layout="topleft"
- left_delta="50"
+ left="30"
name="layer_types"
- top_delta="-3"
width="145">
<combo_box.item
label="Colors"
@@ -362,33 +350,38 @@
value="objects" />
</combo_box>
<check_box
- bottom_delta="20"
- label="Show interface in snapshot"
+ label="Interface"
layout="topleft"
- left="10"
+ left="30"
+ top_pad="10"
+ width="180"
name="ui_check" />
<check_box
- bottom_delta="20"
- label="Show HUD objects in snapshot"
+ label="HUDs"
layout="topleft"
- left="10"
+ left="30"
+ top_pad="10"
+ width="180"
name="hud_check" />
<check_box
- bottom_delta="20"
label="Keep open after saving"
layout="topleft"
left="10"
+ top_pad="8"
+ width="180"
name="keep_open_check" />
<check_box
- bottom_delta="20"
- label="Freeze frame (fullscreen preview)"
+ label="Freeze frame (fullscreen)"
layout="topleft"
left="10"
+ top_pad="8"
+ width="180"
name="freeze_frame_check" />
<check_box
- bottom_delta="20"
label="Auto-refresh"
layout="topleft"
left="10"
+ top_pad="8"
+ width="180"
name="auto_snapshot_check" />
</floater>
diff --git a/indra/newview/skins/default/xui/en/menu_participant_list.xml b/indra/newview/skins/default/xui/en/menu_participant_list.xml
index 0422972cd4..449202aaaa 100644
--- a/indra/newview/skins/default/xui/en/menu_participant_list.xml
+++ b/indra/newview/skins/default/xui/en/menu_participant_list.xml
@@ -16,7 +16,7 @@
<menu_item_call.on_click
function="Avatar.AddFriend" />
<menu_item_call.on_enable
- function="Avatar.EnableItem"
+ function="ParticipantList.EnableItem"
parameter="can_add" />
</menu_item_call>
<menu_item_call
@@ -30,11 +30,14 @@
label="Call"
layout="topleft"
name="Call">
- <menu_item_call.on_click
+ <menu_item_call.on_click
function="Avatar.Call" />
+ <menu_item_call.on_enable
+ function="ParticipantList.EnableItem"
+ parameter="can_call" />
</menu_item_call>
<menu_item_call
- enabled="false"
+ enabled="true"
label="Share"
layout="topleft"
name="Share">
@@ -49,22 +52,22 @@
function="Avatar.Pay" />
</menu_item_call>
<menu_item_check
- label="Block/Unblock"
+ label="Block Voice"
layout="topleft"
name="Block/Unblock">
<menu_item_check.on_click
function="Avatar.BlockUnblock" />
<menu_item_check.on_check
- function="Avatar.CheckItem"
+ function="ParticipantList.CheckItem"
parameter="is_blocked" />
<menu_item_check.on_enable
- function="Avatar.EnableItem"
+ function="ParticipantList.EnableItem"
parameter="can_block" />
</menu_item_check>
<menu_item_separator
layout="topleft" />
<menu_item_check
- label="Mute Text"
+ label="Block Text"
layout="topleft"
name="MuteText">
<on_check
@@ -76,6 +79,10 @@
function="ParticipantList.EnableItem"
parameter="can_mute_text" />
</menu_item_check>
+ <context_menu
+ label="Moderator Options &gt;"
+ layout="topleft"
+ name="Moderator Options" >
<menu_item_check
label="Allow text chat"
layout="topleft"
@@ -136,4 +143,5 @@
function="ParticipantList.EnableItem"
parameter="can_moderate_voice" />
</menu_item_call>
+ </context_menu>
</context_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_people_groups_view_sort.xml b/indra/newview/skins/default/xui/en/menu_people_groups_view_sort.xml
index 304492bedb..df3cb26b04 100644
--- a/indra/newview/skins/default/xui/en/menu_people_groups_view_sort.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_groups_view_sort.xml
@@ -19,5 +19,7 @@
name="Leave Selected Group">
<menu_item_call.on_click
function="People.Group.Minus.Action"/>
+ <menu_item_call.on_enable
+ function="People.Group.Minus.Enable"/>
</menu_item_call>
</menu>
diff --git a/indra/newview/skins/default/xui/en/menu_people_nearby.xml b/indra/newview/skins/default/xui/en/menu_people_nearby.xml
index 39469f7101..5f2e6e0f6c 100644
--- a/indra/newview/skins/default/xui/en/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_nearby.xml
@@ -32,6 +32,9 @@
name="Call">
<menu_item_call.on_click
function="Avatar.Call" />
+ <menu_item_call.on_enable
+ function="Avatar.EnableItem"
+ parameter="can_call" />
</menu_item_call>
<menu_item_call
label="Share"
diff --git a/indra/newview/skins/default/xui/en/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/en/menu_people_nearby_multiselect.xml
index df74d2dcd4..0d3dd3366d 100644
--- a/indra/newview/skins/default/xui/en/menu_people_nearby_multiselect.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_nearby_multiselect.xml
@@ -27,6 +27,9 @@
name="Call">
<on_click
function="Avatar.Call" />
+ <on_enable
+ function="Avatar.EnableItem"
+ parameter="can_call" />
</menu_item_call>
<menu_item_call
enabled="false"
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index a8e74c5fa9..b4ce32ea1d 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -238,30 +238,55 @@
layout="topleft"
name="World"
tear_off="true">
- <menu_item_check
- label="Move"
+ <menu_item_check
+ label="Mini-Map"
layout="topleft"
- name="Movement Controls">
+ name="Mini-Map"
+ shortcut="control|shift|M">
<menu_item_check.on_check
function="Floater.Visible"
- parameter="moveview" />
+ parameter="mini_map" />
<menu_item_check.on_click
function="Floater.Toggle"
- parameter="moveview" />
+ parameter="mini_map" />
</menu_item_check>
- <menu_item_check
- label="View"
+ <menu_item_check
+ label="World Map"
layout="topleft"
- name="Camera Controls">
+ name="World Map"
+ shortcut="control|M"
+ use_mac_ctrl="true">
<menu_item_check.on_check
function="Floater.Visible"
- parameter="camera" />
+ parameter="world_map" />
<menu_item_check.on_click
function="Floater.Toggle"
- parameter="camera" />
+ parameter="world_map" />
</menu_item_check>
- <menu_item_separator
- layout="topleft" />
+ <menu_item_call
+ label="Snapshot"
+ layout="topleft"
+ name="Take Snapshot"
+ shortcut="control|shift|S">
+ <menu_item_call.on_click
+ function="Floater.Show"
+ parameter="snapshot" />
+ </menu_item_call>
+ <menu_item_call
+ label="Landmark This Place"
+ layout="topleft"
+ name="Create Landmark Here">
+ <menu_item_call.on_click
+ function="World.CreateLandmark" />
+ <menu_item_call.on_enable
+ function="World.EnableCreateLandmark" />
+ </menu_item_call>
+ <menu
+ create_jump_keys="true"
+ label="About This Place"
+ layout="topleft"
+ name="Land"
+ tear_off="true">
<menu_item_call
label="About Land"
layout="topleft"
@@ -278,6 +303,9 @@
function="Floater.Show"
parameter="region_info" />
</menu_item_call>
+ </menu>
+ <menu_item_separator
+ layout="topleft" />
<menu_item_call
label="Buy Land"
layout="topleft"
@@ -301,6 +329,28 @@
layout="topleft"
name="Land"
tear_off="true">
+ <menu_item_check
+ label="Move Controls"
+ layout="topleft"
+ name="Movement Controls">
+ <menu_item_check.on_check
+ function="Floater.Visible"
+ parameter="moveview" />
+ <menu_item_check.on_click
+ function="Floater.Toggle"
+ parameter="moveview" />
+ </menu_item_check>
+ <menu_item_check
+ label="View Controls"
+ layout="topleft"
+ name="Camera Controls">
+ <menu_item_check.on_check
+ function="Floater.Visible"
+ parameter="camera" />
+ <menu_item_check.on_click
+ function="Floater.Toggle"
+ parameter="camera" />
+ </menu_item_check>
<menu_item_check
label="Ban Lines"
layout="topleft"
@@ -347,32 +397,8 @@
</menu>
<menu_item_separator
layout="topleft" />
- <menu
- label="Landmarks"
- layout="topleft"
- name="Landmarks"
- tear_off="true">
- <menu_item_call
- label="Create Landmark Here"
- layout="topleft"
- name="Create Landmark Here">
- <menu_item_call.on_click
- function="World.CreateLandmark" />
- <menu_item_call.on_enable
- function="World.EnableCreateLandmark" />
- </menu_item_call>
- <menu_item_call
- label="Set Home to Here"
- layout="topleft"
- name="Set Home to Here">
- <menu_item_call.on_click
- function="World.SetHomeLocation" />
- <menu_item_call.on_enable
- function="World.EnableSetHomeLocation" />
- </menu_item_call>
- </menu>
<menu_item_call
- label="Home"
+ label="Teleport Home"
layout="topleft"
name="Teleport Home"
shortcut="control|shift|H">
@@ -381,31 +407,15 @@
<menu_item_call.on_enable
function="World.EnableTeleportHome" />
</menu_item_call>
- <menu_item_check
- label="Mini-Map"
- layout="topleft"
- name="Mini-Map"
- shortcut="control|shift|M">
- <menu_item_check.on_check
- function="Floater.Visible"
- parameter="mini_map" />
- <menu_item_check.on_click
- function="Floater.Toggle"
- parameter="mini_map" />
- </menu_item_check>
- <menu_item_check
- label="World Map"
- layout="topleft"
- name="World Map"
- shortcut="control|M"
- use_mac_ctrl="true">
- <menu_item_check.on_check
- function="Floater.Visible"
- parameter="world_map" />
- <menu_item_check.on_click
- function="Floater.Toggle"
- parameter="world_map" />
- </menu_item_check>
+ <menu_item_call
+ label="Set Home to Here"
+ layout="topleft"
+ name="Set Home to Here">
+ <menu_item_call.on_click
+ function="World.SetHomeLocation" />
+ <menu_item_call.on_enable
+ function="World.EnableSetHomeLocation" />
+ </menu_item_call>
<!-- <menu_item_check
label="Show Navigation Bar"
layout="topleft"
@@ -432,17 +442,6 @@
layout="topleft" />-->
<menu_item_separator
layout="topleft" />
- <menu_item_call
- label="Snapshot"
- layout="topleft"
- name="Take Snapshot"
- shortcut="control|shift|S">
- <menu_item_call.on_click
- function="Floater.Show"
- parameter="snapshot" />
- </menu_item_call>
- <menu_item_separator
- layout="topleft" />
<menu
create_jump_keys="true"
label="Sun"
@@ -484,7 +483,7 @@
parameter="midnight" />
</menu_item_call>
<menu_item_call
- label="Use the Estate Time"
+ label="Estate Time"
layout="topleft"
name="Revert to Region Default">
<menu_item_call.on_click
@@ -1056,14 +1055,14 @@
function="ShowHelp"
parameter="f1_help" />
</menu_item_call>
- <menu_item_call
+ <!-- <menu_item_call
label="Tutorial"
layout="topleft"
name="Tutorial">
<menu_item_call.on_click
function="Floater.Show"
parameter="hud" />
- </menu_item_call>
+ </menu_item_call>-->
<menu_item_separator
layout="topleft" />
<menu_item_call
@@ -2514,7 +2513,7 @@
function="CheckControl"
parameter="TextureDisable" />
<menu_item_check.on_click
- function="ToggleControl"
+ function="ToggleControl"
parameter="TextureDisable" />
</menu_item_check>
<menu_item_check
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 3d17a4e32f..ffb11d1737 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -5027,13 +5027,13 @@ An object named [OBJECTFROMNAME] owned by (an unknown Resident) has given you [O
name="Keep"
text="Keep"/>
<button
- index="4"
- name="Show"
- text="Show"/>
- <button
index="1"
name="Discard"
text="Discard"/>
+ <button
+ index="2"
+ name="Mute"
+ text="Block"/>
</form>
</notification>
diff --git a/indra/newview/skins/default/xui/en/panel_media_settings_general.xml b/indra/newview/skins/default/xui/en/panel_media_settings_general.xml
index c8ec515e6d..5217ab3571 100644
--- a/indra/newview/skins/default/xui/en/panel_media_settings_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_media_settings_general.xml
@@ -17,7 +17,7 @@
height="15"
left="10"
name="home_label">
- Home URL:
+ Home Page:
</text>
<text
visible="false"
@@ -27,7 +27,7 @@
left_delta="64"
text_color="red"
name="home_fails_whitelist_label">
- (This URL does not pass the specified whitelist)
+ (This page does not pass the specified whitelist)
</text>
<line_editor
bottom_delta="-24"
@@ -37,7 +37,7 @@
height="20"
left="10"
name="home_url"
- tool_tip="The home URL for this media source"
+ tool_tip="The home page for this media source"
width="340">
<!-- <line_editor.commit_callback
function="Media.CommitHomeURL"/> -->
@@ -69,7 +69,7 @@
height="15"
left="10"
name="current_url_label">
- Current URL:
+ Current Page:
</text>
<text
bottom_delta="-20"
@@ -79,7 +79,7 @@
height="20"
left="10"
name="current_url"
- tool_tip="The current URL for this media source"
+ tool_tip="The current page for this media source"
value=""
width="340" />
<button
diff --git a/indra/newview/skins/default/xui/en/panel_media_settings_security.xml b/indra/newview/skins/default/xui/en/panel_media_settings_security.xml
index 6e82713f06..1f41a0d284 100644
--- a/indra/newview/skins/default/xui/en/panel_media_settings_security.xml
+++ b/indra/newview/skins/default/xui/en/panel_media_settings_security.xml
@@ -48,7 +48,7 @@
bottom_delta="0"
text_color="0.4 0.4 0.4 1.0"
name="home_url_fails_some_items_in_whitelist">
- Entries that the home URL fails against are marked:
+ Entries that the home page fails against are marked:
</text>
<button
bottom_delta="-36"
@@ -82,7 +82,7 @@
left="30"
text_color="0.6 0.0 0.0 1.0"
name="home_url_fails_whitelist">
-Warning: the home URL specified in the General tab
+Warning: the home page specified in the General tab
fails to pass this whitelist. It has been disabled
until a valid entry has been added.
</text>
diff --git a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
index db95d01b43..ab73f135b9 100644
--- a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
@@ -1,61 +1,104 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="Outfits"
- height="510"
- width="333"
- follows="top|left"
- left="0"
- top_pad="0">
- <accordion
- single_expansion="true"
- height="510"
- layout="topleft"
- left="0"
- follows="top|left"
- name="outfits_accordion"
- top_pad="0"
- width="333">
- <accordion_tab
- expanded="false"
- layout="topleft"
- name="tab_cof"
- title="Current Outfit">
- <inventory_panel
+
+ <panel name="Outfits"
+ background_visible="true"
+ follows="all"
+ height="550"
+ label="Things"
+ layout="topleft"
+ min_height="350"
+ min_width="240"
+ width="330"
+ border="false">
+ <tab_container
+ follows="all"
+ height="500"
+ layout="topleft"
+ left="10"
+ name="appearance_tabs"
+ tab_min_width="100"
+ tab_height="30"
+ tab_position="top"
+ halign="center"
+ width="313">
+ <inventory_panel
+ label="MY OUTFITS"
+ help_topic="my_outfits_tab"
allow_multi_select="true"
+ follows="all"
border="false"
- height="460"
- left="0"
- top="0"
- mouse_opaque="true"
- name="cof_accordionpanel"
- start_folder="Current Outfit" />
- </accordion_tab>
- <accordion_tab
- expanded="true"
- layout="topleft"
- name="tab_outfits"
- title="My Outfits">
- <inventory_panel
- allow_multi_select="true"
- border="false"
- follows="all"
- left="0"
- top="0"
- height="460"
- mouse_opaque="true"
- name="outfitslist_accordionpanel"
- start_folder="My Outfits" />
- </accordion_tab>
- </accordion>
- <!--<button bottom="0"
- halign="center"
- height="23"
- label=">"
- enabled="false"
- mouse_opaque="false"
- name="selector"
- width="20"
- left="0"
- visible="false"
- follows="right|bottom"
- tool_tip="View outfit properties" />-->
+ left="0"
+ top="0"
+ height="500"
+ width="290"
+ mouse_opaque="true"
+ name="outfitslist_accordionpanel"
+ start_folder="My Outfits" />
+ <inventory_panel
+ label="WEARING"
+ help_topic="now_wearing_tab"
+ allow_multi_select="true"
+ border="false"
+ height="500"
+ width="290"
+ left="0"
+ top="0"
+ mouse_opaque="true"
+ name="cof_accordionpanel"
+ start_folder="Current Outfit" />
+ </tab_container>
+ <panel
+ background_visible="true"
+ follows="bottom|left"
+ height="50"
+ layout="topleft"
+ left="0"
+ visible="true"
+ name="bottom_panel"
+ top_pad="10"
+ width="313">
+ <button
+ follows="bottom|left"
+ tool_tip="Show additional options"
+ height="18"
+ image_disabled="OptionsMenu_Disabled"
+ image_selected="OptionsMenu_Press"
+ image_unselected="OptionsMenu_Off"
+ layout="topleft"
+ left="10"
+ name="options_gear_btn"
+ top="6"
+ width="18" />
+ <button
+ follows="bottom|left"
+ height="18"
+ image_selected="AddItem_Press"
+ image_unselected="AddItem_Off"
+ image_disabled="AddItem_Disabled"
+ layout="topleft"
+ left_pad="5"
+ name="add_btn"
+ tool_tip="Add new item"
+ width="18" />
+ <dnd_button
+ follows="bottom|left"
+ height="18"
+ image_selected="TrashItem_Press"
+ image_unselected="TrashItem_Off"
+ layout="topleft"
+ right="-5"
+ name="trash_btn"
+ tool_tip="Remove selected item"
+ top="6"
+ width="18" />
+ <button
+ follows="top|left"
+ height="23"
+ label="Wear"
+ layout="topleft"
+ name="wear_btn"
+ right="-5"
+ top_pad="0"
+ width="90" />
+ </panel>
</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_picks.xml b/indra/newview/skins/default/xui/en/panel_picks.xml
index 4facedc7ea..2230229b14 100644
--- a/indra/newview/skins/default/xui/en/panel_picks.xml
+++ b/indra/newview/skins/default/xui/en/panel_picks.xml
@@ -20,12 +20,9 @@
height="535"
layout="topleft"
left="6"
- name="empty_picks_panel_text"
+ name="picks_panel_text"
top="10"
- visible="false"
- width="313">
- There are no picks/classifieds here
- </text>
+ width="313"/>
<accordion
fit_parent="true"
follows="all"
diff --git a/indra/newview/skins/default/xui/en/panel_places.xml b/indra/newview/skins/default/xui/en/panel_places.xml
index c24f47750b..d4a6c7f3b3 100644
--- a/indra/newview/skins/default/xui/en/panel_places.xml
+++ b/indra/newview/skins/default/xui/en/panel_places.xml
@@ -77,6 +77,7 @@ background_visible="true"
layout="topleft"
left="5"
name="teleport_btn"
+ tool_tip="Teleport to the selected area"
top="0"
width="100" />
<button
@@ -86,6 +87,7 @@ background_visible="true"
layout="topleft"
left_pad="5"
name="map_btn"
+ tool_tip="Show selected area on the map"
top="0"
width="70" />
<button
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
index 78b90eefcc..405ff02836 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
@@ -284,7 +284,7 @@ Avatars:
enabled_control="EnableVoiceChat"
control_name="PushToTalkToggle"
height="20"
- label="Toggle mode for microphone when I press the speak trigger key:"
+ label="Toggle mode for microphone when I press the Speak trigger key:"
layout="topleft"
left="30"
name="push_to_talk_toggle_check"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_general.xml b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
index feed6cc10f..7c9256e69d 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
@@ -13,7 +13,7 @@
type="string"
length="1"
follows="left|top"
- height="10"
+ height="15"
layout="topleft"
left="30"
name="language_textbox"
@@ -23,14 +23,13 @@
</text>
<combo_box
control_name="Language"
- follows="left|bottom"
+ follows="left|top"
height="23"
layout="topleft"
- left_delta="50"
+ left="50"
max_chars="135"
name="language_combobox"
- top_pad="10"
- width="170">
+ width="200">
<combo_box.item
enabled="true"
label="System default"
@@ -66,7 +65,6 @@
label="Italiano (Italian) - Beta"
name="Italian"
value="it" />
-
<combo_box.item
enabled="true"
label="Nederlands (Dutch) - Beta"
@@ -82,62 +80,54 @@
label="Portugués (Portuguese) - Beta"
name="Portugese"
value="pt" />
-
-
-
-
<combo_box.item
enabled="true"
label="日本語 (Japanese) - Beta"
name="(Japanese)"
value="ja" />
-
-
</combo_box>
<text
+ font="SanSerifSmall"
type="string"
length="1"
follows="left|top"
- height="10"
+ height="18"
layout="topleft"
- left_delta="175"
+ left_pad="5"
name="language_textbox2"
- top_delta="1"
- width="400">
+ width="200">
(Requires restart)
</text>
<text
type="string"
length="1"
follows="left|top"
- height="10"
+ height="15"
layout="topleft"
left="30"
+ top_pad="15"
name="maturity_desired_prompt"
- top_pad="10"
- width="400">
+ width="200">
I want to access content rated:
</text>
<text
type="string"
length="1"
follows="left|top"
- height="10"
+ height="15"
layout="topleft"
- left="90"
+ left_pad="5"
name="maturity_desired_textbox"
- top_pad="10"
- width="400">
+ width="200">
</text>
<combo_box
control_name="PreferredMaturity"
- follows="left|bottom"
+ follows="left|top"
height="23"
layout="topleft"
- left_delta="-10"
+ left="50"
name="maturity_desired_combobox"
- top_pad="-10"
- width="170">
+ width="200">
<combo_box.item
label="General, Moderate, Adult"
name="Desired_Adult"
@@ -155,23 +145,22 @@
type="string"
length="1"
follows="left|top"
- height="10"
+ height="15"
layout="topleft"
left="30"
name="start_location_textbox"
- top_delta="20"
+ top_pad="10"
width="394">
Start location:
</text>
<combo_box
control_name="LoginLocation"
- follows="left|bottom"
+ follows="left|top"
height="23"
layout="topleft"
- left_delta="50"
name="start_location_combo"
- top_pad="10"
- width="170">
+ left="50"
+ width="200">
<combo_box.item
label="My Last Location"
name="MyLastLocation"
@@ -187,57 +176,48 @@
initial_value="true"
label="Show on login"
layout="topleft"
- left_delta="175"
+ left_pad="5"
name="show_location_checkbox"
- top_delta="1"
+ top_delta="5"
width="256" />
-
<text
type="string"
length="1"
follows="left|top"
- height="10"
+ height="15"
layout="topleft"
left="30"
name="name_tags_textbox"
- top_pad="10"
+ top_pad="15"
width="400">
Name tags:
</text>
<radio_group
control_name="AvatarNameTagMode"
- height="30"
+ height="20"
layout="topleft"
- left_delta="50"
- name="Name_Tag_Preference"
- top_pad="10">
+ left="50"
+ name="Name_Tag_Preference">
<radio_item
- height="16"
label="Off"
layout="topleft"
- left="0"
name="radio"
value="0"
- top_pad="0"
- width="98" />
+ width="100" />
<radio_item
- height="16"
label="On"
layout="topleft"
left_pad="12"
name="radio2"
value="1"
- top_delta="0"
- width="98" />
+ width="100" />
<radio_item
- height="16"
label="Show briefly"
layout="topleft"
left_pad="12"
name="radio3"
value="2"
- top_delta="0"
- width="98" />
+ width="100" />
</radio_group>
<check_box
enabled_control="AvatarNameTagMode"
@@ -245,9 +225,8 @@
height="16"
label="Show my name"
layout="topleft"
- left_delta="0"
+ left="50"
name="show_my_name_checkbox1"
- top_pad="-7"
width="300" />
<check_box
enabled_control="AvatarNameTagMode"
@@ -258,7 +237,6 @@
layout="topleft"
left_delta="175"
name="small_avatar_names_checkbox"
- top_delta="0"
width="200" />
<check_box
enabled_control="AvatarNameTagMode"
@@ -274,45 +252,41 @@
type="string"
length="1"
follows="left|top"
- height="10"
+ height="15"
layout="topleft"
left="30"
name="effects_color_textbox"
- top_pad="5"
- width="400">
+ top_pad="15"
+ width="200">
My effects:
</text>
- <color_swatch
- border_color="0.45098 0.517647 0.607843 1"
- control_name="EffectColor"
- follows="left|top"
- height="48"
- layout="topleft"
- left_delta="50"
- name="effect_color_swatch"
- tool_tip="Click to open Color Picker"
- top_pad="5"
- width="32" />
<text
type="string"
length="1"
follows="left|top"
- height="15"
+ height="13"
layout="topleft"
- left="30"
+ left_pad="5"
name="title_afk_text"
- text_color="white"
- top_pad="-5"
width="190">
Away timeout:
</text>
+ <color_swatch
+ control_name="EffectColor"
+ follows="left|top"
+ height="50"
+ layout="topleft"
+ left="50"
+ name="effect_color_swatch"
+ tool_tip="Click to open Color Picker"
+ width="38" />
<combo_box
- top_pad="-20"
- height="20"
+ height="23"
layout="topleft"
control_name="AFKTimeout"
- left="140"
- label="Away Timeout:"
+ left_pad="160"
+ label="Away timeout:"
+ top_delta="0"
name="afk"
width="130">
<combo_box.item
@@ -340,27 +314,34 @@
type="string"
length="1"
follows="left|top"
- height="10"
+ height="13"
layout="topleft"
text_color="white"
left="30"
mouse_opaque="false"
name="text_box3"
- top_pad="10"
+ top_pad="15"
width="240">
Busy mode response:
</text>
<text_editor
control_name="BusyModeResponse2"
+ text_readonly_color="LabelDisabledColor"
+ bg_writeable_color="LtGray"
+ border_color="DefaultHighlightLight"
+ use_ellipses="false"
+ bg_visible="false"
+ border_visible="false"
+ hover="false"
+ text_color="LabelTextColor"
commit_on_focus_lost = "true"
follows="left|top"
- height="56"
+ height="50"
layout="topleft"
- left_delta="50"
+ left="50"
name="busy_response"
width="400"
- word_wrap="true"
- top_pad="5">
+ word_wrap="true">
log_in_to_change
</text_editor>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
index e06c15502c..83dc7cd854 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
@@ -3,7 +3,7 @@
border="true"
follows="left|top|right|bottom"
height="408"
- label="Input &amp; Camera"
+ label="Setup"
layout="topleft"
left="102"
name="Input panel"
@@ -223,7 +223,7 @@
follows="left|top"
height="23"
label="Reset"
- label_selected="Set"
+ label_selected="Reset"
layout="topleft"
left_pad="3"
name="reset_cache"
diff --git a/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml
index b4f72a48bc..bffb28d16e 100644
--- a/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml
+++ b/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml
@@ -9,7 +9,7 @@
width="800">
<string name="control_background_image_name">Inspector_Background</string>
<string name="skip_step">0.2</string>
- <string name="min_width">400</string>
+ <string name="min_width">300</string>
<string name="min_height">120</string>
<string name="zoom_near_padding">1.0</string>
<string name="zoom_medium_padding">1.25</string>
@@ -190,7 +190,7 @@
layout="topleft"
top="14"
min_width="22"
- width="22">
+ width="24">
<button
image_overlay="Play_Off"
image_disabled="PushButton_Disabled"
@@ -200,6 +200,8 @@
hover_glow_amount="0.15"
layout="topleft"
tool_tip = "Play media"
+ left_delta="2"
+ top="4"
height="22"
min_width="22"
width="22">
@@ -214,7 +216,7 @@
layout="topleft"
top="18"
min_width="22"
- width="22">
+ width="24">
<button
image_overlay="Pause_Off"
image_disabled="PushButton_Disabled"
@@ -224,6 +226,9 @@
hover_glow_amount="0.15"
layout="topleft"
height="22"
+ width="22"
+ left_delta="-1"
+ top="4"
tool_tip = "Pause media">
<button.commit_callback
function="MediaCtrl.Pause" />
diff --git a/indra/newview/skins/default/xui/en/panel_teleport_history.xml b/indra/newview/skins/default/xui/en/panel_teleport_history.xml
index 32fc9fce01..06da64533b 100644
--- a/indra/newview/skins/default/xui/en/panel_teleport_history.xml
+++ b/indra/newview/skins/default/xui/en/panel_teleport_history.xml
@@ -151,7 +151,7 @@
<button
follows="bottom|left"
font="SansSerifBigBold"
- tool_tip=""
+ tool_tip="Show additional optioins"
height="18"
image_disabled="OptionsMenu_Disabled"
image_selected="OptionsMenu_Press"
diff --git a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
index 3dac1a9614..27f19d44fa 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
@@ -85,72 +85,21 @@ left="0"
class="panel_outfits_inventory"
filename="panel_outfits_inventory.xml"
name="panel_outfits_inventory"
- height="510"
+ height="550"
min_height="510"
width="333"
top_pad="0"
- follows="top|left"
+ follows="all"
/>
- <panel
- visible="true"
- name="bottom_panel"
- height="50"
- left="0"
- top_pad="3"
- follows="bottom|left"
- width="333">
- <button
- follows="bottom|left"
- tool_tip="Show additional options"
- height="18"
- image_disabled="OptionsMenu_Disabled"
- image_selected="OptionsMenu_Press"
- image_unselected="OptionsMenu_Off"
- layout="topleft"
- left="10"
- name="options_gear_btn"
- top="6"
- width="18" />
- <button
- follows="bottom|left"
- height="18"
- image_selected="AddItem_Press"
- image_unselected="AddItem_Off"
- image_disabled="AddItem_Disabled"
- layout="topleft"
- left_pad="5"
- name="newlook_btn"
- tool_tip="Add new outfit"
- width="18" />
- <dnd_button
- follows="bottom|left"
- height="18"
- image_selected="TrashItem_Press"
- image_unselected="TrashItem_Off"
- layout="topleft"
- right="-5"
- name="trash_btn"
- tool_tip="Remove selected item"
- top="6"
- width="18" />
- <button
- follows="bottom|left"
- height="23"
- label="Wear"
- layout="topleft"
- name="wear_btn"
- right="-5"
- top_pad="0"
- width="90" />
- </panel>
- <!-- <button
- follows="bottom|left"
- height="23"
- label="New outfit"
- layout="topleft"
- left_pad="5"
- right="-10"
- width="100" />-->
+ <!-- <button
+ follows="bottom|left"
+ height="23"
+ label="New outfit"
+ layout="topleft"
+ left_pad="5"
+ right="-10"
+ name="newlook_btn"
+ width="100" />-->
<panel
class="panel_look_info"
filename="panel_look_info.xml"
@@ -167,4 +116,5 @@ left="0"
left="0"
name="panel_edit_wearable"
visible="false" />
-</panel> \ No newline at end of file
+</panel>
+
diff --git a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
index eff2ca1fcd..5b379b54e3 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
@@ -487,7 +487,7 @@
height="25"
label="Open"
layout="topleft"
- left_pad="5"
+ left="5"
name="open_btn"
top="0"
width="60" />
@@ -509,23 +509,5 @@
name="buy_btn"
top="0"
width="60" />
- <button
- follows="bottom|right"
- height="25"
- label="Cancel"
- layout="topleft"
- name="cancel_btn"
- right="-1"
- top="0"
- width="70" />
- <button
- follows="bottom|right"
- height="25"
- label="Save"
- layout="topleft"
- name="save_btn"
- left_pad="-135"
- top="0"
- width="60" />
</panel>
</panel> \ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 1f7784d9ab..ec4723bd55 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2074,6 +2074,10 @@ this texture in your inventory
<!-- panel classified -->
<string name="ClassifiedClicksTxt">Clicks: [TELEPORT] teleport, [MAP] map, [PROFILE] profile</string>
<string name="ClassifiedUpdateAfterPublish">(will update after publish)</string>
+
+ <!-- panel picks -->
+ <string name="NoPicksClassifiedsText">There are no picks/classifieds here</string>
+ <string name="PicksClassifiedsLoadingText">Loading...</string>
<!-- Multi Preview Floater -->
<string name="MultiPreviewTitle">Preview</string>
@@ -2842,6 +2846,10 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
<string name="IM_to_label">To</string>
<string name="IM_moderator_label">(Moderator)</string>
+ <!-- voice calls -->
+ <string name="started_call">Started a voice call</string>
+ <string name="joined_call">Joined the voice call</string>
+
<string name="ringing-im">
Joining Voice Chat...
</string>
@@ -2877,6 +2885,14 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
<string name="muted_message">
You have blocked this resident. Sending a message will automatically unblock them.
</string>
+ <!--Some times string name is getting from the body of server response.
+ For ex.: from gIMMgr::showSessionStartError in the LLViewerChatterBoxSessionStartReply::post.
+ In case of the EXT-3115 issue 'generic' is passed into the gIMMgr::showSessionStartError as a string name.
+ Also there are some other places where "generic" is used.
+ So, let add string with name="generic" with the same value as "generic_request_error" -->
+ <string name="generic">
+ Error making request, please try again later.
+ </string>
<string name="generic_request_error">
Error making request, please try again later.
</string>
@@ -2904,6 +2920,9 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
<string name="message_session_event">
Unable to send your message to the chat session with [RECIPIENT].
</string>
+ <string name="mute">
+ Error while moderating.
+ </string>
<string name="removed_from_group">
You have been removed from the group.
</string>
diff --git a/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml b/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml
index 9990324d03..102dc0c16d 100644
--- a/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml
+++ b/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml
@@ -8,7 +8,7 @@
header_image="Accordion_Off"
header_image_over="Accordion_Over"
header_image_pressed="Accordion_Press"
- header_image_expanded="Accordion_Selected"
+ header_image_focused="Accordion_Selected"
header_text_color="LtGray"
font="SansSerif"
/>