diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2007-01-17 23:02:00 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2007-01-17 23:02:00 +0000 |
| commit | 71d28bdbf0baab9302c8f458e3bdbcfc60d656d4 (patch) | |
| tree | 19f051897838d5a75e5ce1e776bb52a330173171 /indra/newview/llviewerwindow.cpp | |
| parent | fc664e93e62645fc6e9659664351e77f3c4b374f (diff) | |
merge release@56803 release-candidate@56833
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index 74a239e827..dc00fe7585 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -74,6 +74,7 @@ #include "llfloatercustomize.h" #include "llfloatereditui.h" // HACK JAMESDEBUG for ui editor #include "llfloaterland.h" +#include "llfloaterinspect.h" #include "llfloatermap.h" #include "llfloatermute.h" #include "llfloaternamedesc.h" @@ -2513,10 +2514,10 @@ BOOL LLViewerWindow::handlePerFrameHover() } } - if (tool != gToolNull && tool != gToolDragAndDrop && !gSavedSettings.getBOOL("FreezeTime")) + if (tool != gToolNull && tool != gToolInspect && tool != gToolCamera && tool != gToolDragAndDrop && !gSavedSettings.getBOOL("FreezeTime")) { LLMouseHandler *captor = gFocusMgr.getMouseCapture(); - // With the null tool or drag and drop tool, don't muck + // With the null, inspect, or drag and drop tool, don't muck // with visibility. if (gFloaterTools->isMinimized() || @@ -2525,11 +2526,11 @@ BOOL LLViewerWindow::handlePerFrameHover() && !mSuppressToolbox // not override in third person && gCurrentToolset != gFaceEditToolset // not special mode && gCurrentToolset != gMouselookToolset - && (!captor || captor->isView())) // not dragging - ) + && (!captor || captor->isView())) // not dragging + ) { // Force floater tools to be visible (unless minimized) - if (!gFloaterTools->isMinimized() && !gFloaterTools->getVisible()) + if (!gFloaterTools->getVisible()) { gFloaterTools->open(); } @@ -2675,6 +2676,7 @@ BOOL LLViewerWindow::handlePerFrameHover() // sync land selection with edit and about land dialogs if (gParcelMgr + && !gMenuHolder->hasVisibleMenu() && !LLFloaterLand::floaterVisible() && !LLFloaterBuyLand::isOpen() && (!gFloaterTools || !gFloaterTools->getVisible())) |