From 783fa5610649675dc84f5790f9588d73f369fe64 Mon Sep 17 00:00:00 2001 From: Armin Weatherwax Date: Tue, 13 Jul 2010 18:32:20 +0200 Subject: cleanup: removed dead code --- linden/indra/newview/llvoavatar.cpp | 29 +++-------------------------- linden/indra/newview/llvoavatar.h | 2 +- 2 files changed, 4 insertions(+), 27 deletions(-) (limited to 'linden') diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp index 45af378..200b3a6 100644 --- a/linden/indra/newview/llvoavatar.cpp +++ b/linden/indra/newview/llvoavatar.cpp @@ -7171,32 +7171,9 @@ void LLVOAvatar::processRebakeAvatarTextures(LLMessageSystem* msg, void**) } } - -BOOL LLVOAvatar::getLocalTextureRaw(ETextureIndex index, LLImageRaw* image_raw) -{ - if (!isIndexLocalTexture(index)) return FALSE; - - BOOL success = FALSE; - - if (getLocalTextureID(index) == IMG_DEFAULT_AVATAR) - { - success = TRUE; - } - else - { - LocalTextureData &local_tex_data = mLocalTextureData[index]; - if(local_tex_data.mImage->readBackRaw(-1, image_raw, false)) - { - success = TRUE; - } - else - { - // No data loaded yet - setLocalTexture( (ETextureIndex)index, getTEImage( index ), FALSE ); - } - } - return success; -} +// Tombstone for +// BOOL LLVOAvatar::getLocalTextureRaw(ETextureIndex index, LLImageRaw* image_raw) +// its corpse was found in slviewer-src-viewer-1.23.4-r124025 BOOL LLVOAvatar::getLocalTextureGL(ETextureIndex index, LLImageGL** image_gl_pp) { diff --git a/linden/indra/newview/llvoavatar.h b/linden/indra/newview/llvoavatar.h index 1914f47..36ed22a 100644 --- a/linden/indra/newview/llvoavatar.h +++ b/linden/indra/newview/llvoavatar.h @@ -304,7 +304,7 @@ public: LLVOAvatarDefines::ETextureIndex getBakedTE( LLTexLayerSet* layerset ); void updateComposites(); void onGlobalColorChanged( LLTexGlobalColor* global_color, BOOL set_by_user ); - BOOL getLocalTextureRaw( LLVOAvatarDefines::ETextureIndex index, LLImageRaw* image_raw_pp ); +// Removed: BOOL getLocalTextureRaw( LLVOAvatarDefines::ETextureIndex index, LLImageRaw* image_raw_pp ); BOOL getLocalTextureGL( LLVOAvatarDefines::ETextureIndex index, LLImageGL** image_gl_pp ); const LLUUID& getLocalTextureID( LLVOAvatarDefines::ETextureIndex index ); LLGLuint getScratchTexName( LLGLenum format, U32* texture_bytes ); -- cgit v1.1