summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorcallum <none@none>2009-12-28 13:45:57 -0800
committercallum <none@none>2009-12-28 13:45:57 -0800
commit3519435bbfeec4c838d5ffbe008d0ac7bbc085a8 (patch)
tree5d590d84a1fa6c8414adba0732a83a67a440dd37 /indra/newview/app_settings
parentdd1fb1568e85a8e3622372cae21bcd3205051718 (diff)
parent6008bf61b2d0475a274ad2b851b61e69496b5bf8 (diff)
Merge with (specific revision) and head
Diffstat (limited to 'indra/newview/app_settings')
-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 ff7c2b1f5e..ba78d80ad1 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -10378,6 +10378,17 @@
<key>Value</key>
<string>Default</string>
</map>
+ <key>VoiceParticipantLeftRemoveDelay</key>
+ <map>
+ <key>Comment</key>
+ <string>Timeout to remove participants who has left Voice chat from the list in Voice Controls Panel</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>S32</string>
+ <key>Value</key>
+ <integer>10</integer>
+ </map>
<key>VoicePort</key>
<map>
<key>Comment</key>