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_edit_ext_day_cycle.xml2
-rw-r--r--indra/newview/skins/default/xui/en/floater_gltf_asset_editor.xml8
-rw-r--r--indra/newview/skins/default/xui/en/floater_material_editor.xml3
-rw-r--r--indra/newview/skins/default/xui/en/floater_mp_performance.xml86
-rw-r--r--indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml154
-rw-r--r--indra/newview/skins/default/xui/en/floater_tools.xml20
-rw-r--r--indra/newview/skins/default/xui/en/language_settings.xml1
-rw-r--r--indra/newview/skins/default/xui/en/menu_viewer.xml12
-rw-r--r--indra/newview/skins/default/xui/en/notifications.xml37
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml2
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_sound.xml167
-rw-r--r--indra/newview/skins/default/xui/en/panel_settings_terrain_transform.xml2
-rw-r--r--indra/newview/skins/default/xui/en/strings.xml5
13 files changed, 331 insertions, 168 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
index 1500c96b8d..787b2f8be4 100644
--- a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
+++ b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
@@ -50,7 +50,7 @@
layout="topleft"
name="label"
left="15"
- top="5"
+ top="8"
width="105">
Day Cycle Name:
</text>
diff --git a/indra/newview/skins/default/xui/en/floater_gltf_asset_editor.xml b/indra/newview/skins/default/xui/en/floater_gltf_asset_editor.xml
index b17d0aa5b6..025d537804 100644
--- a/indra/newview/skins/default/xui/en/floater_gltf_asset_editor.xml
+++ b/indra/newview/skins/default/xui/en/floater_gltf_asset_editor.xml
@@ -11,10 +11,10 @@
name="gltf asset editor"
title="[OBJECT_NAME]">
<floater.string name="floater_title" value="GLTF Scene Editor"/>
- <floater.string name="scene_tittle" value="Scene"/>
- <floater.string name="node_tittle" value="Node"/>
- <floater.string name="mesh_tittle" value="Mesh"/>
- <floater.string name="skin_tittle" value="Skin"/>
+ <floater.string name="scene_title" value="Scene"/>
+ <floater.string name="node_title" value="Node"/>
+ <floater.string name="mesh_title" value="Mesh"/>
+ <floater.string name="skin_title" value="Skin"/>
<layout_stack
name="main_layout"
diff --git a/indra/newview/skins/default/xui/en/floater_material_editor.xml b/indra/newview/skins/default/xui/en/floater_material_editor.xml
index a6a401f43e..21ceeafeea 100644
--- a/indra/newview/skins/default/xui/en/floater_material_editor.xml
+++ b/indra/newview/skins/default/xui/en/floater_material_editor.xml
@@ -13,9 +13,6 @@
title="[MATERIAL_NAME]">
<string name="no_upload_fee_string">no upload fee</string>
<string name="upload_fee_string">L$[FEE] upload fee</string>
- <string name="material_selection_title">Material selection</string>
- <string name="material_selection_text">Select material:</string>
- <string name="material_batch_import_text">--- Bulk Upload All ---</string>
<string name="material_override_title">Editing Material</string>
<scroll_container
diff --git a/indra/newview/skins/default/xui/en/floater_mp_performance.xml b/indra/newview/skins/default/xui/en/floater_mp_performance.xml
index d943a13f66..1b5cf82dcb 100644
--- a/indra/newview/skins/default/xui/en/floater_mp_performance.xml
+++ b/indra/newview/skins/default/xui/en/floater_mp_performance.xml
@@ -3,11 +3,11 @@
positioning="cascading"
legacy_header_height="40"
top="12"
- right="-324"
- height="120"
+ right="-334"
+ height="80"
min_height="120"
- width="320"
- min_width="320"
+ width="330"
+ min_width="330"
can_minimize="true"
can_close="true"
can_resize="false"
@@ -16,85 +16,51 @@
single_instance="true"
save_rect="true"
save_visibility="true"
- title="Megapahit Tuning">
+ title="FPS Limiter">
<panel
name="panel_fps"
border="false"
- width="300"
- height="36"
+ width="320"
+ height="60"
left="10"
top="40"
- follows="top|left"
+ follows="left|top|right|bottom"
layout="topleft"
>
<slider
- name="fpsSlider"
- width="300"
+ follows="left|top"
+ width="240"
height="15"
+ left="12"
layout="topleft"
+ name="fpsSlider"
enabled="true"
control_name="fpsSlider"
decimal_digits="0"
- increment="5"
+ increment="12"
initial_value="0"
- label="Max FPS"
+ label="Max FPS:"
label_width="50"
- text_width="30"
+ text_width="2"
can_edit_text="false"
- show_text="true"
+ show_text="false"
>
</slider>
- </panel>
-
- <panel
- name="panel_mapping"
- border="false"
- width="300"
- height="36"
- left="10"
- top="78"
- follows="top|left"
- layout="topleft"
- >
-
- <text
- name="MPVBuffModeLabel"
- width="100"
+ <text
+ follows="left|top"
+ width="50"
height="15"
- left="2"
- top="8">
- Optimisations:
- (needs restart):
- </text>
-
- <combo_box
- control_name="MPVBuffModeControl"
- name="MPVBuffModeComboBox"
- width="150"
- height="23"
- left="130"
- top="4"
+ left_delta="252"
+ layout="topleft"
+ type="string"
+ name="fpsText"
>
- <combo_box.item
- enabled="true"
- label="Normal"
- name="Normal"
- value="1" />
- <combo_box.item
- enabled="true"
- label="Apple GPU (smoothie)"
- name="Megapahit Optimisations"
- value="2" />
- <combo_box.item
- enabled="true"
- label="Apple GPU (LL)"
- name="LL Optimisations"
- value="3" />
- </combo_box>
+ no limit
+ </text>
- </panel>
+</panel>
</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
index 8c4019a668..aeaa8370ac 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater
- height="411"
+ height="430"
layout="topleft"
name="prefs_graphics_advanced"
help_topic="Preferences_Graphics_Advanced"
@@ -359,7 +359,41 @@
name="use HiDPI"
tool_tip="Enable OpenGL for High-Resolution Drawing."
width="315" />
-
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ height="20"
+ layout="topleft"
+ left="30"
+ name="antialiasing label"
+ top_delta="20"
+ width="120">
+ Antialiasing:
+ </text>
+ <combo_box
+ control_name="RenderFSAAType"
+ height="20"
+ initial_value="false"
+ label="Antialiasing"
+ layout="topleft"
+ left_pad="40"
+ name="fsaa"
+ top_delta="0"
+ width="90">
+ <combo_box.item
+ label="Disabled"
+ name="FSAADisabled"
+ value="0" />
+ <combo_box.item
+ label="FXAA"
+ name="FXAA"
+ value="1" />
+ <combo_box.item
+ label="SMAA"
+ name="SMAA"
+ value="2" />
+ </combo_box>
<text
type="string"
length="1"
@@ -367,10 +401,10 @@
height="20"
layout="topleft"
left="30"
- name="antialiasing label"
+ name="antialiasing quality label"
top_delta="20"
- width="100">
- Antialiasing:
+ width="120">
+ Antialiasing Quality:
</text>
<combo_box
control_name="RenderFSAASamples"
@@ -379,17 +413,25 @@
label="Antialiasing"
layout="topleft"
left_pad="40"
- name="fsaa"
+ name="fsaa quality"
top_delta="0"
width="90">
<combo_box.item
- label="Disabled"
- name="FSAADisabled"
+ label="Low"
+ name="Low"
value="0" />
<combo_box.item
- label="FXAA"
- name="FXAA"
+ label="Medium"
+ name="Medium"
+ value="1" />
+ <combo_box.item
+ label="High"
+ name="High"
value="2" />
+ <combo_box.item
+ label="Ultra"
+ name="Ultra"
+ value="3" />
</combo_box>
<text
type="string"
@@ -545,7 +587,7 @@
</text>
<view_border
bevel_style="in"
- height="357"
+ height="377"
layout="topleft"
left="385"
name="vert_border"
@@ -642,6 +684,20 @@
function="Pref.RenderOptionUpdate" />
</check_box>
+ <check_box
+ control_name="RenderVintageMode"
+ height="16"
+ initial_value="false"
+ label="Vintage Mode"
+ layout="topleft"
+ left="420"
+ name="VintageMode"
+ top_delta="20"
+ width="240">
+ <check_box.commit_callback
+ function="Pref.RenderOptionUpdate" />
+ </check_box>
+
<text
type="string"
length="1"
@@ -779,7 +835,7 @@
layout="topleft"
left="420"
min_val="0.5"
- max_val="1.5"
+ max_val="4.0"
name="RenderExposure"
show_text="true"
top_delta="24"
@@ -881,7 +937,77 @@
value="1"/>
</combo_box>
<!-- End of mirror settings -->
-
+ <!-- Sharpening Settings -->
+ <slider
+ control_name="RenderCASSharpness"
+ decimal_digits="1"
+ follows="left|top"
+ height="16"
+ increment="0.1"
+ initial_value="160"
+ label="Sharpening:"
+ label_width="145"
+ layout="topleft"
+ left="420"
+ min_val="0.0"
+ max_val="1.0"
+ name="RenderSharpness"
+ show_text="true"
+ top_delta="24"
+ width="260">
+ </slider>
+ <!-- End of Sharpening Settings-->
+ <!-- Tone Mapping Settings -->
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ height="16"
+ layout="topleft"
+ left="420"
+ name="TonemapTypeText"
+ text_readonly_color="LabelDisabledColor"
+ top_delta="25"
+ width="128">
+ Tone Mapper:
+ </text>
+ <combo_box
+ control_name="RenderTonemapType"
+ height="18"
+ layout="topleft"
+ left_delta="130"
+ top_delta="0"
+ name="TonemapType"
+ width="150">
+ <combo_box.item
+ label="Khronos Neutral"
+ name="0"
+ value="0"/>
+ <combo_box.item
+ label="ACES"
+ name="1"
+ value="1"/>
+ </combo_box>
+ <slider
+ control_name="RenderTonemapMix"
+ decimal_digits="1"
+ follows="left|top"
+ height="16"
+ increment="0.1"
+ initial_value="1"
+ label="Tone Mapping Mix:"
+ tool_tip="Mix between linear and tone mapped colors"
+ label_width="145"
+ layout="topleft"
+ left="420"
+ min_val="0.0"
+ max_val="1.0"
+ name="TonemapMix"
+ show_text="true"
+ top_delta="22"
+ width="260">
+ </slider>
+ <!-- End of Tone Mapping Settings-->
<!-- End of Advanced Settings block -->
<view_border
bevel_style="in"
@@ -889,7 +1015,7 @@
layout="topleft"
left="13"
name="horiz_border"
- top="373"
+ top="393"
top_delta="5"
width="774"/>
<button
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index c88e4163be..dba323a9e1 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -2774,7 +2774,7 @@ even though the user gets a free copy.
label="New Script"
label_selected="New Script"
layout="topleft"
- left="10"
+ left="8"
name="button new script"
top="10"
width="134" />
@@ -2786,16 +2786,28 @@ even though the user gets a free copy.
left_pad="8"
name="button permissions"
width="134" />
- <panel_inventory_object
+ <filter_editor
+ follows="left|top|right"
+ label="Enter filter text"
+ layout="topleft"
+ top="40"
+ left="10"
+ text_pad_left="10"
+ max_length_chars="300"
+ highlight_text_field="true"
+ name="contents_filter"
+ height="23"
+ width="275" />
+ <panel_inventory_object
border="true"
border_visible="true"
bevel_style="in"
follows="left|top|right"
- height="387"
+ height="367"
layout="topleft"
left="10"
name="contents_inventory"
- top="50"
+ top="70"
width="275" />
</panel>
</tab_container>
diff --git a/indra/newview/skins/default/xui/en/language_settings.xml b/indra/newview/skins/default/xui/en/language_settings.xml
index e76387da47..129ca5344c 100644
--- a/indra/newview/skins/default/xui/en/language_settings.xml
+++ b/indra/newview/skins/default/xui/en/language_settings.xml
@@ -5,6 +5,7 @@
<!-- Locale Information -->
<string name="MicrosoftLocale">english</string>
<string name="MacLocale">C</string>
+ <string name="macOSLocale">C</string>
<string name="DarwinLocale">C</string>
<string name="LinuxLocale">C</string>
<string name="FreeBSDLocale">C</string>
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index cd660d7f7a..977b225960 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -490,7 +490,7 @@
layout="topleft"
name="Reset Skeleton">
<menu_item_call.on_click
- function="Avatar.ResetSkeleton" />
+ function="Avatar.ResetSelfSkeleton" />
</menu_item_call>
<menu_item_call
label="Reset skeleton and animations"
@@ -3440,6 +3440,16 @@ function="World.EnvPreset"
function="Advanced.HandleAttachedLightParticles"
parameter="RenderAttachedParticles" />
</menu_item_check>
+ <menu_item_check
+ label="Collect Font Vertex Buffers"
+ name="Collect Font Vertex Buffers">
+ <menu_item_check.on_check
+ function="CheckControl"
+ parameter="CollectFontVertexBuffers" />
+ <menu_item_check.on_click
+ function="ToggleControl"
+ parameter="CollectFontVertexBuffers" />
+ </menu_item_check>
<menu_item_separator />
<menu_item_check
label="Enable Shader Cache"
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 951903fe34..ea5689ed65 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -8870,7 +8870,11 @@ One or more of your Voice Morphs will expire in less than [INTERVAL] days.
If you are a Premium Member, [[PREMIUM_URL] click here] to receive your voice morphing perk.
<tag>fail</tag>
- <tag>voice</tag>
+ <tag>voice</tag>
+ <usetemplate
+ ignoretext="Warn me about voice morph expiring"
+ name="okignore"
+ yestext="OK"/>
</notification>
<notification
@@ -12584,6 +12588,36 @@ are wearing now.
</notification>
<notification
+ icon="notify.tga"
+ name="TextureDiscardBackgrounded"
+ type="notify">
+ <unique>
+ <context>DELAY</context>
+ </unique>
+ To improve system performance, [SECOND_LIFE] has reduced texture memory usage after being in the background for [DELAY] seconds. It may take some time for texture image quality to return to normal.
+ <usetemplate
+ ignoretext="Ask me about background texture memory usage and recovery"
+ name="okcancelignore"
+ yestext="OK"
+ notext="Disable"/>
+ </notification>
+
+ <notification
+ icon="notify.tga"
+ name="TextureDiscardMinimized"
+ type="notify">
+ <unique>
+ <context>DELAY</context>
+ </unique>
+ To improve system performance, [SECOND_LIFE] has reduced texture memory usage after being minimized for [DELAY] seconds. It may take some time for texture image quality to return to normal.
+ <usetemplate
+ ignoretext="Ask me about minimized texture memory usage and recovery"
+ name="okcancelignore"
+ yestext="OK"
+ notext="Disable"/>
+ </notification>
+
+ <notification
icon="alertmodal.tga"
name="MissingFavoriteFolder"
type="alertmodal">
@@ -12595,4 +12629,5 @@ Select the "use as favorite folder" from a folder's menu to set it as the favori
name="okbutton"
yestext="OK"/>
</notification>
+
</notifications>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
index cb3e0e4b6a..a64b3eee36 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -371,7 +371,7 @@
layout="topleft"
left="30"
min_val="0.5"
- max_val="1.5"
+ max_val="4.0"
name="RenderExposure"
show_text="true"
top_pad="14"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
index 82fb0fe9d7..53ae764ba6 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
@@ -340,7 +340,7 @@
follows="left|top"
top_delta="-6"
layout="topleft"
- left_pad="10"
+ left_pad="5"
width="360"
height="40"
name="media_ear_location">
@@ -360,7 +360,45 @@
name="1"
top_delta ="18"
width="200" />
- </radio_group>
+ </radio_group>
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ layout="topleft"
+ left="270"
+ top_delta="6"
+ name="Listen from"
+ width="112">
+ Hear voice from:
+ </text>
+ <radio_group
+ enabled_control="EnableVoiceChat"
+ control_name="VoiceEarLocation"
+ follows="left|top"
+ layout="topleft"
+ left_pad="2"
+ top_delta="-6"
+ width="360"
+ height="40"
+ name="ear_location">
+ <radio_item
+ height="19"
+ label="Camera position"
+ follows="left|top"
+ layout="topleft"
+ name="0"
+ width="200"/>
+ <radio_item
+ height="19"
+ follows="left|top"
+ label="Avatar position"
+ layout="topleft"
+ left_delta="0"
+ name="1"
+ top_delta ="18"
+ width="200" />
+ </radio_group>
<check_box
name="media_show_on_others_btn"
control_name="MediaShowOnOthers"
@@ -408,12 +446,12 @@
</combo_box>
<check_box
control_name="StreamNotificationChannelEnabled"
- height="16"
+ height="30"
label="Custom stream notification channel"
layout="topleft"
left="20"
name="stream_notification_channel_enabled"
- top_pad="10"
+ top_pad="-10"
width="256">
</check_box>
<spinner
@@ -421,59 +459,62 @@
enabled_control="StreamNotificationChannelEnabled"
decimal_digits="0"
follows="left|top"
- height="23"
+ height="30"
increment="1"
initial_value="751751"
label="Channel number:"
label_width="105"
layout="topleft"
- left="260"
+ left_pad="0"
max_val="2147483647"
min_val="-2147483648"
name="stream_notification_channel"
- top_pad="-15"
+ top_pad="-20"
width="170" />
<text
- type="string"
- length="1"
- follows="left|top"
layout="topleft"
- left="23"
- top_delta="30"
- name="Listen from"
- width="112">
- Hear voice from:
+ height="15"
+ left="260"
+ top_pad="-48"
+ width="100"
+ name="noise_suppression_label">
+ Noise suppression
</text>
- <radio_group
- enabled_control="EnableVoiceChat"
- control_name="VoiceEarLocation"
- follows="left|top"
+ <combo_box
+ control_name="VoiceNoiseSuppressionLevel"
layout="topleft"
+ height="23"
left_pad="10"
- top_delta="-6"
- width="360"
- height="40"
- name="ear_location">
- <radio_item
- height="19"
- label="Camera position"
- follows="left|top"
- layout="topleft"
- name="0"
- width="200"/>
- <radio_item
- height="19"
- follows="left|top"
- label="Avatar position"
- layout="topleft"
- left_delta="0"
- name="1"
- top_delta ="18"
- width="200" />
- </radio_group>
+ top_pad="-20"
+ name="noise_suppression_combo"
+ width="80">
+ <item
+ label="Off"
+ name="noise_suppression_none"
+ value="0"/>
+ <item
+ label="Low"
+ name="noise_suppression_low"
+ value="1"/>
+ <item
+ label="Moderate"
+ name="noise_suppression_moderate"
+ value="2"/>
+ <item
+ label="High"
+ name="noise_suppression_high"
+ value="3"/>
+ <item
+ label="Max"
+ name="noise_suppression_max"
+ value="4"/>
+ </combo_box>
+ <text>
+<!-- spacer -->
+ </text>
<check_box
control_name="LipSyncEnabled"
- follows="left|top"
+ follows="top|left"
height="15"
label="Move avatar lips when speaking"
layout="topleft"
@@ -524,44 +565,16 @@
label="Play sounds from gestures"
top_pad="5"
left="20"/>
- <text
- layout="topleft"
+ <check_box
+ control_name="VoiceVisualizerEnabled"
height="15"
+ tool_tip="Check to show voice dot indicator above avatars"
+ label="Show voice dot above avatars"
+ layout="topleft"
+ name="voice_dot_visualizer"
left="260"
- top_pad="-12"
- width="100"
- name="noise_suppression_label">
- Noise Suppression
- </text>
- <combo_box
- control_name="VoiceNoiseSuppressionLevel"
- layout="topleft"
- height="23"
- left_pad="10"
- top_pad="-18"
- name="noise_suppression_combo"
- width="80">
- <item
- label="Off"
- name="noise_suppression_none"
- value="0"/>
- <item
- label="Low"
- name="noise_suppression_low"
- value="1"/>
- <item
- label="Moderate"
- name="noise_suppression_moderate"
- value="2"/>
- <item
- label="High"
- name="noise_suppression_high"
- value="3"/>
- <item
- label="Max"
- name="noise_suppression_max"
- value="4"/>
- </combo_box>
+ top_pad="-15"
+ width="200"/>
<button
control_name="ShowDeviceSettings"
follows="left|top"
diff --git a/indra/newview/skins/default/xui/en/panel_settings_terrain_transform.xml b/indra/newview/skins/default/xui/en/panel_settings_terrain_transform.xml
index 0bf0d8cffc..350e405732 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_terrain_transform.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_terrain_transform.xml
@@ -288,7 +288,7 @@
left="10"
top_pad="0"
width="170">
- Offset y
+ Offset u
</text>
<spinner
follows="left|top"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index ad68bd8d81..44da9a8dac 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -4318,7 +4318,10 @@ name="Command_360_Capture_Tooltip">Capture a 360 equirectangular image</string>
<!-- PBR Materials -->
<string name="Material Texture Name Header">Textures present this material: </string>
-
+ <string name="material_selection_title">Material selection</string>
+ <string name="material_selection_text">Select material:</string>
+ <string name="material_batch_import_text">--- Bulk Upload All ---</string>
+
<!-- Conversation log messages -->
<string name="logging_calls_disabled_log_empty">
Conversations are not being logged. To begin keeping a log, choose "Save: Log only" or "Save: Log and transcripts" under Preferences > Chat.