diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-11-15 07:27:50 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-11-15 07:27:50 -0500 |
| commit | 0cd40b4409b237093a771b28933ac2a33fa9f266 (patch) | |
| tree | 6aec2ccf66265722f4cb6f16774b54a7fa3eca49 /indra/newview/llviewermessage.cpp | |
| parent | ef46e7037ca59224dfcdf3745e165ee97b086a69 (diff) | |
| parent | 5cbbb565f1bba870ec6db0b266e8768ecbdb7826 (diff) | |
merge fix for STORM-579
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 1 |
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); |