diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-01-14 14:27:25 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-01-14 14:27:25 +0200 |
| commit | b278de94c9afe3a5b838b57bd380fd28c04b29f1 (patch) | |
| tree | b5da76ed707dff7c93d2f7ad7cf4cf47ec177db8 /indra/newview/app_settings | |
| parent | e727800829be2ecf236b726b1ec7693a3adad908 (diff) | |
| parent | 0556c2c047e38d9b5e18cd31b219764c3dc89aa4 (diff) | |
Merge from default branch.
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 382793a497..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> @@ -3607,7 +3618,7 @@ <key>Type</key> <string>String</string> <key>Value</key> - <string>http://lecs.viewer-sidebar.secondlife.com.s3.amazonaws.com/sidebar.html</string> + <string>http://lecs.viewer-sidebar.secondlife.com.s3.amazonaws.com/sidebar.html?p=[AUTH_TOKEN]&lang=[LANGUAGE]&channel=[CHANNEL]&version=[VERSION]&major=[VERSION_MAJOR]&minor=[VERSION_MINOR]</string> </map> <key>SearchURL</key> <map> |