diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-06-08 10:15:42 +0100 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-06-08 10:15:42 +0100 |
commit | a62287c2b0c94a8142818a5c3348c5f55b722614 (patch) | |
tree | 06134e447ea2e0bce2367dad22528bd3380fcd66 /indra/newview/llvoavatarself.cpp | |
parent | 4bc6b01e0ef845f3f8d5e7f4c46280c6a753d135 (diff) | |
parent | 25db70c7621a910903e150dbcf995307b8aef9da (diff) |
merge
Diffstat (limited to 'indra/newview/llvoavatarself.cpp')
-rw-r--r-- | indra/newview/llvoavatarself.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp index 2722646eff..eae92f8992 100644 --- a/indra/newview/llvoavatarself.cpp +++ b/indra/newview/llvoavatarself.cpp @@ -1336,7 +1336,7 @@ BOOL LLVOAvatarSelf::isBakedTextureFinal(const LLVOAvatarDefines::EBakedTextureI if (!layerset) return FALSE; const LLTexLayerSetBuffer *layerset_buffer = layerset->getComposite(); if (!layerset_buffer) return FALSE; - return !layerset_buffer->uploadPending(); + return !layerset_buffer->uploadNeeded(); } BOOL LLVOAvatarSelf::isTextureDefined(LLVOAvatarDefines::ETextureIndex type, U32 index) const |