Removing another capability check that was occurring prior to the receipt of the listed capabilities.

1 files changed, 8 insertions, 1 deletions

diff --git a/indra/newview/llpathfindingpathtool.cpp b/indra/newview/llpathfindingpathtool.cpp
index 8825f82f29..1e327a3ba7 100644
--- a/indra/newview/llpathfindingpathtool.cpp
+++ b/indra/newview/llpathfindingpathtool.cpp
@@ -27,10 +27,13 @@
 
 #include "llviewerprecompiledheaders.h"
 #include "llpathfindingpathtool.h"
+
+#include "llagent.h"
 #include "llsingleton.h"
 #include "lltool.h"
-#include "llviewerwindow.h"
 #include "llviewercamera.h"
+#include "llviewerregion.h"
+#include "llviewerwindow.h"
 #include "llpathfindingmanager.h"
 #include "llpathinglib.h"
 
@@ -167,6 +170,10 @@ LLPathfindingPathTool::EPathStatus LLPathfindingPathTool::getPathStatus() const
 	{
 		status = kPathStatusNotImplemented;
 	}
+	else if ((gAgent.getRegion() != NULL) && !gAgent.getRegion()->capabilitiesReceived())
+	{
+		status = kPathStatusUnknown;
+	}
 	else if (!LLPathfindingManager::getInstance()->isPathfindingEnabledForCurrentRegion())
 	{
 		status = kPathStatusNotEnabled;