diff options
| author | James Cook <james@lindenlab.com> | 2009-12-15 17:10:53 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-12-15 17:10:53 -0800 |
| commit | b030bb6e55df8574adfc38bc3d092176b34214b4 (patch) | |
| tree | 855f700ce9f689864513b59c6652cb8af37a45af /indra/newview/llappviewer.cpp | |
| parent | 1bb4c9e1c9e9d797d4f49152afe4ff80ba22405d (diff) | |
| parent | 4428d4039fdf42932b39a861566a7ed2d2c2c946 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 90b8cd9572..a4dee14e40 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -332,7 +332,7 @@ LLAppViewer::LLUpdaterInfo *LLAppViewer::sUpdaterInfo = NULL ; void idle_afk_check() { // check idle timers - if (gSavedSettings.getBOOL("AllowIdleAFK") && (gAwayTriggerTimer.getElapsedTimeF32() > gSavedSettings.getF32("AFKTimeout"))) + if (gSavedSettings.getS32("AFKTimeout") && (gAwayTriggerTimer.getElapsedTimeF32() > gSavedSettings.getS32("AFKTimeout"))) { gAgent.setAFK(); } |