Fix for Path-494. Teleporting with a list of renderables that needed to be restored caused a crash because the vo's had already been removed prior to the restorePermanentObjects() call.

1 files changed, 8 insertions, 2 deletions

diff --git a/indra/newview/llfloaterpathfindingconsole.cpp b/indra/newview/llfloaterpathfindingconsole.cpp
index 570a3f45eb..9f7e4ab838 100644
--- a/indra/newview/llfloaterpathfindingconsole.cpp
+++ b/indra/newview/llfloaterpathfindingconsole.cpp
@@ -611,8 +611,7 @@ void LLFloaterPathfindingConsole::onRenderWorldMovablesOnly()
 	}
 	else
 	{
-		gPipeline.restorePermanentObjects( mRenderableRestoreList );
-		mRenderableRestoreList.clear();
+		cleanupRenderableRestoreItems();
 	}
 }
 void LLFloaterPathfindingConsole::onNavMeshZoneCB(LLPathfindingNavMeshZone::ENavMeshZoneRequestStatus pNavMeshZoneRequestStatus)
@@ -993,6 +992,13 @@ void LLFloaterPathfindingConsole::initializeNavMeshZoneForCurrentRegion()
 	mNavMeshZone.initialize();
 	mNavMeshZone.enable();
 	mNavMeshZone.refresh();
+	mRenderableRestoreList.clear();	
+}
+
+void LLFloaterPathfindingConsole::cleanupRenderableRestoreItems()
+{
+	gPipeline.restorePermanentObjects( mRenderableRestoreList );
+	mRenderableRestoreList.clear();
 }
 
 void LLFloaterPathfindingConsole::setAgentState(LLPathfindingManager::EAgentState pAgentState)