diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-09-16 09:07:20 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-09-16 09:07:20 -0400 |
| commit | 2fba01d160716b886a7dfc0c86abda767a25d23f (patch) | |
| tree | 7fdbcb9a874648d3f3ea372433ddb94853f39284 /indra/newview/app_settings | |
| parent | 1a0865a57220434a49b106a47170c3dae45dcb13 (diff) | |
| parent | 7a60aa91f4d49ba1713122ec3bba670acf55f795 (diff) | |
merge changes for storm-1578
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 60025707a4..f4535f12f8 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -25,7 +25,7 @@ <key>Type</key> <string>S32</string> <key>Value</key> - <real>0</real> + <real>300</real> </map> <key>AdminMenu</key> <map> @@ -7116,17 +7116,6 @@ <key>Value</key> <real>0.0</real> </map> - <key>QuitAfterSecondsOfAFK</key> - <map> - <key>Comment</key> - <string>The duration allowed after being AFK before quitting.</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>F32</string> - <key>Value</key> - <real>0.0</real> - </map> <key>QuitOnLoginActivated</key> <map> <key>Comment</key> |