From fa46459cdb6d63fea6a76d8c11eee5503edf5bb1 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Tue, 7 Feb 2012 14:13:57 -0800
Subject: PATH-245: Hooking the characters floater up to the character service.
  Also, adding in an additional state to handle the floater when the service
 does not exist.

---
 indra/newview/llfloaterpathfindingcharacters.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

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

diff --git a/indra/newview/llfloaterpathfindingcharacters.cpp b/indra/newview/llfloaterpathfindingcharacters.cpp
index 021b48f0a0..86b7e86f9e 100644
--- a/indra/newview/llfloaterpathfindingcharacters.cpp
+++ b/indra/newview/llfloaterpathfindingcharacters.cpp
@@ -187,7 +187,7 @@ void LLFloaterPathfindingCharacters::sendCharactersDataGetRequest()
 		std::string charactersDataURL = getCapabilityURL();
 		if (charactersDataURL.empty())
 		{
-			setMessagingState(kMessagingComplete);
+			setMessagingState(kMessagingServiceNotAvailable);
 			llwarns << "cannot query pathfinding characters from current region '" << getRegionName() << "'" << llendl;
 		}
 		else
@@ -235,7 +235,7 @@ std::string LLFloaterPathfindingCharacters::getCapabilityURL() const
 	LLViewerRegion* region = gAgent.getRegion();
 	if (region != NULL)
 	{
-		charactersDataURL = region->getCapability("ObjectNavMeshProperties");
+		charactersDataURL = region->getCapability("CharacterProperties");
 	}
 
 	return charactersDataURL;
@@ -431,6 +431,10 @@ void LLFloaterPathfindingCharacters::updateCharactersStatusMessage()
 			statusText = getString("characters_messaging_complete_available", string_args);
 		}
 		break;
+	case kMessagingServiceNotAvailable:
+		statusText = getString("characters_messaging_service_not_available");
+		styleParams.color = warningColor;
+		break;
 	default:
 		statusText = getString("characters_messaging_initial");
 		llassert(0);
-- 
cgit v1.2.3