diff options
| author | Tess Chu <tess@lindenlab.com> | 2007-11-15 22:39:12 +0000 |
|---|---|---|
| committer | Tess Chu <tess@lindenlab.com> | 2007-11-15 22:39:12 +0000 |
| commit | 813b140d0767146b17acf4ad2fb96fbd5a347c34 (patch) | |
| tree | d47a36708813b3f93b4049d822f966c48de4e576 /indra/newview/llviewerwindow.cpp | |
| parent | 291d99bc66c4c2b8009ba723a43e2e97d24313f9 (diff) | |
svn merge -r73880:73879 svn+ssh://svn/svn/linden/release. backing out viewer auth merge
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index bc41a88e27..74788f6f26 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -31,7 +31,6 @@ #include "llviewerprecompiledheaders.h" -#include "llpanellogin.h" #include "llviewerwindow.h" // system library includes @@ -106,7 +105,6 @@ #include "llfloatermap.h" #include "llfloatermute.h" #include "llfloaternamedesc.h" -#include "llfloaterpreference.h" #include "llfloatersnapshot.h" #include "llfloatertools.h" #include "llfloaterworldmap.h" @@ -2844,7 +2842,7 @@ BOOL LLViewerWindow::handlePerFrameHover() // *NOTE: sometimes tools handle the mouse as a captor, so this // logic is a little confusing LLTool *tool = NULL; - if (gToolMgr && gHoverView && gCamera) + if (gToolMgr && gHoverView) { tool = gToolMgr->getCurrentTool(); @@ -2917,8 +2915,8 @@ BOOL LLViewerWindow::handlePerFrameHover() mToolTip->setVisible( TRUE ); } } - - if (tool && tool != gToolNull && tool != gToolInspect && tool != gToolDragAndDrop && !gSavedSettings.getBOOL("FreezeTime")) + + if (tool != gToolNull && tool != gToolInspect && tool != gToolDragAndDrop && !gSavedSettings.getBOOL("FreezeTime")) { LLMouseHandler *captor = gFocusMgr.getMouseCapture(); // With the null, inspect, or drag and drop tool, don't muck |