summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermessage.cpp
diff options
context:
space:
mode:
authorLeslie Linden <leslie@lindenlab.com>2011-12-12 10:54:45 -0800
committerLeslie Linden <leslie@lindenlab.com>2011-12-12 10:54:45 -0800
commitec30e6e70ff71723e2137595bc6ecd3eb358aabe (patch)
tree49055571f280685a440b1d79415a8004b5f28c7e /indra/newview/llviewermessage.cpp
parent6114ce2d27a3c776a59d1f09ad05d9b2f100a35d (diff)
parentdbc91a7fac9513bdd879c5c2dc82208e08eaad2d (diff)
Merge from viewer-development
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
-rwxr-xr-xindra/newview/llviewermessage.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index dca5cdd06d..ad333a71ff 100755
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -3638,6 +3638,9 @@ void process_teleport_finish(LLMessageSystem* msg, void**)
gCacheName->setUpstream(sim);
*/
+ // Make sure we're standing
+ gAgent.standUp();
+
// now, use the circuit info to tell simulator about us!
LL_INFOS("Messaging") << "process_teleport_finish() Enabling "
<< sim_host << " with code " << msg->mOurCircuitCode << LL_ENDL;