diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-01-17 13:31:48 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-01-17 13:31:48 -0500 |
| commit | a7b642d358f0e5649642db3084143b224f7e977d (patch) | |
| tree | 2abc31a48494a2874c28bc7566c7864af362a1ea /indra/newview/llviewerwindow.cpp | |
| parent | 3ed8f8907665d8700199a1181a5dd106a6804edb (diff) | |
| parent | 64c45cbd1ace677456db56d1a506f2fe44b6e9c6 (diff) | |
merge
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 cbb100c5e0..bf698e02d2 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(); } |