PATH-304: Proper handling of the sim-to-viewer message.

1 files changed, 22 insertions, 5 deletions

diff --git a/indra/newview/llpathfindingnavmeshstatus.cpp b/indra/newview/llpathfindingnavmeshstatus.cpp
index 67be0459a5..2ef892c8cd 100644
--- a/indra/newview/llpathfindingnavmeshstatus.cpp
+++ b/indra/newview/llpathfindingnavmeshstatus.cpp
@@ -33,8 +33,9 @@
 

 #include <string>

 

-#define REGION_FIELD  "region"

-#define STATE_FIELD   "state"

+#define REGION_FIELD  "region_id"

+#define DEPRECATED_STATE_FIELD "state"

+#define STATUS_FIELD  "status"

 #define VERSION_FIELD "version"

 

 const std::string LLPathfindingNavMeshStatus::sStatusPending("pending");

@@ -106,9 +107,25 @@ void LLPathfindingNavMeshStatus::parseStatus(const LLSD &pContent)
 	llassert(pContent.get(VERSION_FIELD).asInteger() >= 0);

 	mVersion = static_cast<U32>(pContent.get(VERSION_FIELD).asInteger());

 

-	llassert(pContent.has(STATE_FIELD));

-	llassert(pContent.get(STATE_FIELD).isString());

-	std::string status = pContent.get(STATE_FIELD).asString();

+#ifdef DEPRECATED_STATE_FIELD

+	std::string status;

+	if (pContent.has(DEPRECATED_STATE_FIELD))

+	{

+		llassert(pContent.has(DEPRECATED_STATE_FIELD));

+		llassert(pContent.get(DEPRECATED_STATE_FIELD).isString());

+		status = pContent.get(DEPRECATED_STATE_FIELD).asString();

+	}

+	else

+	{

+		llassert(pContent.has(STATUS_FIELD));

+		llassert(pContent.get(STATUS_FIELD).isString());

+		status = pContent.get(STATUS_FIELD).asString();

+	}

+#else // DEPRECATED_STATE_FIELD

+	llassert(pContent.has(STATUS_FIELD));

+	llassert(pContent.get(STATUS_FIELD).isString());

+	std::string status = pContent.get(STATUS_FIELD).asString();

+#endif // DEPRECATED_STATE_FIELD

 

 	if (LLStringUtil::compareStrings(status, sStatusPending))

 	{