diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-06-24 18:01:32 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-06-24 18:01:32 -0400 |
| commit | 84f1f65af045746cfa73c7efd68ce960ac47cdf2 (patch) | |
| tree | d04acf2262c9298ba64149c0eb5ec3342a95c4ad /indra/newview/lltexlayer.cpp | |
| parent | 632860484556e156bbe021a4f2d3411899837216 (diff) | |
| parent | 63b3bf29208d51df84f10594266661d6294df4c6 (diff) | |
merge
Diffstat (limited to 'indra/newview/lltexlayer.cpp')
| -rw-r--r-- | indra/newview/lltexlayer.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/lltexlayer.cpp b/indra/newview/lltexlayer.cpp index 5d51e32515..46bd55de43 100644 --- a/indra/newview/lltexlayer.cpp +++ b/indra/newview/lltexlayer.cpp @@ -341,7 +341,8 @@ BOOL LLTexLayerSetBuffer::isReadyToUpload() const { if (!mNeedsUpload) return FALSE; // Don't need to upload if we haven't requested one. if (!gAgentQueryManager.hasNoPendingQueries()) return FALSE; // Can't upload if there are pending queries. - + if (isAgentAvatarValid() && !gAgentAvatarp->isUsingBakedTextures()) return FALSE; // Don't upload if avatar is using composites. + // If we requested an upload and have the final LOD ready, then upload. const BOOL can_highest_lod = mTexLayerSet->isLocalTextureDataFinal(); if (can_highest_lod) return TRUE; |