diff options
| author | Todd Stinson <stinson@lindenlab.com> | 2012-01-17 10:19:27 -0800 |
|---|---|---|
| committer | Todd Stinson <stinson@lindenlab.com> | 2012-01-17 10:19:27 -0800 |
| commit | 8cf6b9cb929ff37fc6febe1f4ede4efa526260d9 (patch) | |
| tree | fb81fc741a515279a4602c1b64abcc7d443cf947 /indra/newview/llviewerwindow.cpp | |
| parent | fa03d3ee3d9bcf213754250a8180a65156bffe8d (diff) | |
| parent | 64c45cbd1ace677456db56d1a506f2fe44b6e9c6 (diff) | |
Pull and merge from 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 53ac206576..9212368971 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -1233,7 +1233,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();
}
|