summaryrefslogtreecommitdiff
path: root/indra/newview/llagent.cpp
diff options
context:
space:
mode:
authorDessie Linden <dessie@lindenlab.com>2010-07-14 06:39:14 -0700
committerDessie Linden <dessie@lindenlab.com>2010-07-14 06:39:14 -0700
commitbe299644e3448ad2d613b97aba478c5807f346ec (patch)
tree7e38cb35375b235deaf1f0ea5374e6c1bcd10f7f /indra/newview/llagent.cpp
parentc3099df719274556fede1a57bc42e555e5c89fbb (diff)
parent4339600d43601f07d01c676cce5da17c2758c4cb (diff)
Merged from viewer-release
Diffstat (limited to 'indra/newview/llagent.cpp')
-rw-r--r--indra/newview/llagent.cpp3
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());
}