diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-08-04 15:44:45 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-08-04 15:44:45 -0700 |
| commit | 6f256e2d57d6814fdb97809405989c54ab148c6b (patch) | |
| tree | 0584e6231bf80e9919e7bf30caceece94b25deb4 /indra/newview/llagent.cpp | |
| parent | a97bcb7c7fd705818b7f36af2c4a915e85ff5604 (diff) | |
| parent | eefe3388da83ce3e368af28ba466c27644f156c8 (diff) | |
Merge with dessie/viewer-release
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 7c92a5a756..a4bf56fc96 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()); } |