diff options
| author | Todd Stinson <stinson@lindenlab.com> | 2012-03-14 14:09:36 -0700 |
|---|---|---|
| committer | Todd Stinson <stinson@lindenlab.com> | 2012-03-14 14:09:36 -0700 |
| commit | d4fb7c99febf07b4eb7f3a9d2eab485e356d1439 (patch) | |
| tree | 31558a02ba12ecf565fdc72fd8b3386fde979689 /indra/newview/llpathfindingnavmeshstatus.cpp | |
| parent | e1aac3718192d7ce663f9134492b4a12dc1637d0 (diff) | |
PATH-302: Adding in status reporting for the simulator navmesh status. Separating the viewer status messaging from the simulator status.
Diffstat (limited to 'indra/newview/llpathfindingnavmeshstatus.cpp')
| -rw-r--r-- | indra/newview/llpathfindingnavmeshstatus.cpp | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/indra/newview/llpathfindingnavmeshstatus.cpp b/indra/newview/llpathfindingnavmeshstatus.cpp index 2ef892c8cd..0ba28e0297 100644 --- a/indra/newview/llpathfindingnavmeshstatus.cpp +++ b/indra/newview/llpathfindingnavmeshstatus.cpp @@ -48,6 +48,14 @@ const std::string LLPathfindingNavMeshStatus::sStatusRepending("repending"); // LLPathfindingNavMeshStatus
//---------------------------------------------------------------------------
+LLPathfindingNavMeshStatus::LLPathfindingNavMeshStatus()
+ : mIsValid(false),
+ mRegionUUID(),
+ mVersion(0U),
+ mStatus(kComplete)
+{
+}
+
LLPathfindingNavMeshStatus::LLPathfindingNavMeshStatus(const LLUUID &pRegionUUID)
: mIsValid(false),
mRegionUUID(pRegionUUID),
@@ -127,19 +135,19 @@ void LLPathfindingNavMeshStatus::parseStatus(const LLSD &pContent) std::string status = pContent.get(STATUS_FIELD).asString();
#endif // DEPRECATED_STATE_FIELD
- if (LLStringUtil::compareStrings(status, sStatusPending))
+ if (LLStringUtil::compareStrings(status, sStatusPending) == 0)
{
mStatus = kPending;
}
- else if (LLStringUtil::compareStrings(status, sStatusBuilding))
+ else if (LLStringUtil::compareStrings(status, sStatusBuilding) == 0)
{
mStatus = kBuilding;
}
- else if (LLStringUtil::compareStrings(status, sStatusComplete))
+ else if (LLStringUtil::compareStrings(status, sStatusComplete) == 0)
{
mStatus = kComplete;
}
- else if (LLStringUtil::compareStrings(status, sStatusRepending))
+ else if (LLStringUtil::compareStrings(status, sStatusRepending) == 0)
{
mStatus = kRepending;
}
|