From 9eec646601d6ce903d41dc305364373dc0a18b74 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Tue, 1 May 2012 15:19:39 -0700
Subject: Removing another capability check that was occurring prior to the
receipt of the listed capabilities.
---
indra/newview/llpathfindingpathtool.cpp | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
(limited to 'indra')
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;
--
cgit v1.2.3