diff options
| author | Kent Quirk <q@lindenlab.com> | 2010-02-18 20:36:47 -0500 |
|---|---|---|
| committer | Kent Quirk <q@lindenlab.com> | 2010-02-18 20:36:47 -0500 |
| commit | 6b48a59c9994b746a5f1ba2c7d74688ddc6d5215 (patch) | |
| tree | bdec31d68e51269ee3c534e22e922c468d7e032e /indra/newview/lltexlayer.cpp | |
| parent | 2d00beeed20d7fff74252099817776aeba399b42 (diff) | |
| parent | c4b42ca78ff214eef66e9fafa369edd3c4ac08c0 (diff) | |
merge changes from backing out the directory change of default to base
Diffstat (limited to 'indra/newview/lltexlayer.cpp')
| -rw-r--r-- | indra/newview/lltexlayer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lltexlayer.cpp b/indra/newview/lltexlayer.cpp index ddb6405c41..662e6dcabe 100644 --- a/indra/newview/lltexlayer.cpp +++ b/indra/newview/lltexlayer.cpp @@ -167,8 +167,8 @@ void LLTexLayerSetBuffer::popProjection() const BOOL LLTexLayerSetBuffer::needsRender() { const LLVOAvatarSelf* avatar = mTexLayerSet->getAvatar(); - BOOL upload_now = mNeedsUpload && mTexLayerSet->isLocalTextureDataFinal(); - BOOL needs_update = gAgentQueryManager.hasNoPendingQueries() && (mNeedsUpdate || upload_now) && !avatar->mAppearanceAnimating; + BOOL upload_now = mNeedsUpload && mTexLayerSet->isLocalTextureDataFinal() && gAgentQueryManager.hasNoPendingQueries(); + BOOL needs_update = (mNeedsUpdate || upload_now) && !avatar->mAppearanceAnimating; if (needs_update) { BOOL invalid_skirt = avatar->getBakedTE(mTexLayerSet) == LLVOAvatarDefines::TEX_SKIRT_BAKED && !avatar->isWearingWearableType(WT_SKIRT); |