diff options
| author | Todd Stinson <stinson@lindenlab.com> | 2012-02-14 17:14:11 -0800 |
|---|---|---|
| committer | Todd Stinson <stinson@lindenlab.com> | 2012-02-14 17:14:11 -0800 |
| commit | d62017ddaaf8430e3f6887e687aa232578261b5e (patch) | |
| tree | 178daef884ce90a4d8282682b5888fa1b64c431d /indra/newview/llviewerwindow.cpp | |
| parent | d2bd4e4d108acae5473c28936b04bd19055e97e8 (diff) | |
PATH-284: Refactoring the code for determining whether in path creation mode.
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index e60bc66e82..219f00d47d 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -953,16 +953,13 @@ BOOL LLViewerWindow::handleAnyMouseClick(LLWindow *window, LLCoordGL pos, MASK } //Determine if we have a pathing system and subsequently provide any mouse input - if ((LLPathingLib::getInstance() != NULL) && - (clicktype == LLMouseHandler::CLICK_LEFT) && down && - (((mask & MASK_CONTROL) && !(mask & (~MASK_CONTROL))) || - ((mask & MASK_SHIFT) && !(mask & (~MASK_SHIFT))))) + if (LLPathingLib::getInstance() != NULL) { LLHandle<LLFloaterPathfindingConsole> pathfindingConsoleHandle = LLFloaterPathfindingConsole::getInstanceHandle(); if (!pathfindingConsoleHandle.isDead()) { LLFloaterPathfindingConsole *pathfindingConsoleFloater = pathfindingConsoleHandle.get(); - if (pathfindingConsoleFloater->isGeneratePathMode()) + if (pathfindingConsoleFloater->isGeneratePathMode(mask, clicktype, down)) { return pathfindingConsoleFloater->handleAnyMouseClick(x, y, mask, clicktype, down); } |