diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2009-12-15 19:36:03 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2009-12-15 19:36:03 -0800 |
| commit | e5c9fe005e2533b10ad9eeeec9041171f15247d0 (patch) | |
| tree | 43cfc17cf53709ed887506b655093f856126ae96 /indra/newview/app_settings/settings.xml | |
| parent | 3a02b9ec882c98009ae6c24913ee8a7a620b0f87 (diff) | |
| parent | 17d1d3c129c25dd27ddbf2d15ab8873a61c16658 (diff) | |
Automated merge with http://demeter:8000
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 7ac7a09d56..37b55fdd86 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -8,7 +8,7 @@ <key>Persist</key> <integer>1</integer> <key>Type</key> - <string>F32</string> + <string>S32</string> <key>Value</key> <real>300.0</real> </map> @@ -45,17 +45,6 @@ <key>Value</key> <integer>0</integer> </map> - <key>AllowIdleAFK</key> - <map> - <key>Comment</key> - <string>Automatically set AFK (away from keyboard) mode when idle</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Boolean</string> - <key>Value</key> - <integer>1</integer> - </map> <key>AllowMultipleViewers</key> <map> <key>Comment</key> @@ -9303,7 +9292,7 @@ <key>Type</key> <string>S32</string> <key>Value</key> - <integer>4</integer> + <integer>5</integer> </map> <key>UIMaxComboWidth</key> <map> |