summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/settings.xml
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2024-09-23 16:49:28 -0400
committerNat Goodspeed <nat@lindenlab.com>2024-09-23 16:49:28 -0400
commit626920dda38a512b27c5e8fd79b0c9b09be01898 (patch)
tree89c54e31848048ee084005fd3a0a1316f5530966 /indra/newview/app_settings/settings.xml
parentf6b3b5e803b0c08d55ecd10eac3e9e75518760a9 (diff)
parentd8e52ec001c476a2320f2d5caceb813465d707e4 (diff)
Merge remote branch 'develop' into release/luau-scripting for Maint B
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
-rw-r--r--indra/newview/app_settings/settings.xml11
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index c717e62a95..6fe13d4665 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -5037,6 +5037,17 @@
<key>Value</key>
<integer>0</integer>
</map>
+ <key>MediaPluginPipeWireVolumeCatcher</key>
+ <map>
+ <key>Comment</key>
+ <string>Use PipeWire instead of PulseAudio for controlling web media volume.</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>0</integer>
+ </map>
<key>MediaControlFadeTime</key>
<map>
<key>Comment</key>