diff options
| author | callum <none@none> | 2009-12-18 15:15:34 -0800 |
|---|---|---|
| committer | callum <none@none> | 2009-12-18 15:15:34 -0800 |
| commit | 01006749158de1c7c4da89ddad549025f376c6e0 (patch) | |
| tree | fca6888218079c4da17aa1b1d420d4bf231779c3 /indra/newview/llappviewer.cpp | |
| parent | fb862f18159d320572008b6a8da81ffd2f109e37 (diff) | |
| parent | 4964ca39f14531630ffbfece593f8ba9cdc86e4e (diff) | |
Merge with tip
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 07b3399637..becc30832d 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -333,7 +333,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(); } |