diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-14 14:44:43 -0800 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-14 14:44:43 -0800 |
| commit | 1a8008ea150d1eb9a8f4036988ef971fb1901cb3 (patch) | |
| tree | a09d45e10d3b03c94256424ecd8f881e75551aae /indra/newview/app_settings | |
| parent | 04fe0399443cf4a5852e94cd3950ba1fd2d50562 (diff) | |
Backed out changeset f34a69c2af56
(this backs-out my backout, now that I'm happy the original merge works okay :))
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 4bfc6f9e4f..db759f052a 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> |