From ba8bcf6520eb4cbcdf93393ecdeda4e6c0bc5846 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Mon, 3 Apr 2023 22:19:33 +0200
Subject: SL-19042: Replace FMOD with VLC for parcel audio

---
 indra/newview/app_settings/cmd_line.xml |  6 ++++++
 indra/newview/app_settings/settings.xml | 11 +++++++++++
 2 files changed, 17 insertions(+)

(limited to 'indra/newview/app_settings')

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 411f77e6a7..c6dca39c99 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -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>
-- 
cgit v1.2.3


From eaccee37f2875c4d2378cf0ce562f382b88487d7 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Sat, 15 Apr 2023 02:23:38 +0300
Subject: SL-19549 Add option to show ban lines on collision

---
 indra/newview/app_settings/settings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index deeca494c3..5b465864cc 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -11316,11 +11316,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>
-- 
cgit v1.2.3


From e8c1a18105bddc29951d4c4b1700dc0af37c83c2 Mon Sep 17 00:00:00 2001
From: simon <simon@lindenlab.com>
Date: Thu, 4 May 2023 16:52:35 +0100
Subject: First work on sl-19676 - Stats on updates

---
 indra/newview/app_settings/settings.xml | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 9fffab70f4..3d1a384793 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -17085,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>
-- 
cgit v1.2.3


From 4173cae02165e36d96638761f29bd6d00ac24ddc Mon Sep 17 00:00:00 2001
From: simon <simon@lindenlab.com>
Date: Thu, 11 May 2023 01:16:42 +0100
Subject: sl-19676 - more loading stats and 360 Interest List mode work

---
 indra/newview/app_settings/settings.xml | 11 -----------
 1 file changed, 11 deletions(-)

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 9f2d6f746d..775ddb0571 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -16964,17 +16964,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>
-- 
cgit v1.2.3