diff options
author | Jacek Antonelli | 2009-06-13 13:17:14 -0500 |
---|---|---|
committer | Jacek Antonelli | 2009-06-13 13:17:20 -0500 |
commit | 0517fe4322443bdc317f8185590a63134e3f8394 (patch) | |
tree | 942c9c26d0792accc928010a113d123c5409659b /linden/indra/newview/lltexlayer.cpp | |
parent | Second Life viewer sources 1.23.2-RC (diff) | |
download | meta-impy-0517fe4322443bdc317f8185590a63134e3f8394.zip meta-impy-0517fe4322443bdc317f8185590a63134e3f8394.tar.gz meta-impy-0517fe4322443bdc317f8185590a63134e3f8394.tar.bz2 meta-impy-0517fe4322443bdc317f8185590a63134e3f8394.tar.xz |
Second Life viewer sources 1.23.3-RC
Diffstat (limited to 'linden/indra/newview/lltexlayer.cpp')
-rw-r--r-- | linden/indra/newview/lltexlayer.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linden/indra/newview/lltexlayer.cpp b/linden/indra/newview/lltexlayer.cpp index b05da8c..424c525 100644 --- a/linden/indra/newview/lltexlayer.cpp +++ b/linden/indra/newview/lltexlayer.cpp | |||
@@ -115,7 +115,7 @@ LLTexLayerSetBuffer::~LLTexLayerSetBuffer() | |||
115 | if( mBumpTex.notNull()) | 115 | if( mBumpTex.notNull()) |
116 | { | 116 | { |
117 | mBumpTex = NULL ; | 117 | mBumpTex = NULL ; |
118 | LLImageGL::sGlobalTextureMemory -= mWidth * mHeight * 4; | 118 | LLImageGL::sGlobalTextureMemoryInBytes -= mWidth * mHeight * 4; |
119 | LLTexLayerSetBuffer::sGLBumpByteCount -= mWidth * mHeight * 4; | 119 | LLTexLayerSetBuffer::sGLBumpByteCount -= mWidth * mHeight * 4; |
120 | } | 120 | } |
121 | } | 121 | } |
@@ -132,7 +132,7 @@ void LLTexLayerSetBuffer::destroyGLTexture() | |||
132 | if( mBumpTex.notNull() ) | 132 | if( mBumpTex.notNull() ) |
133 | { | 133 | { |
134 | mBumpTex = NULL ; | 134 | mBumpTex = NULL ; |
135 | LLImageGL::sGlobalTextureMemory -= mWidth * mHeight * 4; | 135 | LLImageGL::sGlobalTextureMemoryInBytes -= mWidth * mHeight * 4; |
136 | LLTexLayerSetBuffer::sGLBumpByteCount -= mWidth * mHeight * 4; | 136 | LLTexLayerSetBuffer::sGLBumpByteCount -= mWidth * mHeight * 4; |
137 | } | 137 | } |
138 | 138 | ||
@@ -163,7 +163,7 @@ void LLTexLayerSetBuffer::createBumpTexture() | |||
163 | 163 | ||
164 | gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE); | 164 | gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE); |
165 | 165 | ||
166 | LLImageGL::sGlobalTextureMemory += mWidth * mHeight * 4; | 166 | LLImageGL::sGlobalTextureMemoryInBytes += mWidth * mHeight * 4; |
167 | LLTexLayerSetBuffer::sGLBumpByteCount += mWidth * mHeight * 4; | 167 | LLTexLayerSetBuffer::sGLBumpByteCount += mWidth * mHeight * 4; |
168 | } | 168 | } |
169 | } | 169 | } |