diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2009-12-15 19:36:03 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2009-12-15 19:36:03 -0800 |
| commit | e5c9fe005e2533b10ad9eeeec9041171f15247d0 (patch) | |
| tree | 43cfc17cf53709ed887506b655093f856126ae96 /indra/newview/llviewerwindow.cpp | |
| parent | 3a02b9ec882c98009ae6c24913ee8a7a620b0f87 (diff) | |
| parent | 17d1d3c129c25dd27ddbf2d15ab8873a61c16658 (diff) | |
Automated merge with http://demeter:8000
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index 966aeba25c..0ddc517754 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -1014,7 +1014,7 @@ BOOL LLViewerWindow::handleActivate(LLWindow *window, BOOL activated) { mActive = FALSE; - if (gSavedSettings.getBOOL("AllowIdleAFK")) + if (gSavedSettings.getS32("AFKTimeout")) { gAgent.setAFK(); } |