summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermessage.cpp
diff options
context:
space:
mode:
authorDebi King (Dessie) <dessie@lindenlab.com>2012-01-17 13:33:19 -0500
committerDebi King (Dessie) <dessie@lindenlab.com>2012-01-17 13:33:19 -0500
commitcd64ae7fb8ee781a5bf9ac47dd2428e659b939c9 (patch)
tree9638dfe3ce3a7d5399d6f52552c9e1e3f308fd46 /indra/newview/llviewermessage.cpp
parente4f1f611a4736e4b0b78c0d61c3c5f576fec93d0 (diff)
parent2abb1a81c56a27eab02157851cb9e67730231bb6 (diff)
reconciled .hgtags
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;