diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2009-12-01 18:45:40 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2009-12-01 18:45:40 -0800 |
| commit | b92fe4351c402759991c26510a2a35a3b4308999 (patch) | |
| tree | facf85c7f117d80585270c50f715e14397ecd7db /indra/newview/llviewerwindow.cpp | |
| parent | 1db0d32133f97b03a632f03fa78e198b7f00866b (diff) | |
| parent | 659dc5224e2f4b6ce90b4f739cc015befc098c12 (diff) | |
Automated merge with ssh://rick@hg.lindenlab.com/skolb/media
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(); } |