diff options
| author | Todd Stinson <stinson@lindenlab.com> | 2012-06-18 19:14:00 -0700 |
|---|---|---|
| committer | Todd Stinson <stinson@lindenlab.com> | 2012-06-18 19:14:00 -0700 |
| commit | c5db43d9a5094948c4e64032d88f218919db5b8b (patch) | |
| tree | ad507093954baca12af587e846783ebf9a5d6974 | |
| parent | b20f1a51430f1d611c129e170bf69bc52b9d0700 (diff) | |
PATH-748: Removing the DEPRECATED_STATE_FIELD ifdef.
| -rw-r--r-- | indra/newview/llpathfindingnavmeshstatus.cpp | 17 |
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) { |