diff options
author | Xiaohong Bao <bao@lindenlab.com> | 2013-08-30 11:02:50 -0600 |
---|---|---|
committer | Xiaohong Bao <bao@lindenlab.com> | 2013-08-30 11:02:50 -0600 |
commit | 736efc7b574635d5c86a97a33b456dd79a035777 (patch) | |
tree | 495c201825007d51de0368ff326045428575f060 /indra/newview/llagent.cpp | |
parent | 12688c8b549d2baa33509dca60bbe14b039b17db (diff) | |
parent | f713fe492f8b86a0743e0a553d62f06ff62500bb (diff) |
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
Diffstat (limited to 'indra/newview/llagent.cpp')
-rwxr-xr-x | indra/newview/llagent.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index 2d7008b4ef..a7bd628d5a 100755 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -3802,6 +3802,7 @@ bool LLAgent::teleportCore(bool is_local) //release geometry from old location gPipeline.resetVertexBuffers(); + LLSpatialPartition::sTeleportRequested = TRUE; } make_ui_sound("UISndTeleportOut"); |