summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorTodd Stinson <stinson@lindenlab.com>2012-03-02 19:19:39 -0800
committerTodd Stinson <stinson@lindenlab.com>2012-03-02 19:19:39 -0800
commit58af94e02ff11b878850a758f5b9e4ffb251ddf3 (patch)
tree11fd0799d90577a71c593baff98ae484578c63fe /indra/newview
parenta33e24413ea74aaad91d9eeaa685d1c523c5d210 (diff)
parentf5cebb27a72cf31723eb621bdcd117f7634a4e58 (diff)
Pull and merge from ssh://hg@bitbucket.org/stinson_linden/viewer-development-havokai.
Diffstat (limited to 'indra/newview')
-rwxr-xr-xindra/newview/llagent.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index 657e464cbb..1132ee4ea8 100755
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -3661,6 +3661,9 @@ void LLAgent::setTeleportState(ETeleportState state)
// Let the interested parties know we've teleported.
LLViewerParcelMgr::getInstance()->onTeleportFinished(false, getPositionGlobal());
+
+ //Since we teleported into a new region, we need to cleanup up any navmesh residuals
+ if ( LLPathingLib::getInstance() ) { LLPathingLib::getInstance()->cleanupResidual(); }
break;
default: