diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-12-05 10:03:48 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-12-05 10:03:48 -0500 |
| commit | a0873bf1b76b52de23b784e2c71db8d7cffd85bb (patch) | |
| tree | 958c78fade4132eb8ef1336e8abcba5df2f83ea5 | |
| parent | 70b47839f307c22906fd5660923afcacccdb568e (diff) | |
| parent | bf24ffd27a6c5ceb94990442c62dc51565330cb8 (diff) | |
merge
| -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; |