diff options
author | Todd Stinson <stinson@lindenlab.com> | 2012-06-28 15:37:55 -0700 |
---|---|---|
committer | Todd Stinson <stinson@lindenlab.com> | 2012-06-28 15:37:55 -0700 |
commit | 685a672b74550ca0dbf8a816257c84c9c44fd34d (patch) | |
tree | 32111fe89d793ce9720940e7cd99afb52f660400 /indra/newview/llpathfindingnavmesh.cpp | |
parent | df40282058b35e752ab9d7c60379c4e77b74410f (diff) |
Cleaning up new files in preparation for merge into viewer-release.
Diffstat (limited to 'indra/newview/llpathfindingnavmesh.cpp')
-rw-r--r-- | indra/newview/llpathfindingnavmesh.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llpathfindingnavmesh.cpp b/indra/newview/llpathfindingnavmesh.cpp index 1a49560712..e01dd3a152 100644 --- a/indra/newview/llpathfindingnavmesh.cpp +++ b/indra/newview/llpathfindingnavmesh.cpp @@ -30,12 +30,13 @@ #include "llpathfindingnavmesh.h" +#include <string> + #include "llpathfindingnavmeshstatus.h" +#include "llsd.h" #include "llsdserialize.h" #include "lluuid.h" -#include <string> - #define NAVMESH_VERSION_FIELD "navmesh_version" #define NAVMESH_DATA_FIELD "navmesh_data" @@ -119,6 +120,7 @@ void LLPathfindingNavMesh::handleNavMeshStart(const LLPathfindingNavMeshStatus & void LLPathfindingNavMesh::handleNavMeshResult(const LLSD &pContent, U32 pNavMeshVersion) { + llassert(pContent.has(NAVMESH_VERSION_FIELD)); if (pContent.has(NAVMESH_VERSION_FIELD)) { llassert(pContent.get(NAVMESH_VERSION_FIELD).isInteger()); |