summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/settings.xml
diff options
context:
space:
mode:
authorrichard <none@none>2010-01-12 10:58:04 -0800
committerrichard <none@none>2010-01-12 10:58:04 -0800
commit00c850386c806a68eb74c3b637c3ffe5621bb260 (patch)
treeef252c44eb1a90bf1440304e0d170f64816c6d36 /indra/newview/app_settings/settings.xml
parente9e651f5e4cf5dea29cf3f0340663ab404a46bcd (diff)
parent2d9d3d5d8653176b82578578c8c44769a03b102d (diff)
merge
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
-rw-r--r--indra/newview/app_settings/settings.xml13
1 files changed, 12 insertions, 1 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 382793a497..e57b77e2df 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -1141,7 +1141,18 @@
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>S32</string>
+ <key>Value</key>
+ <integer>5</integer>
+ </map>
+ <key>CallFloaterMaxItems</key>
+ <map>
+ <key>Comment</key>
+ <string>Max number of visible participants in voice controls window</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>S32</string>
<key>Value</key>
<integer>1</integer>
</map>