diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-09-08 23:06:01 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-09-08 23:06:01 -0700 |
| commit | 657f75b89de4cfd5ade82e3bc30e236cd2533017 (patch) | |
| tree | 09d6b1bcf6a89795dfa1bf5b8acaa1de77344ee3 /indra/newview/llagentwearables.cpp | |
| parent | 39e5d2ecf04deceda92d6a53413298ca1c3bc0c7 (diff) | |
| parent | a2fb3fabc7926dd105393391f334baa78f232640 (diff) | |
Pull from lindenlab/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 4c2caae2c6..dd08e6c49a 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, |