summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/app_settings')
-rw-r--r--indra/newview/app_settings/cmd_line.xml6
-rw-r--r--indra/newview/app_settings/commands.xml10
-rw-r--r--indra/newview/app_settings/settings.xml270
-rw-r--r--indra/newview/app_settings/toolbars.xml1
4 files changed, 262 insertions, 25 deletions
diff --git a/indra/newview/app_settings/cmd_line.xml b/indra/newview/app_settings/cmd_line.xml
index e16a5c7e76..340334aee8 100644
--- a/indra/newview/app_settings/cmd_line.xml
+++ b/indra/newview/app_settings/cmd_line.xml
@@ -209,6 +209,12 @@
<string>NoAudio</string>
</map>
+ <key>nofmod</key>
+ <map>
+ <key>map-to</key>
+ <string>UseMediaPluginsForStreamingAudio</string>
+ </map>
+
<key>noninteractive</key>
<map>
<key>desc</key>
diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml
index 2644f5f449..4a3dfffde1 100644
--- a/indra/newview/app_settings/commands.xml
+++ b/indra/newview/app_settings/commands.xml
@@ -285,4 +285,14 @@
is_running_function="Floater.IsOpen"
is_running_parameters="360capture"
/>
+ <command name="performance"
+ available_in_toybox="true"
+ icon="Command_Performance_Icon"
+ label_ref="Command_Performance_Label"
+ tooltip_ref="Command_Performance_Tooltip"
+ execute_function="Floater.ToggleOrBringToFront"
+ execute_parameters="performance"
+ is_running_function="Floater.IsOpen"
+ is_running_parameters="performance"
+ />
</commands>
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 411f77e6a7..886c348e2b 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -1415,7 +1415,7 @@
<key>Type</key>
<string>U32</string>
<key>Value</key>
- <integer>1024</integer>
+ <integer>4096</integer>
</map>
<key>CacheValidateCounter</key>
<map>
@@ -7077,6 +7077,17 @@
<key>Value</key>
<integer>0</integer>
</map>
+ <key>UseMediaPluginsForStreamingAudio</key>
+ <map>
+ <key>Comment</key>
+ <string>Use media plugins (VLC) for streaming audio.</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>0</integer>
+ </map>
<key>NoHardwareProbe</key>
<map>
<key>Comment</key>
@@ -8341,6 +8352,17 @@
<key>Value</key>
<integer>1</integer>
</map>
+ <key>NvAPICreateApplicationProfile</key>
+ <map>
+ <key>Comment</key>
+ <string>Create NVIDIA application profile for optimized settings</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>1</integer>
+ </map>
<key>PurgeCacheOnNextStartup</key>
<map>
<key>Comment</key>
@@ -8817,6 +8839,28 @@
<key>Value</key>
<integer>1</integer>
</map>
+ <key>RenderClass0MemoryBandwidth</key>
+ <map>
+ <key>Comment</key>
+ <string>Memory bandwidth at which to default to Class 0 in gigabytes per second. Used as basis for other classes.</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>F32</string>
+ <key>Value</key>
+ <real>16.0</real>
+ </map>
+ <key>RenderCPUBasis</key>
+ <map>
+ <key>Comment</key>
+ <string>Reference CPU clockspeed to use to bias GPU class (in MHz).</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>F32</string>
+ <key>Value</key>
+ <real>3000.0</real>
+ </map>
<key>RenderComplexityColorMin</key>
<map>
<key>Comment</key>
@@ -9074,6 +9118,17 @@
<key>Value</key>
<real>0.5</real>
</map>
+ <key>RenderShadowSplits</key>
+ <map>
+ <key>Comment</key>
+ <string>Amount of shadow map splits to render (0 - 3).</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>S32</string>
+ <key>Value</key>
+ <integer>3</integer>
+ </map>
<key>RenderSSAOScale</key>
<map>
<key>Comment</key>
@@ -11305,11 +11360,11 @@
<key>ShowBanLines</key>
<map>
<key>Comment</key>
- <string>Show in-world ban/access borders</string>
+ <string>Show in-world ban/access borders, 0 - do not show, 1 - show on collision, 2 - show on proximity</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>S32</string>
<key>Value</key>
<integer>1</integer>
</map>
@@ -16711,6 +16766,160 @@
<key>Value</key>
<integer>0</integer>
</map>
+ <key>TargetFPS</key>
+ <map>
+ <key>Comment</key>
+ <string>Desired minimum FPS</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>U32</string>
+ <key>Value</key>
+ <integer>15</integer>
+ </map>
+ <key>AutoTuneFPS</key>
+ <map>
+ <key>Comment</key>
+ <string>Allow the viewer to adjust your settings to achieve target FPS</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>0</integer>
+ </map>
+ <key>AutoTuneLock</key>
+ <map>
+ <key>Comment</key>
+ <string>When enabled the viewer will dynamically change settings until auto tune is explicitly turned off.</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>0</integer>
+ </map>
+ <key>KeepAutoTuneLock</key>
+ <map>
+ <key>Comment</key>
+ <string>When enabled the AutoTuneLock will be maintainted all following sessions.</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>U32</string>
+ <key>Value</key>
+ <integer>1</integer>
+ </map>
+ <key>AllowSelfImpostor</key>
+ <map>
+ <key>Comment</key>
+ <string>Allow own render time to impostor your avatar.</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>0</integer>
+ </map>
+ <key>ShowTunedART</key>
+ <map>
+ <key>Comment</key>
+ <string>Show the current render time not the pre-tuning render time in the avatar display.</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>1</integer>
+ </map>
+ <key>RenderAvatarMaxART</key>
+ <map>
+ <key>Comment</key>
+ <string>Render Time Limit in microseconds (0.0 = no limit)</string>
+ <key>Persist</key>
+ <integer>0</integer>
+ <key>Type</key>
+ <string>F32</string>
+ <key>Value</key>
+ <real>4.699</real>
+ </map>
+ <key>AutoTuneRenderFarClipMin</key>
+ <map>
+ <key>Comment</key>
+ <string>The lowest draw distance that auto tune is allowed to use</string>
+ <key>Persist</key>
+ <integer>0</integer>
+ <key>Type</key>
+ <string>F32</string>
+ <key>Value</key>
+ <real>32.0</real>
+ </map>
+ <key>AutoTuneRenderFarClipTarget</key>
+ <map>
+ <key>Comment</key>
+ <string>The draw distance that auto tune will try to achieve</string>
+ <key>Persist</key>
+ <integer>0</integer>
+ <key>Type</key>
+ <string>F32</string>
+ <key>Value</key>
+ <real>256.0</real>
+ </map>
+ <key>UserTargetReflections</key>
+ <map>
+ <key>Comment</key>
+ <string>Set by auto tune floater on build</string>
+ <key>Persist</key>
+ <integer>0</integer>
+ <key>Type</key>
+ <string>S32</string>
+ <key>Value</key>
+ <integer>4</integer>
+ </map>
+ <key>PerfStatsCaptureEnabled</key>
+ <map>
+ <key>Comment</key>
+ <string>Enable/disable render time data to support autotune.</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>1</integer>
+ </map>
+ <key>AutoTuneImpostorByDistEnabled</key>
+ <map>
+ <key>Comment</key>
+ <string>Enable/disable using MaxNonImpostor to limit avatar rendering by distance.</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>0</integer>
+ </map>
+ <key>AutoTuneImpostorFarAwayDistance</key>
+ <map>
+ <key>Comment</key>
+ <string>Avatars beyond this range will automatically be optimized</string>
+ <key>Persist</key>
+ <integer>0</integer>
+ <key>Type</key>
+ <string>F32</string>
+ <key>Value</key>
+ <real>64.0</real>
+ </map>
+ <key>TuningFPSStrategy</key>
+ <map>
+ <key>Comment</key>
+ <string>Strategy to use when tuning FPS. 0=Tune avatar rendering only, 1=Tune both avatar and global scene settings, 2=Tune only global scene.</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>U32</string>
+ <key>Value</key>
+ <integer>1</integer>
+ </map>
<key>CameraOpacity</key>
<map>
<key>Comment</key>
@@ -16766,28 +16975,6 @@
<key>Value</key>
<integer>0</integer>
</map>
- <key>ResetUIScaleOnFirstRun</key>
- <map>
- <key>Comment</key>
- <string>Resets the UI scale factor on first run due to changed display scaling behavior</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>1</integer>
- </map>
- <key>360CaptureUseInterestListCap</key>
- <map>
- <key>Comment</key>
- <string>Flag if set, uses the new InterestList cap to ask the simulator for full content</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>1</integer>
- </map>
<key>360CaptureJPEGEncodeQuality</key>
<map>
<key>Comment</key>
@@ -16898,5 +17085,38 @@
<key>Value</key>
<integer>0</integer>
</map>
+ <key>StatsReportMaxDuration</key>
+ <map>
+ <key>Comment</key>
+ <string>Maximum seconds for viewer stats file data, prevents huge file</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>F32</string>
+ <key>Value</key>
+ <real>300</real>
+ </map>
+ <key>StatsReportFileInterval</key>
+ <map>
+ <key>Comment</key>
+ <string>Interval to save viewer stats file data</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>F32</string>
+ <key>Value</key>
+ <real>0.2</real>
+ </map>
+ <key>StatsReportSkipZeroDataSaves</key>
+ <map>
+ <key>Comment</key>
+ <string>In viewer stats data file, skip saving entry if there is no data</string>
+ <key>Persist</key>
+ <integer>0</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>0</integer>
+ </map>
</map>
</llsd>
diff --git a/indra/newview/app_settings/toolbars.xml b/indra/newview/app_settings/toolbars.xml
index f3a23edc58..a1c9d6d9ee 100644
--- a/indra/newview/app_settings/toolbars.xml
+++ b/indra/newview/app_settings/toolbars.xml
@@ -22,6 +22,7 @@
<command name="voice"/>
<command name="minimap"/>
<command name="snapshot"/>
+ <command name="performance"/>
</left_toolbar>
<right_toolbar
button_display_mode="icons_only">