diff options
author | simon <none@none> | 2014-06-18 19:02:25 -0700 |
---|---|---|
committer | simon <none@none> | 2014-06-18 19:02:25 -0700 |
commit | d760a6889dbe1ca5ff0775343a6a01f735ec740b (patch) | |
tree | 421a79d29dec1544c0347635113202a4bc7ba18a /indra/newview/llpathfindingnavmesh.h | |
parent | 3686dc3e37511009be02b61edcd483cb9a032b1b (diff) | |
parent | 592024b5805a116c9d0bef893127427df0741b41 (diff) |
Merge downstream code
Diffstat (limited to 'indra/newview/llpathfindingnavmesh.h')
-rwxr-xr-x | indra/newview/llpathfindingnavmesh.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpathfindingnavmesh.h b/indra/newview/llpathfindingnavmesh.h index b872ccad7c..87f32b8d56 100755 --- a/indra/newview/llpathfindingnavmesh.h +++ b/indra/newview/llpathfindingnavmesh.h @@ -74,7 +74,7 @@ public: void handleNavMeshResult(const LLSD &pContent, U32 pNavMeshVersion); void handleNavMeshNotEnabled(); void handleNavMeshError(); - void handleNavMeshError(U32 pStatus, const std::string &pReason, const LLSD& pContent, const std::string &pURL, U32 pNavMeshVersion); + void handleNavMeshError(U32 pNavMeshVersion); protected: |