Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

LLTool Update/Sync

Browse Source 
Better diff against Alchemy.
This commit is contained in:
Inusaito Sayori
2015-01-20 04:37:32 -05:00
parent a75964c993
commit 51aaa9f26b
11 changed files with 246 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
indra/newview/lltoolfocus.cpp
View File

@@ -313,6 +313,7 @@ BOOL LLToolCamera::handleMouseUp(S32 x, S32 y, MASK mask)
return TRUE;
}
BOOL LLToolCamera::handleHover(S32 x, S32 y, MASK mask)
{
if (gViewerWindow->getRightMouseDown())
@@ -343,7 +344,7 @@ BOOL LLToolCamera::handleHover(S32 x, S32 y, MASK mask)
{
if (!mValidClickPoint)
{
lldebugst(LLERR_USER_INPUT) << "hover handled by LLToolFocus [invalid point]" << llendl;
LL_DEBUGS("UserInput") << "hover handled by LLToolFocus [invalid point]" << LL_ENDL;
gViewerWindow->setCursor(UI_CURSOR_NO);
gViewerWindow->showCursor();
return TRUE;
@@ -370,7 +371,7 @@ BOOL LLToolCamera::handleHover(S32 x, S32 y, MASK mask)
gViewerWindow->moveCursorToCenter();
}
lldebugst(LLERR_USER_INPUT) << "hover handled by LLToolFocus [active]" << llendl;
LL_DEBUGS("UserInput") << "hover handled by LLToolFocus [active]" << LL_ENDL;
}
else if ( gCameraBtnPan ||
mask == MASK_PAN ||
@@ -398,7 +399,7 @@ BOOL LLToolCamera::handleHover(S32 x, S32 y, MASK mask)
gViewerWindow->moveCursorToCenter();
}
lldebugst(LLERR_USER_INPUT) << "hover handled by LLToolPan" << llendl;
LL_DEBUGS("UserInput") << "hover handled by LLToolPan" << LL_ENDL;
}
else if (gCameraBtnZoom)
{
@@ -430,7 +431,7 @@ BOOL LLToolCamera::handleHover(S32 x, S32 y, MASK mask)
gViewerWindow->moveCursorToCenter();
}
lldebugst(LLERR_USER_INPUT) << "hover handled by LLToolZoom" << llendl;
LL_DEBUGS("UserInput") << "hover handled by LLToolZoom" << LL_ENDL;
}
}