diff options
author | Oz Linden <oz@lindenlab.com> | 2012-06-19 13:50:10 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2012-06-19 13:50:10 -0400 |
commit | da0b5fe998434a935027b5e7cca2b70b895f0673 (patch) | |
tree | 538531439ee880365c681dd4a0652b312c3734f9 /indra/newview/llpathfindingnavmeshstatus.h | |
parent | d7400ae60c0453e111357abfb09d8308adf8b721 (diff) | |
parent | eb341068de59c86101aa4fd4031b6cdd7e4bbdc2 (diff) |
merge up to latest viewer-development-havokai
Diffstat (limited to 'indra/newview/llpathfindingnavmeshstatus.h')
-rw-r--r-- | indra/newview/llpathfindingnavmeshstatus.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/indra/newview/llpathfindingnavmeshstatus.h b/indra/newview/llpathfindingnavmeshstatus.h index 6428a31c24..837fc43cc5 100644 --- a/indra/newview/llpathfindingnavmeshstatus.h +++ b/indra/newview/llpathfindingnavmeshstatus.h @@ -32,9 +32,6 @@ #include <string> -// XXX stinson 03/12/2012 : This definition is in place to support an older version of the pathfinding simulator that does not have versioned information -#define DEPRECATED_UNVERSIONED_NAVMESH - class LLSD; class LLPathfindingNavMeshStatus @@ -57,10 +54,6 @@ public: LLPathfindingNavMeshStatus &operator =(const LLPathfindingNavMeshStatus &pOther); -#ifdef DEPRECATED_UNVERSIONED_NAVMESH - void incrementNavMeshVersionXXX() {++mVersion;}; -#endif // DEPRECATED_UNVERSIONED_NAVMESH - bool isValid() const {return mIsValid;}; const LLUUID &getRegionUUID() const {return mRegionUUID;}; U32 getVersion() const {return mVersion;}; |