summaryrefslogtreecommitdiff
path: root/indra/newview/llpathfindingnavmeshstatus.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2012-06-19 13:50:10 -0400
committerOz Linden <oz@lindenlab.com>2012-06-19 13:50:10 -0400
commitda0b5fe998434a935027b5e7cca2b70b895f0673 (patch)
tree538531439ee880365c681dd4a0652b312c3734f9 /indra/newview/llpathfindingnavmeshstatus.cpp
parentd7400ae60c0453e111357abfb09d8308adf8b721 (diff)
parenteb341068de59c86101aa4fd4031b6cdd7e4bbdc2 (diff)
merge up to latest viewer-development-havokai
Diffstat (limited to 'indra/newview/llpathfindingnavmeshstatus.cpp')
-rw-r--r--indra/newview/llpathfindingnavmeshstatus.cpp17
1 files changed, 0 insertions, 17 deletions
diff --git a/indra/newview/llpathfindingnavmeshstatus.cpp b/indra/newview/llpathfindingnavmeshstatus.cpp
index 31ff85c1a1..5cddb995a4 100644
--- a/indra/newview/llpathfindingnavmeshstatus.cpp
+++ b/indra/newview/llpathfindingnavmeshstatus.cpp
@@ -34,7 +34,6 @@
#include <string>
#define REGION_FIELD "region_id"
-#define DEPRECATED_STATE_FIELD "state"
#define STATUS_FIELD "status"
#define VERSION_FIELD "version"
@@ -115,25 +114,9 @@ void LLPathfindingNavMeshStatus::parseStatus(const LLSD &pContent)
llassert(pContent.get(VERSION_FIELD).asInteger() >= 0);
mVersion = static_cast<U32>(pContent.get(VERSION_FIELD).asInteger());
-#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) == 0)
{