livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PATH-743: Small code refactoring for clean-up.

meow-7.2.2
Todd Stinson 2012-06-25 14:44:09 -07:00
parent bf1c1947d7
commit 9b46e116a9
1 changed files with 6 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
indra/newview/llpathfindingpathtool.cpp
View File

@ -70,14 +70,9 @@ BOOL LLPathfindingPathTool::handleMouseDown(S32 pX, S32 pY, MASK pMask)
{
if (isAnyPathToolModKeys(pMask))
{
if (isPointAModKeys(pMask))
{
gViewerWindow->setCursor(UI_CURSOR_TOOLPATHFINDING_PATH_START_ADD);
}
else if (isPointBModKeys(pMask))
{
gViewerWindow->setCursor(UI_CURSOR_TOOLPATHFINDING_PATH_END_ADD);
}
gViewerWindow->setCursor(isPointAModKeys(pMask)
? UI_CURSOR_TOOLPATHFINDING_PATH_START_ADD
: UI_CURSOR_TOOLPATHFINDING_PATH_END_ADD);
computeFinalPoints(pX, pY, pMask);
mIsLeftMouseButtonHeld = true;
setMouseCapture(TRUE);
@ -167,28 +162,9 @@ BOOL LLPathfindingPathTool::handleHover(S32 pX, S32 pY, MASK pMask)
if (!mIsMiddleMouseButtonHeld && !mIsRightMouseButtonHeld && isAnyPathToolModKeys(pMask))
{
if (isPointAModKeys(pMask))
{
if (mIsLeftMouseButtonHeld)
{
gViewerWindow->setCursor(UI_CURSOR_TOOLPATHFINDING_PATH_START_ADD);
}
else
{
gViewerWindow->setCursor(UI_CURSOR_TOOLPATHFINDING_PATH_START);
}
}
else if (isPointBModKeys(pMask))
{
if (mIsLeftMouseButtonHeld)
{
gViewerWindow->setCursor(UI_CURSOR_TOOLPATHFINDING_PATH_END_ADD);
}
else
{
gViewerWindow->setCursor(UI_CURSOR_TOOLPATHFINDING_PATH_END);
}
}
gViewerWindow->setCursor(isPointAModKeys(pMask)
? (mIsLeftMouseButtonHeld ? UI_CURSOR_TOOLPATHFINDING_PATH_START_ADD : UI_CURSOR_TOOLPATHFINDING_PATH_START)
: (mIsLeftMouseButtonHeld ? UI_CURSOR_TOOLPATHFINDING_PATH_END_ADD : UI_CURSOR_TOOLPATHFINDING_PATH_END));
computeTempPoints(pX, pY, pMask);
returnVal = TRUE;
}