diff options
| author | David Parks <davep@lindenlab.com> | 2009-09-22 11:11:45 +0000 |
|---|---|---|
| committer | David Parks <davep@lindenlab.com> | 2009-09-22 11:11:45 +0000 |
| commit | 536e38ad51b89808f26d8e3cd107fe093862d22a (patch) | |
| tree | 230159ae9e319f5c419f1a643177b2bbb17d52c5 /indra/newview/llvoavatarself.cpp | |
| parent | 760adead96e62cab8f9cdacc6469773a87dfbc1a (diff) | |
Merging render-pipeline-6-qa-2 into viewer-2
Self reviewed.
Diffstat (limited to 'indra/newview/llvoavatarself.cpp')
| -rw-r--r-- | indra/newview/llvoavatarself.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp index a7b5b60842..dfc82ea8d5 100644 --- a/indra/newview/llvoavatarself.cpp +++ b/indra/newview/llvoavatarself.cpp @@ -1331,7 +1331,7 @@ void LLVOAvatarSelf::getLocalTextureByteCount(S32* gl_bytes) const { S32 bytes = (S32)image_gl->getWidth() * image_gl->getHeight() * image_gl->getComponents(); - if (image_gl->hasValidGLTexture()) + if (image_gl->hasGLTexture()) { *gl_bytes += bytes; } @@ -1539,7 +1539,7 @@ BOOL LLVOAvatarSelf::updateIsFullyLoaded() // Check for the case that texture is defined but not sufficiently loaded to display anything. LLViewerTexture* baked_img = getImage( texture_data.mTextureIndex ); - if (!baked_img || !baked_img->hasValidGLTexture()) + if (!baked_img || !baked_img->hasGLTexture()) { loading = TRUE; } |