diff options
| author | Brad Linden <brad@lindenlab.com> | 2023-08-23 12:26:14 -0700 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2023-08-23 12:26:14 -0700 |
| commit | c6d5f11f63dfa0ac65a2afebf88b3078f571e044 (patch) | |
| tree | 63fd8081ce450fd426ea717adc04d09b0da4b713 /indra/newview/app_settings | |
| parent | ef33902f220df35727ba54ee8bc3ed02bc53d6be (diff) | |
| parent | d454512050e636a19e4b7545515dea4f4b1bbf0d (diff) | |
Merge remote-tracking branch 'origin/main' into DRTVWR-559
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/cmd_line.xml | 6 | ||||
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 59 |
2 files changed, 52 insertions, 13 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/settings.xml b/indra/newview/app_settings/settings.xml index 85f6101050..21d8722f56 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -7099,6 +7099,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> @@ -11677,11 +11688,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> @@ -17239,17 +17250,6 @@ <key>Value</key> <integer>0</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> @@ -17371,5 +17371,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> |