diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-09-04 19:00:49 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-09-04 19:00:49 +0100 |
| commit | a04da8fe752830bb5c810e79292761f056d461e2 (patch) | |
| tree | a77ef5f20cc94ffad81dc2a85634552bba081fab | |
| parent | 19d097efb3a6fba3f810c5cb7174d8a0d5080b2e (diff) | |
integrate patch from VWR-22113 'crash hunters - crash, possibly on exit when disconnected'
| -rw-r--r-- | indra/newview/llagentwearables.cpp | 13 |
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, |