diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-07-14 10:17:10 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-07-14 10:17:10 -0400 |
| commit | 6ce6ce238c68f7a6c99fef2baed9420caf09f848 (patch) | |
| tree | 4291aa0cde0c982028382744fc236180245f23aa /indra/newview/llagent.cpp | |
| parent | c5356935354013530432cfb07556902a039020a9 (diff) | |
| parent | 4339600d43601f07d01c676cce5da17c2758c4cb (diff) | |
automated merge
Diffstat (limited to 'indra/newview/llagent.cpp')
| -rw-r--r-- | indra/newview/llagent.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index 4e5fdb1219..72d51540ef 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -3406,6 +3406,9 @@ void LLAgent::setTeleportState(ETeleportState state) } else if(mTeleportState == TELEPORT_ARRIVING) { + // First two position updates after a teleport tend to be weird + LLViewerStats::getInstance()->mAgentPositionSnaps.mCountOfNextUpdatesToIgnore = 2; + // Let the interested parties know we've teleported. LLViewerParcelMgr::getInstance()->onTeleportFinished(false, getPositionGlobal()); } |