diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-07-03 05:50:31 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-07-03 05:50:31 -0400 |
| commit | e575a0ef04ed35ccdf4c0de50baecfc460b6c707 (patch) | |
| tree | 927c3e9304edb7408eb81c1c1a591fa978db1b79 /indra/newview/llviewerwindow.cpp | |
| parent | d59715d6f1028f86827f1bd7b43c29abe697fcc9 (diff) | |
| parent | 770d8b0d01d3dabeccded0df3a06058f6196d829 (diff) | |
merge up to latest pathfinding project viewer
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 427afb96bc..5315568667 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -126,7 +126,7 @@ #include "llmorphview.h" #include "llmoveview.h" #include "llnavigationbar.h" -#include "llpanelnavmeshrebake.h" +#include "llpanelpathfindingrebakenavmesh.h" #include "llpaneltopinfobar.h" #include "llpopupview.h" #include "llpreviewtexture.h" @@ -1929,7 +1929,7 @@ void LLViewerWindow::initWorldUI() LLPanelStandStopFlying* panel_stand_stop_flying = LLPanelStandStopFlying::getInstance(); panel_ssf_container->addChild(panel_stand_stop_flying); - LLPanelNavMeshRebake *panel_rebake_navmesh = LLPanelNavMeshRebake::getInstance(); + LLPanelPathfindingRebakeNavmesh *panel_rebake_navmesh = LLPanelPathfindingRebakeNavmesh::getInstance(); panel_ssf_container->addChild(panel_rebake_navmesh); panel_ssf_container->setVisible(TRUE); |