Path-722: Fixed bug where navmesh rebake panel was being removed after navmesh debug window was closed. Minor code cleanup.

3 files changed, 1 insertions, 5 deletions

diff --git a/indra/newview/llfloaterpathfindingconsole.cpp b/indra/newview/llfloaterpathfindingconsole.cpp
index 7d3efb5454..89aba6654d 100644
--- a/indra/newview/llfloaterpathfindingconsole.cpp
+++ b/indra/newview/llfloaterpathfindingconsole.cpp
@@ -265,8 +265,6 @@ void LLFloaterPathfindingConsole::onClose(bool pIsAppQuitting)
 	setDefaultInputs();
 	setConsoleState(kConsoleStateUnknown);
 	cleanupRenderableRestoreItems();
-	LLPanelNavMeshRebake* pPanelNavMeshRebake = LLPanelNavMeshRebake::getInstance();
-	if ( pPanelNavMeshRebake ) { pPanelNavMeshRebake->setVisible( FALSE ); }
 
 	LLFloater::onClose(pIsAppQuitting);
 }
diff --git a/indra/newview/llpanelnavmeshrebake.cpp b/indra/newview/llpanelnavmeshrebake.cpp
index 0f88c6f1d3..993ade89c9 100644
--- a/indra/newview/llpanelnavmeshrebake.cpp
+++ b/indra/newview/llpanelnavmeshrebake.cpp
@@ -100,7 +100,6 @@ LLPanelNavMeshRebake* LLPanelNavMeshRebake::getPanel()
 	LLPanelNavMeshRebake* panel = new LLPanelNavMeshRebake();
 	panel->buildFromFile("panel_navmesh_rebake.xml");
 	panel->setVisible(FALSE);
-	//panel->updatePosition();
 	return panel;
 }
 
diff --git a/indra/newview/llpanelnavmeshrebake.h b/indra/newview/llpanelnavmeshrebake.h
index 4e2381b6d6..468081313e 100644
--- a/indra/newview/llpanelnavmeshrebake.h
+++ b/indra/newview/llpanelnavmeshrebake.h
@@ -51,7 +51,7 @@ public:
 	/*virtual*/ void setVisible( BOOL visible );
 
 	
-	/*virtual*/ void draw(){/*updatePosition(); */LLPanel::draw();}
+	/*virtual*/ void draw(){ LLPanel::draw(); }
 	/*virtual*/ BOOL handleToolTip( S32 x, S32 y, MASK mask );
 
 protected:
@@ -61,7 +61,6 @@ protected:
 private:
 	static LLPanelNavMeshRebake* getPanel();
 	void onNavMeshRebakeClick();
-	//void updatePosition();
 
 	LLButton* mNavMeshRebakeButton;
 	LLButton* mNavMeshBakingButton;