summaryrefslogtreecommitdiff
path: root/indra/newview/skins
diff options
context:
space:
mode:
authorAndrey Lihatskiy <alihatskiy@productengine.com>2024-07-27 19:37:18 +0300
committerGitHub <noreply@github.com>2024-07-27 19:37:18 +0300
commit0a6f28209e2be86462428a6f779b465e3604e831 (patch)
treeb968655ced36ef127b028819e9edb509861a76ca /indra/newview/skins
parente008b44fd88be83426812e67707896e970947c49 (diff)
parent817bc25b2732dc23295e6a7ac0da5ad142e33434 (diff)
Merge branch 'develop' into marchcat/b-develop
Diffstat (limited to 'indra/newview/skins')
-rw-r--r--indra/newview/skins/default/xui/en/floater_im_session.xml1
-rw-r--r--indra/newview/skins/default/xui/en/floater_region_restart_schedule.xml278
-rw-r--r--indra/newview/skins/default/xui/en/notifications.xml6
-rw-r--r--indra/newview/skins/default/xui/en/panel_edit_alpha.xml5
-rw-r--r--indra/newview/skins/default/xui/en/panel_region_general.xml14
-rw-r--r--indra/newview/skins/default/xui/en/panel_scrolling_param.xml4
-rw-r--r--indra/newview/skins/default/xui/en/strings.xml1
-rw-r--r--indra/newview/skins/default/xui/en/widgets/drop_down.xml2
-rw-r--r--indra/newview/skins/default/xui/en/widgets/emoji_complete.xml1
9 files changed, 298 insertions, 14 deletions
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 738d448f00..7b06bed0a3 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -341,7 +341,6 @@
name="emoji_recent_empty_text"
follows="top|left|right"
layout="topleft"
- auto_resize="false"
h_pad="20"
v_pad="10"
top="0"
diff --git a/indra/newview/skins/default/xui/en/floater_region_restart_schedule.xml b/indra/newview/skins/default/xui/en/floater_region_restart_schedule.xml
new file mode 100644
index 0000000000..fd04acde35
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_region_restart_schedule.xml
@@ -0,0 +1,278 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ height="180"
+ layout="topleft"
+ name="floater_region_restart_schedule"
+ help_topic="Preferences_Graphics_Advanced"
+ single_instance="true"
+ save_rect="true"
+ title="REGION RESTART SCHEDULE"
+ width="300">
+
+<!-- This block shows Advanced Settings -->
+ <floater.string name="am_string">am</floater.string>
+ <floater.string name="pm_string">pm</floater.string>
+
+ <text
+ name="days_general"
+ type="string"
+ follows="left|top"
+ layout="topleft"
+ height="16"
+ top="15"
+ left="20"
+ width="328">
+ Restart the region on following days:
+ </text>
+
+ <check_box
+ name="s_chk"
+ label=""
+ tool_tip="Sunday"
+ follows="left|top"
+ layout="topleft"
+ height="20"
+ width="20"
+ left="60"
+ top_pad="5" />
+
+ <check_box
+ name="m_chk"
+ label=""
+ tool_tip="Monday"
+ follows="left|top"
+ layout="topleft"
+ height="20"
+ width="20"
+ left_pad="5"
+ top_delta="0" />
+
+ <check_box
+ name="t_chk"
+ label=""
+ tool_tip="Tuesday"
+ follows="left|top"
+ layout="topleft"
+ height="20"
+ width="20"
+ left_pad="5"
+ top_delta="0" />
+
+ <check_box
+ name="w_chk"
+ label=""
+ tool_tip="Wednesday"
+ follows="left|top"
+ layout="topleft"
+ height="20"
+ width="20"
+ left_pad="5"
+ top_delta="0" />
+
+ <check_box
+ name="r_chk"
+ label=""
+ tool_tip="Thursday"
+ follows="left|top"
+ layout="topleft"
+ height="20"
+ width="20"
+ left_pad="5"
+ top_delta="0" />
+
+ <check_box
+ name="f_chk"
+ label=""
+ tool_tip="Friday"
+ follows="left|top"
+ layout="topleft"
+ height="20"
+ width="20"
+ left_pad="5"
+ top_delta="0" />
+
+ <check_box
+ name="a_chk"
+ label=""
+ tool_tip="Saturday"
+ follows="left|top"
+ layout="topleft"
+ height="20"
+ width="20"
+ left_pad="5"
+ top_delta="0" />
+
+ <text
+ name="su_label"
+ type="string"
+ follows="left|top"
+ layout="topleft"
+ halign="center"
+ height="16"
+ top_pad="5"
+ left="57"
+ width="25">
+ Su
+ </text>
+
+ <text
+ name="mo_label"
+ type="string"
+ follows="left|top"
+ layout="topleft"
+ halign="center"
+ height="16"
+ top_delta="0"
+ left_pad="0"
+ width="25">
+ Mo
+ </text>
+
+ <text
+ name="tu_label"
+ type="string"
+ follows="left|top"
+ layout="topleft"
+ halign="center"
+ height="16"
+ top_delta="0"
+ left_pad="0"
+ width="25">
+ Tu
+ </text>
+
+ <text
+ name="we_label"
+ type="string"
+ follows="left|top"
+ layout="topleft"
+ halign="center"
+ height="16"
+ top_delta="0"
+ left_pad="1"
+ width="25">
+ We
+ </text>
+
+ <text
+ name="th_label"
+ type="string"
+ follows="left|top"
+ layout="topleft"
+ halign="center"
+ height="16"
+ top_delta="0"
+ left_pad="0"
+ width="25">
+ Th
+ </text>
+
+ <text
+ name="fr_label"
+ type="string"
+ follows="left|top"
+ layout="topleft"
+ halign="center"
+ height="16"
+ top_delta="0"
+ left_pad="0"
+ width="25">
+ Fr
+ </text>
+
+ <text
+ name="sa_label"
+ type="string"
+ follows="left|top"
+ layout="topleft"
+ halign="center"
+ height="16"
+ top_delta="0"
+ left_pad="0"
+ width="25">
+ Sa
+ </text>
+
+ <text
+ name="at_label"
+ type="string"
+ follows="left|top"
+ layout="topleft"
+ halign="right"
+ height="16"
+ top_pad="15"
+ left="30"
+ width="40">
+ at
+ </text>
+ <line_editor
+ name="hours_edt"
+ max_length_bytes="2"
+ follows="left|top"
+ layout="topleft"
+ commit_on_focus_lost="true"
+ height="23"
+ width="40"
+ left_pad="4"
+ top_delta="-5"/>
+ <text
+ name="separator_label"
+ type="string"
+ follows="left|top"
+ layout="topleft"
+ halign="center"
+ height="16"
+ top_delta="5"
+ left_pad="0"
+ width="12">
+ :
+ </text>
+ <line_editor
+ name="minutes_edt"
+ max_length_bytes="2"
+ follows="left|top"
+ layout="topleft"
+ commit_on_focus_lost="true"
+ height="23"
+ width="40"
+ left_pad="0"
+ top_delta="-5"/>
+ <button
+ name="am_pm_btn"
+ label="am"
+ follows="left|top"
+ layout="topleft"
+ height="23"
+ width="40"
+ left_pad="1"
+ top_delta="0"/>
+ <text
+ name="utc_label"
+ type="string"
+ follows="left|top"
+ layout="topleft"
+ height="16"
+ top_delta="5"
+ left_pad="5"
+ width="22">
+ UTC
+ </text>
+ <button
+ name="save_btn"
+ label="Save"
+ follows="top|left"
+ layout="topleft"
+ top="145"
+ left="25"
+ height="25"
+ width="110"/>
+ <button
+ name="cancel_btn"
+ label="Cancel"
+ follows="bottom|right"
+ layout="topleft"
+ left_pad="20"
+ top_delta="0"
+ height="25"
+ width="110"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 2c19a89fb2..2e08f6b3be 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -8871,10 +8871,10 @@ New Voice Morphs are available!
persist="true"
type="alertmodal">
Voice Morphs are not supported by this viewer.
+For more information about other voice morph tools, see [[FAQ_URL] this article].
<usetemplate
- notext="Cancel"
- name="okcancelbuttons"
- yestext="Disable Voice Morphing"/>
+ name="okignore"
+ yestext="OK"/>
<tag>voice</tag>
</notification>
diff --git a/indra/newview/skins/default/xui/en/panel_edit_alpha.xml b/indra/newview/skins/default/xui/en/panel_edit_alpha.xml
index 30fee7361f..ab0e447028 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_alpha.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_alpha.xml
@@ -33,7 +33,6 @@
top="0"
width="313" >
<check_box
- control_name="LowerAlphaTextureInvisible"
follows="left|top"
height="16"
layout="topleft"
@@ -58,7 +57,6 @@
</texture_picker>
<check_box
- control_name="UpperAlphaTextureInvisible"
follows="left|top"
height="16"
layout="topleft"
@@ -83,7 +81,6 @@
</texture_picker>
<check_box
- control_name="HeadAlphaTextureInvisible"
follows="left|top"
height="16"
layout="topleft"
@@ -108,7 +105,6 @@
</texture_picker>
<check_box
- control_name="Eye AlphaTextureInvisible"
follows="left|top"
height="16"
layout="topleft"
@@ -133,7 +129,6 @@
</texture_picker>
<check_box
- control_name="HairAlphaTextureInvisible"
follows="left|top"
height="16"
layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/panel_region_general.xml b/indra/newview/skins/default/xui/en/panel_region_general.xml
index 74d21c436e..6ef1b6e44a 100644
--- a/indra/newview/skins/default/xui/en/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_general.xml
@@ -270,8 +270,20 @@
left="250"
name="manage_telehub_btn"
top="70"
- width="150">
+ width="160">
<button.commit_callback
function="RegionInfo.ManageTelehub" />
</button>
+ <button
+ follows="left|top"
+ height="20"
+ label="Manage Restart Schedule..."
+ layout="topleft"
+ name="manage_restart_btn"
+ top_pad="5"
+ left_delta="0"
+ width="160">
+ <button.commit_callback
+ function="RegionInfo.ManageRestart" />
+ </button>
</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_scrolling_param.xml b/indra/newview/skins/default/xui/en/panel_scrolling_param.xml
index 2035bc2caa..ec642131ae 100644
--- a/indra/newview/skins/default/xui/en/panel_scrolling_param.xml
+++ b/indra/newview/skins/default/xui/en/panel_scrolling_param.xml
@@ -84,7 +84,7 @@
enabled="false"
height="132"
image_disabled="PushButton_Disabled"
- image_disabled_selected="PushButton_Disabled_Selected"
+ image_disabled_selected="PushButton_Selected_Disabled"
image_selected="PushButton_Selected"
image_unselected="PushButton_Off"
layout="topleft"
@@ -97,7 +97,7 @@
enabled="false"
height="132"
image_disabled="PushButton_Disabled"
- image_disabled_selected="PushButton_Disabled_Selected"
+ image_disabled_selected="PushButton_Selected_Disabled"
image_selected="PushButton_Selected"
image_unselected="PushButton_Off"
layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index bee58da6b0..2d04b3e0fe 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3818,6 +3818,7 @@ Please reinstall viewer from https://secondlife.com/support/downloads/ and cont
<string name="voice_morphing_url">https://secondlife.com/destination/voice-island</string>
<string name="premium_voice_morphing_url">https://secondlife.com/destination/voice-morphing-premium</string>
+ <string name="no_voice_morphing_faq_url">https://lindenlab.freshdesk.com/support/solutions/articles/31000173560-webrtc-update-for-voice-chat-faq/</string>
<string name="lindenhomes_get_home_url">https://secondlife.com/land/lindenhomes/member.php</string>
<string name="lindenhomes_my_home_url">https://land.secondlife.com/en-Us/lindenhomes/my-home.php</string>
diff --git a/indra/newview/skins/default/xui/en/widgets/drop_down.xml b/indra/newview/skins/default/xui/en/widgets/drop_down.xml
index 75ed485645..80f98b64fc 100644
--- a/indra/newview/skins/default/xui/en/widgets/drop_down.xml
+++ b/indra/newview/skins/default/xui/en/widgets/drop_down.xml
@@ -12,7 +12,7 @@
image_unselected="PushButton_Off"
image_selected="PushButton_Selected"
image_disabled="PushButton_Disabled"
- image_disabled_selected="PushButton_Disabled_Selected"
+ image_disabled_selected="PushButton_Selected_Disabled"
image_overlay="Combobox_Over"
image_overlay_alignment="right" />
<drop_down.combo_list bg_writeable_color="white" />
diff --git a/indra/newview/skins/default/xui/en/widgets/emoji_complete.xml b/indra/newview/skins/default/xui/en/widgets/emoji_complete.xml
index 6cc8d7118f..4a1ba169ad 100644
--- a/indra/newview/skins/default/xui/en/widgets/emoji_complete.xml
+++ b/indra/newview/skins/default/xui/en/widgets/emoji_complete.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<emoji_complete
autosize="false"
- hover_image="ListItem_Over"
selected_image="ListItem_Select"
max_visible="7"
padding="8"