diff options
| author | prep linden <prep@lindenlab.com> | 2011-09-19 11:00:34 -0400 |
|---|---|---|
| committer | prep linden <prep@lindenlab.com> | 2011-09-19 11:00:34 -0400 |
| commit | 6350d8eb4b2396e10703b039cada3ce0d8f8ca8d (patch) | |
| tree | 8c18b34d5c675f4ece390c3a528fb879e0e7190f /indra/newview/app_settings | |
| parent | 3f0a2cda29607b1114788f54c1147c3bd5c864f8 (diff) | |
| parent | 187a39885c89da4975e636760afbc0003df39395 (diff) | |
merge
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 e4169c0cba..8804c40aff 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> |