diff options
Diffstat (limited to 'indra/newview/llagent.cpp')
| -rwxr-xr-x | indra/newview/llagent.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index 3870a3be2e..cbd08ad1c3 100755 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -88,6 +88,7 @@ #include "llworld.h" #include "llworldmap.h" #include "stringize.h" +#include "llfloaterpathfindingconsole.h" using namespace LLVOAvatarDefines; @@ -395,6 +396,7 @@ void LLAgent::ageChat() //----------------------------------------------------------------------------- void LLAgent::moveAt(S32 direction, bool reset) { + mMoveTimer.reset(); LLFirstUse::notMoving(false); @@ -644,6 +646,7 @@ void LLAgent::setFlying(BOOL fly) // static void LLAgent::toggleFlying() { + if ( gAgent.mAutoPilot ) { LLToolPie::instance().stopClickToWalk(); @@ -2702,6 +2705,7 @@ void LLAgent::sendAnimationRequest(const LLUUID &anim_id, EAnimRequest request) void LLAgent::sendWalkRun(bool running) { + LLMessageSystem* msgsys = gMessageSystem; if (msgsys) { @@ -3633,6 +3637,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: |