From 1c393aed78753093e77fd5ca595d4e6108cf858c Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com>
Date: Thu, 23 Oct 2025 15:38:13 +0300
Subject: #4884 Crash at resetRegionCrossingTimer

---
 indra/newview/llviewermessage.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'indra/newview/llviewermessage.cpp')

diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 16b7ac33b8..e9f6d7175e 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -3139,7 +3139,10 @@ void process_crossed_region(LLMessageSystem* msg, void**)
         return;
     }
     LL_INFOS("Messaging") << "process_crossed_region()" << LL_ENDL;
-    gAgentAvatarp->resetRegionCrossingTimer();
+    if (isAgentAvatarValid())
+    {
+        gAgentAvatarp->resetRegionCrossingTimer();
+    }
 
     U32 sim_ip;
     msg->getIPAddrFast(_PREHASH_RegionData, _PREHASH_SimIP, sim_ip);
-- 
cgit v1.2.3