livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PATH-748: Removing the DEPRECATED_STATE_FIELD ifdef.

meow-7.2.2
Todd Stinson 2012-06-18 19:14:00 -07:00
parent b20f1a5143
commit c5db43d9a5
1 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
indra/newview/llpathfindingnavmeshstatus.cpp
View File

@ -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)
{