From 8ad01dd79a2c215895017475bcfd62808f8893be Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Mon, 5 Mar 2012 17:55:33 -0800
Subject: Wrapping all cases of LLPathingLib::getInstance in null pointer
 checks.

---
 indra/newview/llfloaterpathfindingconsole.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'indra/newview/llfloaterpathfindingconsole.cpp')

diff --git a/indra/newview/llfloaterpathfindingconsole.cpp b/indra/newview/llfloaterpathfindingconsole.cpp
index eee5d6860d..37bf937cd1 100644
--- a/indra/newview/llfloaterpathfindingconsole.cpp
+++ b/indra/newview/llfloaterpathfindingconsole.cpp
@@ -265,7 +265,10 @@ void LLFloaterPathfindingConsole::onClose(bool pIsAppQuitting)
 		mNavMeshZoneSlot.disconnect();
 	}
 
-	//mNavMeshZone.disable();
+	if (LLPathingLib::getInstance() != NULL)
+	{
+		mNavMeshZone.disable();
+	}
 
 	LLFloater::onClose(pIsAppQuitting);
 	setHeartBeat( false );
-- 
cgit v1.2.3