summaryrefslogtreecommitdiff
path: root/indra/newview/llpathfindingnavmesh.cpp
diff options
context:
space:
mode:
authorMonty Brandenberg <monty@lindenlab.com>2014-06-16 16:41:52 -0400
committerMonty Brandenberg <monty@lindenlab.com>2014-06-16 16:41:52 -0400
commit903729d5c97c9f93daf463e155055653b92f8fe4 (patch)
tree178e5b9e774702c046f3e7d279ef5b9ef8fc4d1b /indra/newview/llpathfindingnavmesh.cpp
parentf3a037f8ad520b7b070fdd057ce2d0b012121efd (diff)
parent977476171ddcc057d7c28b6c14ae988b8189ed75 (diff)
Merge. Refresh from viewer-release after 3.7.9 release.
Diffstat (limited to 'indra/newview/llpathfindingnavmesh.cpp')
-rwxr-xr-xindra/newview/llpathfindingnavmesh.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/newview/llpathfindingnavmesh.cpp b/indra/newview/llpathfindingnavmesh.cpp
index 40f5d8c23e..0287c07f96 100755
--- a/indra/newview/llpathfindingnavmesh.cpp
+++ b/indra/newview/llpathfindingnavmesh.cpp
@@ -184,10 +184,8 @@ void LLPathfindingNavMesh::handleNavMeshError()
setRequestStatus(kNavMeshRequestError);
}
-void LLPathfindingNavMesh::handleNavMeshError(U32 pStatus, const std::string &pReason, const LLSD& pContent, const std::string &pURL, U32 pNavMeshVersion)
+void LLPathfindingNavMesh::handleNavMeshError(U32 pNavMeshVersion)
{
- LL_WARNS() << "LLPathfindingNavMesh error with request to URL '" << pURL << "' [status:"
- << pStatus << "]: " << pContent << LL_ENDL;
if (mNavMeshStatus.getVersion() == pNavMeshVersion)
{
handleNavMeshError();