diff options
| author | Richard Linden <none@none> | 2012-01-12 13:16:28 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-01-12 13:16:28 -0800 |
| commit | f1c27071047e776536f8aa963b83f8772275e7c3 (patch) | |
| tree | a0a74e20cdb688471af361c8fc078260bd7988dc /indra/newview/llviewerwindow.cpp | |
| parent | 3dfb1536fa3bb85f6648a76591e80c3feea9eb83 (diff) | |
| parent | 26829e6fa2de6e59f46ba340ca7ad6c430728470 (diff) | |
Automated merge with https://bitbucket.org/lindenlab/viewer-development
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(); } |