diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-09-07 10:23:19 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-09-07 10:23:19 -0400 |
| commit | 16031c354ff37462acac4d2dd1effe0af9a8745a (patch) | |
| tree | 0365cac395bc8b97a21a8e3e46b01a0f8d0617e4 /indra/newview/llagentwearables.cpp | |
| parent | 51ecc8208a1b70c9742656230df00b08e082a9c8 (diff) | |
| parent | ebfbaad9696ce0389ed1a9642d58dfb4a0abdc17 (diff) | |
automated merge from viewer-development
Diffstat (limited to 'indra/newview/llagentwearables.cpp')
| -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 816ca61fe8..055be4cae2 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++; + //VWR-22113: 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, |