aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llvoavatar.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2009-06-13 13:17:14 -0500
committerJacek Antonelli2009-06-13 13:17:20 -0500
commit0517fe4322443bdc317f8185590a63134e3f8394 (patch)
tree942c9c26d0792accc928010a113d123c5409659b /linden/indra/newview/llvoavatar.cpp
parentSecond Life viewer sources 1.23.2-RC (diff)
downloadmeta-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 '')
-rw-r--r--linden/indra/newview/llvoavatar.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp
index 168b005..6b63730 100644
--- a/linden/indra/newview/llvoavatar.cpp
+++ b/linden/indra/newview/llvoavatar.cpp
@@ -1276,7 +1276,7 @@ void LLVOAvatar::deleteCachedImages(bool clearAll)
1276 1276
1277 sScratchTexNames.deleteAllData(); 1277 sScratchTexNames.deleteAllData();
1278 LLVOAvatar::sScratchTexLastBindTime.deleteAllData(); 1278 LLVOAvatar::sScratchTexLastBindTime.deleteAllData();
1279 LLImageGL::sGlobalTextureMemory -= sScratchTexBytes; 1279 LLImageGL::sGlobalTextureMemoryInBytes -= sScratchTexBytes;
1280 sScratchTexBytes = 0; 1280 sScratchTexBytes = 0;
1281 } 1281 }
1282 1282
@@ -6781,7 +6781,7 @@ LLGLuint LLVOAvatar::getScratchTexName( LLGLenum format, U32* texture_bytes )
6781 LLVOAvatar::sScratchTexNames.addData( format, new LLGLuint( name ) ); 6781 LLVOAvatar::sScratchTexNames.addData( format, new LLGLuint( name ) );
6782 6782
6783 LLVOAvatar::sScratchTexBytes += *texture_bytes; 6783 LLVOAvatar::sScratchTexBytes += *texture_bytes;
6784 LLImageGL::sGlobalTextureMemory += *texture_bytes; 6784 LLImageGL::sGlobalTextureMemoryInBytes += *texture_bytes;
6785 return name; 6785 return name;
6786 } 6786 }
6787} 6787}