diff options
author | richard <none@none> | 2010-01-13 18:18:03 -0800 |
---|---|---|
committer | richard <none@none> | 2010-01-13 18:18:03 -0800 |
commit | 01c65e891d477b2f162cb277a2b06a6d3a4a0e9f (patch) | |
tree | fb34de1c09c931186a595093c35bde5ac66f448e /indra/newview/app_settings | |
parent | 630f1546881d6879b3ad4e3165413138d69a27cd (diff) | |
parent | faae541261f4e606fd1b90927818bd9239700635 (diff) |
merge
Diffstat (limited to 'indra/newview/app_settings')
-rw-r--r-- | indra/newview/app_settings/settings.xml | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 9250b427af..184606d495 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> |