PATH-265: Adding an error message to the testing tab of the pathfinding floater console to indicate when a path cannot be found.

3 files changed, 16 insertions, 3 deletions

diff --git a/indra/newview/llfloaterpathfindingconsole.cpp b/indra/newview/llfloaterpathfindingconsole.cpp
index d173764fd1..c59f960d3f 100644
--- a/indra/newview/llfloaterpathfindingconsole.cpp
+++ b/indra/newview/llfloaterpathfindingconsole.cpp
@@ -549,7 +549,8 @@ LLFloaterPathfindingConsole::LLFloaterPathfindingConsole(const LLSD& pSeed)
 	mConsoleState(kConsoleStateUnknown),

 	mPathData(),

 	mHasStartPoint(false),

-	mHasEndPoint(false)

+	mHasEndPoint(false),

+	mHasValidPath(false)

 {

 	mSelfHandle.bind(this);

 }

@@ -631,6 +632,7 @@ void LLFloaterPathfindingConsole::onClearPathClicked()
 {

 	mHasStartPoint = false;

 	mHasEndPoint = false;

+	mHasValidPath = false;

 	updatePathTestStatus();

 }

 

@@ -721,6 +723,7 @@ void LLFloaterPathfindingConsole::updateControlsOnConsoleState()
 		mClearPathButton->setEnabled(FALSE);

 		mHasStartPoint = false;

 		mHasEndPoint = false;

+		mHasValidPath = false;

 		break;

 	case kConsoleStateCheckingVersion :

 	case kConsoleStateDownloading :

@@ -741,6 +744,7 @@ void LLFloaterPathfindingConsole::updateControlsOnConsoleState()
 		mClearPathButton->setEnabled(FALSE);

 		mHasStartPoint = false;

 		mHasEndPoint = false;

+		mHasValidPath = false;

 		break;

 	case kConsoleStateHasNavMesh :

 		mShowNavMeshCheckBox->setEnabled(TRUE);

@@ -966,12 +970,14 @@ void LLFloaterPathfindingConsole::generatePath()
 			mPathData.mCharacterType = LLPathingLib::LLPL_CHARACTER_TYPE_NONE;

 			break;

 		}

-		LLPathingLib::getInstance()->generatePath(mPathData);

+		LLPathingLib::LLPLResult pathingResult = LLPathingLib::getInstance()->generatePath(mPathData);

+		mHasValidPath = (pathingResult == LLPathingLib::LLPL_PATH_GENERATED_OK);

 	}

 }

 

 void LLFloaterPathfindingConsole::updatePathTestStatus()

 {

+	static const LLColor4 errorColor = LLUIColorTable::instance().getColor("PathfindingErrorColor");

 	static const LLColor4 warningColor = LLUIColorTable::instance().getColor("PathfindingWarningColor");

 

 	std::string statusText("");

@@ -992,10 +998,15 @@ void LLFloaterPathfindingConsole::updatePathTestStatus()
 		statusText = getString("pathing_choose_end_point");

 		styleParams.color = warningColor;

 	}

-	else

+	else if (mHasValidPath)

 	{

 		statusText = getString("pathing_path_valid");

 	}

+	else

+	{

+		statusText = getString("pathing_path_invalid");

+		styleParams.color = errorColor;

+	}

 

 	mPathTestingStatus->setText((LLStringExplicit)statusText, styleParams);

 }

diff --git a/indra/newview/llfloaterpathfindingconsole.h b/indra/newview/llfloaterpathfindingconsole.h
index 2b61e0e1e8..85df38b370 100644
--- a/indra/newview/llfloaterpathfindingconsole.h
+++ b/indra/newview/llfloaterpathfindingconsole.h
@@ -203,6 +203,7 @@ private:
 	LLPathingLib::PathingPacket		mPathData;

 	bool							mHasStartPoint;

 	bool							mHasEndPoint;

+	bool                            mHasValidPath;

 	U32								mShapeRenderFlags;

 

 	static LLHandle<LLFloaterPathfindingConsole> sInstanceHandle;

diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
index 09fe5f4bc7..e43fda01e0 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
@@ -31,6 +31,7 @@
   <floater.string name="pathing_choose_start_point">Please choose start point.</floater.string>
   <floater.string name="pathing_choose_end_point">Please choose end point.</floater.string>
   <floater.string name="pathing_path_valid">Path is shown in orange.</floater.string>
+  <floater.string name="pathing_path_invalid">A path between the chosen points cannot be found.</floater.string>
   <panel
       border="false"
       bevel_style="none"