diff options
| author | bea@american.lindenlab.com <bea@american.lindenlab.com> | 2009-12-03 08:49:08 -0800 |
|---|---|---|
| committer | bea@american.lindenlab.com <bea@american.lindenlab.com> | 2009-12-03 08:49:08 -0800 |
| commit | 9b17e6710b713fa12f6db7d6f51d97e4052a0835 (patch) | |
| tree | 81ad36d56262c60525176394f162ba49da978e7a /indra/newview/llviewerwindow.cpp | |
| parent | db4ea92fa8fb3a0c20194824ecd59f9ef0d8b5f2 (diff) | |
| parent | 469f17f9c21062d545a78e08dedcdc2bc978c7b6 (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(); } |