diff options
| author | Richard Linden <none@none> | 2010-07-27 14:34:17 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-07-27 14:34:17 -0700 |
| commit | 6cd862063d8e9ce68efd0e15aeb3da76160fcd81 (patch) | |
| tree | 3f98c889d39e5fcf303bf08615a51d400ec64cde /indra/newview/llagent.cpp | |
| parent | fe8a5a007ab82f3d6a763c5cb133e1299d238632 (diff) | |
| parent | 15247f086989a43881d79c1ee5416bb00721eb68 (diff) | |
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()); } |