diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-03-05 10:28:39 -0500 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-03-05 10:28:39 -0500 |
| commit | a4937c0124bcd9226940d047615b5e58447e0b5d (patch) | |
| tree | 8f6d3a9373131d7efbce06b5e7da6eb5f171385d /indra/newview/llagent.cpp | |
| parent | f7ad793e54a0dc4bec53e6ac56b15bb8115620a1 (diff) | |
| parent | 40230fa605302f7328b6de387bdd95f5453f6f0b (diff) | |
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
Diffstat (limited to 'indra/newview/llagent.cpp')
| -rw-r--r-- | indra/newview/llagent.cpp | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index 1da7d450c9..c5d7f6f118 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -5845,15 +5845,22 @@ void LLAgent::processAgentCachedTextureResponse(LLMessageSystem *mesgsys, void * mesgsys->getUUIDFast(_PREHASH_WearableData, _PREHASH_TextureID, texture_id, texture_block); mesgsys->getU8Fast(_PREHASH_WearableData, _PREHASH_TextureIndex, texture_index, texture_block); - if (texture_id.notNull() - && (S32)texture_index < BAKED_NUM_INDICES + if ((S32)texture_index < BAKED_NUM_INDICES && gAgentQueryManager.mActiveCacheQueries[texture_index] == query_id) { - //llinfos << "Received cached texture " << (U32)texture_index << ": " << texture_id << llendl; - avatarp->setCachedBakedTexture(LLVOAvatarDictionary::bakedToLocalTextureIndex((EBakedTextureIndex)texture_index), texture_id); - //avatarp->setTETexture( LLVOAvatar::sBakedTextureIndices[texture_index], texture_id ); - gAgentQueryManager.mActiveCacheQueries[texture_index] = 0; - num_results++; + if (texture_id.notNull()) + { + //llinfos << "Received cached texture " << (U32)texture_index << ": " << texture_id << llendl; + avatarp->setCachedBakedTexture(LLVOAvatarDictionary::bakedToLocalTextureIndex((EBakedTextureIndex)texture_index), texture_id); + //avatarp->setTETexture( LLVOAvatar::sBakedTextureIndices[texture_index], texture_id ); + gAgentQueryManager.mActiveCacheQueries[texture_index] = 0; + num_results++; + } + else + { + // no cache of this bake. request upload. + avatarp->requestLayerSetUpload((EBakedTextureIndex)texture_index); + } } } |