diff options
author | Dave Parks <davep@lindenlab.com> | 2011-12-05 13:38:01 -0600 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2011-12-05 13:38:01 -0600 |
commit | 46a8ee0263aff727fde98874a720d1f929d91141 (patch) | |
tree | 603ee21e2e8ab67c5ac489c259e927b68e4c9a0d /indra/newview/llviewermessage.cpp | |
parent | a8cb28cb2c589a658900243f98c5c017b9a638c8 (diff) | |
parent | a0873bf1b76b52de23b784e2c71db8d7cffd85bb (diff) |
merge
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
-rwxr-xr-x | indra/newview/llviewermessage.cpp | 3 |
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; |