summaryrefslogtreecommitdiff
path: root/indra/newview/lltexlayerparams.cpp
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2009-09-30 21:44:20 -0400
committerNat Goodspeed <nat@lindenlab.com>2009-09-30 21:44:20 -0400
commit57969e41db06cbc5c0f9ffdeafb7c21e55b2731d (patch)
treeea54edd04380696ef3f83671204fdae2f7ae298e /indra/newview/lltexlayerparams.cpp
parentc4c537e957458650a2948ffbd3a787f007d87f7a (diff)
parenteca30a22626b9a3e68e0e55f8da75614cd60d713 (diff)
Automated merge with ssh://hg.lindenlab.com/viewer/login-api/
Diffstat (limited to 'indra/newview/lltexlayerparams.cpp')
-rw-r--r--indra/newview/lltexlayerparams.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lltexlayerparams.cpp b/indra/newview/lltexlayerparams.cpp
index c9117a84a5..7a1ee95a65 100644
--- a/indra/newview/lltexlayerparams.cpp
+++ b/indra/newview/lltexlayerparams.cpp
@@ -94,7 +94,7 @@ void LLTexLayerParamAlpha::getCacheByteCount(S32* gl_bytes)
{
S32 bytes = (S32)tex->getWidth() * tex->getHeight() * tex->getComponents();
- if (tex->hasValidGLTexture())
+ if (tex->hasGLTexture())
{
*gl_bytes += bytes;
}