summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermessage.cpp
diff options
context:
space:
mode:
authorDave SIMmONs <simon@lindenlab.com>2010-11-12 16:59:43 -0800
committerDave SIMmONs <simon@lindenlab.com>2010-11-12 16:59:43 -0800
commit5cbbb565f1bba870ec6db0b266e8768ecbdb7826 (patch)
treefd00c91dc7a90fe4de3b52ce07548e1e4ef1e960 /indra/newview/llviewermessage.cpp
parent4839e79b20679560f697af96c11db4aef7e1d740 (diff)
parent187b21e6d22204e8989b1c7d5e75f8b7880dd79f (diff)
Merge simon_linden/viewer-dev to get avatar motion prediction code.
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
-rw-r--r--indra/newview/llviewermessage.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 0ca30d5f3d..7c0fc681a4 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -3866,6 +3866,7 @@ void process_crossed_region(LLMessageSystem* msg, void**)
return;
}
LL_INFOS("Messaging") << "process_crossed_region()" << LL_ENDL;
+ gAgentAvatarp->resetRegionCrossingTimer();
U32 sim_ip;
msg->getIPAddrFast(_PREHASH_RegionData, _PREHASH_SimIP, sim_ip);