diff options
| author | prep <none@none> | 2012-02-13 10:11:22 -0500 |
|---|---|---|
| committer | prep <none@none> | 2012-02-13 10:11:22 -0500 |
| commit | ca79e6bb048fd28412cf1474952db18a3284416f (patch) | |
| tree | 66d86fbd7c9562798ea54e5f760ff5cc777e09ec /indra/newview/llviewerwindow.cpp | |
| parent | 6d6c38f21688eb99691a8273e0779c50dfa69db7 (diff) | |
| parent | efdba568f60a8d939fcfd40ee0cf6a8e205a5e0b (diff) | |
merge
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index 04b687b42f..33d959f8de 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -204,7 +204,7 @@ #include "llviewerwindowlistener.h" #include "llpaneltopinfobar.h" #include "LLPathingLib.h" -#include "llfloaterpathfindingsetup.h" +#include "llfloaterpathfindingconsole.h" #if LL_WINDOWS #include <tchar.h> // For Unicode conversion methods @@ -966,7 +966,7 @@ BOOL LLViewerWindow::handleAnyMouseClick(LLWindow *window, LLCoordGL pos, MASK MASK currentKeyMask = gKeyboard->currentMask(TRUE); if ( !(currentKeyMask & MASK_ALT) ) { - LLFloaterPathfindingSetup* pFloater = LLFloaterReg::getTypedInstance<LLFloaterPathfindingSetup>("pathfinding_setup"); + LLFloaterPathfindingConsole* pFloater = LLFloaterReg::getTypedInstance<LLFloaterPathfindingConsole>("pathfinding_console"); if ( pFloater ) { //The floater takes care of determining what stage - essentially where the data goes into the pathing packet(start or end) |