diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-07-14 14:43:53 +0300 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-07-14 14:43:53 +0300 |
| commit | 1f2dcfd866390be1a3a1b1f9406bca861d32c4b4 (patch) | |
| tree | 2406da619100b2aef6a70e8b346245999dfc8266 /indra/newview/llagent.cpp | |
| parent | 84a6b197600d3f6c2dc35c8372ace004b290b2c8 (diff) | |
| parent | 37fc4e42dd173d92abb31be83dbd04fa3b7b70fa (diff) | |
Merge from default branch
--HG--
branch : product-engine
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()); } |