summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorSimon Linden <simon@lindenlab.com>2011-12-01 16:37:51 -0800
committerSimon Linden <simon@lindenlab.com>2011-12-01 16:37:51 -0800
commitbf24ffd27a6c5ceb94990442c62dc51565330cb8 (patch)
tree780c87687da3b4096eb0ff2830ca74a35335067b /indra/newview
parentf5a94e0f8196c5c068995090cd57bb27e97aaac9 (diff)
ER-1473: fix teleporting in sit mode. Viewer fix - reviewed by Callum
Diffstat (limited to 'indra/newview')
-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;