diff options
author | Yuri Chebotarev <ychebotarev@productengine.com> | 2009-12-21 12:16:56 +0200 |
---|---|---|
committer | Yuri Chebotarev <ychebotarev@productengine.com> | 2009-12-21 12:16:56 +0200 |
commit | 77c97725516564f5595b2b71df54c1e32e08a7fc (patch) | |
tree | 86887e93cad6945e1289ebd3fa9f7af3b9a01f4b /indra/newview/app_settings | |
parent | 45b859b50b18d214559ee2da0376496da9222fdf (diff) | |
parent | 05898105c88a2fa175bdc3d353461a6f61ad0616 (diff) |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/app_settings')
-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 6fa839235a..455c3587ff 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> @@ -9297,7 +9286,7 @@ <key>Type</key> <string>S32</string> <key>Value</key> - <integer>4</integer> + <integer>5</integer> </map> <key>UIMaxComboWidth</key> <map> |