diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-01-17 10:36:04 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-01-17 10:36:04 -0500 |
| commit | 323d27ebcb07fb28ae81ea3728c8ccf65f5ddd68 (patch) | |
| tree | 8592099f72205befac80ee9a15192032451781d1 /indra/newview/llviewerwindow.cpp | |
| parent | f6b8bfd3da163d275400035b24a969e5147c6352 (diff) | |
| parent | f1c27071047e776536f8aa963b83f8772275e7c3 (diff) | |
merge changes for vmrg-216
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index b73be4ed43..4499955dec 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -1206,7 +1206,8 @@ void LLViewerWindow::handleMouseMove(LLWindow *window, LLCoordGL pos, MASK mask mWindow->showCursorFromMouseMove(); - if (gAwayTimer.getElapsedTimeF32() > LLAgent::MIN_AFK_TIME) + if (gAwayTimer.getElapsedTimeF32() > LLAgent::MIN_AFK_TIME + && !gDisconnected) { gAgent.clearAFK(); } |