diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-11-15 07:34:30 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-11-15 07:34:30 -0500 |
| commit | a9eb639511a09dc072e67e10d8885a0b4f7587da (patch) | |
| tree | 59403ee97fe873b3a6db42c9d6b3676c72b481f7 /indra/newview/llviewermessage.cpp | |
| parent | b2fcba25c8dd04318420af30f877b0984a524055 (diff) | |
| parent | e08250d0874247c7c2c0acb025602e4299244d83 (diff) | |
Automated merge with https://bitbucket.org/vadim_productengine/storm-52
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); |