From 48631db986f4f16ba6810c4f91844066407d430d Mon Sep 17 00:00:00 2001
From: Nicky <none@none>
Date: Tue, 28 Aug 2012 23:53:16 +0200
Subject: [PATCH] Crashfix; During TP, or shortly after, gAgent.getRegion can
be invalid. Handle that instead of crashing.
---
indra/newview/llwlhandlers.cpp | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/indra/newview/llwlhandlers.cpp b/indra/newview/llwlhandlers.cpp
index 2425b96678d..be3e3ff30e0 100644
--- a/indra/newview/llwlhandlers.cpp
+++ b/indra/newview/llwlhandlers.cpp
@@ -105,10 +105,16 @@ LLEnvironmentRequestResponder::LLEnvironmentRequestResponder()
return;
}
- if (unvalidated_content[0]["regionID"].asUUID() != gAgent.getRegion()->getRegionID())
+ LLUUID regionId;
+ if( gAgent.getRegion() )
+ {
+ regionId = gAgent.getRegion()->getRegionID();
+ }
+
+ if (unvalidated_content[0]["regionID"].asUUID() != regionId )
{
LL_WARNS("WindlightCaps") << "Not in the region from where this data was received (wanting "
- << gAgent.getRegion()->getRegionID() << " but got " << unvalidated_content[0]["regionID"].asUUID()
+ << regionId << " but got " << unvalidated_content[0]["regionID"].asUUID()
<< ") - ignoring..." << LL_ENDL;
return;
}
--
GitLab