Handling mRenderableRestoreList data when closing pathfinding window

indra/newview/llfloaterpathfindingconsole.cpp

@@ -302,7 +302,7 @@ void LLFloaterPathfindingConsole::onClose(bool pIsAppQuitting)
 
 	setDefaultInputs();
 	setConsoleState(kConsoleStateUnknown);
-
+	cleanupRenderableRestoreItems();
 	LLFloater::onClose(pIsAppQuitting);
 }
 
@@ -708,6 +708,7 @@ void LLFloaterPathfindingConsole::setDefaultInputs()
 	setRenderExclusionVolumes(FALSE);
 	setRenderWaterPlane(FALSE);
 	setRenderXRay(FALSE);
+	setRenderWorldMovablesOnly(FALSE);
 }
 
 void LLFloaterPathfindingConsole::setConsoleState(EConsoleState pConsoleState)
@@ -992,14 +993,17 @@ void LLFloaterPathfindingConsole::initializeNavMeshZoneForCurrentRegion()
 	mNavMeshZone.initialize();
 	mNavMeshZone.enable();
 	mNavMeshZone.refresh();
-	mRenderableRestoreList.clear();	
+	cleanupRenderableRestoreItems();
 }
 
 void LLFloaterPathfindingConsole::cleanupRenderableRestoreItems()
+{
+	if ( !mRenderableRestoreList.empty() ) 
 	{ 
 		gPipeline.restorePermanentObjects( mRenderableRestoreList ); 
 		mRenderableRestoreList.clear();
 	}
+}
 
 void LLFloaterPathfindingConsole::setAgentState(LLPathfindingManager::EAgentState pAgentState)
 {