diff options
| author | James Cook <james@lindenlab.com> | 2009-12-07 10:40:12 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-12-07 10:40:12 -0800 |
| commit | 864dd45b2b8dec32552112ed76246c9b0b3f7f0b (patch) | |
| tree | de5ce187a9b26f67d2515fa140aa8d313e64a51d /indra/newview/llviewerwindow.cpp | |
| parent | 5d4959e3a107a6a40014528dd8e17e46bf128540 (diff) | |
| parent | 7ff7709f9fd07de5cc9b039562d0fe3794f6ce36 (diff) | |
merge
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index 9ba056a17c..8529a93527 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -1011,6 +1011,7 @@ BOOL LLViewerWindow::handleActivate(LLWindow *window, BOOL activated) else { mActive = FALSE; + if (gSavedSettings.getBOOL("AllowIdleAFK")) { gAgent.setAFK(); @@ -3244,8 +3245,7 @@ LLPickInfo LLViewerWindow::pickImmediate(S32 x, S32 y_from_bot, BOOL pick_trans } else { - llwarns << "List of last picks is empty" << llendl; - llwarns << "Using stub pick" << llendl; + lldebugs << "List of last picks is empty: Using stub pick" << llendl; mLastPick = LLPickInfo(); } |