diff options
| -rw-r--r-- | indra/newview/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | indra/newview/llfloaterpathfindingconsole.cpp (renamed from indra/newview/llfloaterpathfindingsetup.cpp) | 2 | ||||
| -rw-r--r-- | indra/newview/llfloaterpathfindingconsole.h (renamed from indra/newview/llfloaterpathfindingsetup.h) | 0 | ||||
| -rw-r--r-- | indra/newview/llnavmeshstation.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llviewerdisplay.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llviewerfloaterreg.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_pathfinding_console.xml (renamed from indra/newview/skins/default/xui/en/floater_pathfinding_setup.xml) | 0 |
8 files changed, 8 insertions, 8 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 76aa982f1d..45688a1724 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -219,8 +219,8 @@ set(viewer_SOURCE_FILES llfloateropenobject.cpp llfloateroutbox.cpp llfloaterpathfindingcharacters.cpp + llfloaterpathfindingconsole.cpp llfloaterpathfindinglinksets.cpp - llfloaterpathfindingsetup.cpp llfloaterpay.cpp llfloaterperms.cpp llfloaterpostprocess.cpp @@ -782,8 +782,8 @@ set(viewer_HEADER_FILES llfloateropenobject.h llfloateroutbox.h llfloaterpathfindingcharacters.h + llfloaterpathfindingconsole.h llfloaterpathfindinglinksets.h - llfloaterpathfindingsetup.h llfloaterpay.h llfloaterperms.h llfloaterpostprocess.h diff --git a/indra/newview/llfloaterpathfindingsetup.cpp b/indra/newview/llfloaterpathfindingconsole.cpp index dc8e96eb53..35f56a5625 100644 --- a/indra/newview/llfloaterpathfindingsetup.cpp +++ b/indra/newview/llfloaterpathfindingconsole.cpp @@ -26,7 +26,7 @@ */ #include "llviewerprecompiledheaders.h" -#include "llfloaterpathfindingsetup.h" +#include "llfloaterpathfindingconsole.h" #include "llfloaterpathfindinglinksets.h" #include "llsd.h" diff --git a/indra/newview/llfloaterpathfindingsetup.h b/indra/newview/llfloaterpathfindingconsole.h index edb7072b28..edb7072b28 100644 --- a/indra/newview/llfloaterpathfindingsetup.h +++ b/indra/newview/llfloaterpathfindingconsole.h diff --git a/indra/newview/llnavmeshstation.cpp b/indra/newview/llnavmeshstation.cpp index 16f459ff84..87f7e92ddd 100644 --- a/indra/newview/llnavmeshstation.cpp +++ b/indra/newview/llnavmeshstation.cpp @@ -31,7 +31,7 @@ #include "llagent.h" #include "llviewerregion.h" #include "llsdutil.h" -#include "llfloaterpathfindingsetup.h" +#include "llfloaterpathfindingconsole.h" //=============================================================================== LLNavMeshStation::LLNavMeshStation() diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp index 719f560101..3e21334cd4 100644 --- a/indra/newview/llviewerdisplay.cpp +++ b/indra/newview/llviewerdisplay.cpp @@ -78,7 +78,7 @@ #include "llwaterparammanager.h" #include "llpostprocess.h" #include "LLPathingLib.h" -#include "llfloaterpathfindingsetup.h" +#include "llfloaterpathfindingconsole.h" #include "llfloaterreg.h" extern LLPointer<LLViewerTexture> gStartTexture; diff --git a/indra/newview/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp index 84a0a8c6c4..e4d17e9d25 100644 --- a/indra/newview/llviewerfloaterreg.cpp +++ b/indra/newview/llviewerfloaterreg.cpp @@ -86,7 +86,7 @@ #include "llfloateroutbox.h" #include "llfloaterpathfindingcharacters.h" #include "llfloaterpathfindinglinksets.h" -#include "llfloaterpathfindingsetup.h" +#include "llfloaterpathfindingconsole.h" #include "llfloaterpay.h" #include "llfloaterperms.h" #include "llfloaterpostprocess.h" @@ -248,7 +248,7 @@ void LLViewerFloaterReg::registerFloaters() LLFloaterReg::add("pathfinding_characters", "floater_pathfinding_characters.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterPathfindingCharacters>); LLFloaterReg::add("pathfinding_linksets", "floater_pathfinding_linksets.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterPathfindingLinksets>); - LLFloaterReg::add("pathfinding_setup", "floater_pathfinding_setup.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterPathfindingSetup>); + LLFloaterReg::add("pathfinding_setup", "floater_pathfinding_console.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterPathfindingSetup>); LLFloaterReg::add("people", "floater_people.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterSidePanelContainer>); LLFloaterReg::add("places", "floater_places.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterSidePanelContainer>); LLFloaterReg::add("preferences", "floater_preferences.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterPreference>); diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index 04b687b42f..9109b5379b 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 diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_setup.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml index 37555eea3a..37555eea3a 100644 --- a/indra/newview/skins/default/xui/en/floater_pathfinding_setup.xml +++ b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml |