diff options
| author | Todd Stinson <stinson@lindenlab.com> | 2012-06-13 17:19:52 -0700 |
|---|---|---|
| committer | Todd Stinson <stinson@lindenlab.com> | 2012-06-13 17:19:52 -0700 |
| commit | 8973a3db31af2e3ce77fb3c614f15aac65a0ed07 (patch) | |
| tree | 041bd7092dad94368a5d4acbc353b4bca66d054b /indra/newview/llviewerwindow.cpp | |
| parent | 379aff3520d368d1119e00f46684670030472832 (diff) | |
| parent | 76f7c0e58c75add62c0fb989bf13bfa50952c4bd (diff) | |
Pull and merge from ssh://hg@bitbucket.org/stinson_linden/viewer-development-havokai.
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index 4d31876bea..8bdab7d27a 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -200,9 +200,6 @@ #include "llviewerwindowlistener.h" #include "llpaneltopinfobar.h" -//prep# -#include "llpathfindingmanager.h" - #if LL_WINDOWS #include <tchar.h> // For Unicode conversion methods #endif @@ -1926,12 +1923,7 @@ void LLViewerWindow::initWorldUI() LLPanelStandStopFlying* panel_stand_stop_flying = LLPanelStandStopFlying::getInstance(); panel_ssf_container->addChild(panel_stand_stop_flying); panel_ssf_container->setVisible(TRUE); - //prep# - /*LLPanel* panel_nmr_container = getRootView()->getChild<LLPanel>("navmesh_rebake_container"); - LLPanelNavMeshRebake* panel_namesh_rebake = LLPanelNavMeshRebake::getInstance(); - panel_nmr_container->addChild(panel_namesh_rebake); - panel_nmr_container->setVisible(TRUE); - */ + // Load and make the toolbars visible // Note: we need to load the toolbars only *after* the user is logged in and IW if (gToolBarView) |