integrate patch from VWR-22113 'crash hunters - crash, possibly on exit when disconnected'

1 files changed, 8 insertions, 5 deletions

diff --git a/indra/newview/llagentwearables.cpp b/indra/newview/llagentwearables.cpp
index 4c2caae2c6..5c0c0f398f 100644
--- a/indra/newview/llagentwearables.cpp
+++ b/indra/newview/llagentwearables.cpp
@@ -1619,11 +1619,14 @@ void LLAgentWearables::queryWearableCache()
 
 		gAgentQueryManager.mActiveCacheQueries[baked_index] = gAgentQueryManager.mWearablesCacheQueryID;
 	}
-
-	llinfos << "Requesting texture cache entry for " << num_queries << " baked textures" << llendl;
-	gMessageSystem->sendReliable(gAgent.getRegion()->getHost());
-	gAgentQueryManager.mNumPendingQueries++;
-	gAgentQueryManager.mWearablesCacheQueryID++;
+    //ext-8696: gAgent.getRegion() can return null if invalid, seen here on logout
+    if(gAgent.getRegion())
+    {
+        llinfos << "Requesting texture cache entry for " << num_queries << " baked textures" << llendl;
+        gMessageSystem->sendReliable(gAgent.getRegion()->getHost());
+        gAgentQueryManager.mNumPendingQueries++;
+        gAgentQueryManager.mWearablesCacheQueryID++;
+    }
 }
 
 LLUUID LLAgentWearables::computeBakedTextureHash(LLVOAvatarDefines::EBakedTextureIndex baked_index,