aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview')
-rw-r--r--linden/indra/newview/llvoavatar.cpp29
-rw-r--r--linden/indra/newview/llvoavatar.h2
2 files changed, 4 insertions, 27 deletions
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**)
7171 } 7171 }
7172} 7172}
7173 7173
7174 7174// Tombstone for
7175BOOL LLVOAvatar::getLocalTextureRaw(ETextureIndex index, LLImageRaw* image_raw) 7175// BOOL LLVOAvatar::getLocalTextureRaw(ETextureIndex index, LLImageRaw* image_raw)
7176{ 7176// its corpse was found in slviewer-src-viewer-1.23.4-r124025
7177 if (!isIndexLocalTexture(index)) return FALSE;
7178
7179 BOOL success = FALSE;
7180
7181 if (getLocalTextureID(index) == IMG_DEFAULT_AVATAR)
7182 {
7183 success = TRUE;
7184 }
7185 else
7186 {
7187 LocalTextureData &local_tex_data = mLocalTextureData[index];
7188 if(local_tex_data.mImage->readBackRaw(-1, image_raw, false))
7189 {
7190 success = TRUE;
7191 }
7192 else
7193 {
7194 // No data loaded yet
7195 setLocalTexture( (ETextureIndex)index, getTEImage( index ), FALSE );
7196 }
7197 }
7198 return success;
7199}
7200 7177
7201BOOL LLVOAvatar::getLocalTextureGL(ETextureIndex index, LLImageGL** image_gl_pp) 7178BOOL LLVOAvatar::getLocalTextureGL(ETextureIndex index, LLImageGL** image_gl_pp)
7202{ 7179{
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:
304 LLVOAvatarDefines::ETextureIndex getBakedTE( LLTexLayerSet* layerset ); 304 LLVOAvatarDefines::ETextureIndex getBakedTE( LLTexLayerSet* layerset );
305 void updateComposites(); 305 void updateComposites();
306 void onGlobalColorChanged( LLTexGlobalColor* global_color, BOOL set_by_user ); 306 void onGlobalColorChanged( LLTexGlobalColor* global_color, BOOL set_by_user );
307 BOOL getLocalTextureRaw( LLVOAvatarDefines::ETextureIndex index, LLImageRaw* image_raw_pp ); 307// Removed: BOOL getLocalTextureRaw( LLVOAvatarDefines::ETextureIndex index, LLImageRaw* image_raw_pp );
308 BOOL getLocalTextureGL( LLVOAvatarDefines::ETextureIndex index, LLImageGL** image_gl_pp ); 308 BOOL getLocalTextureGL( LLVOAvatarDefines::ETextureIndex index, LLImageGL** image_gl_pp );
309 const LLUUID& getLocalTextureID( LLVOAvatarDefines::ETextureIndex index ); 309 const LLUUID& getLocalTextureID( LLVOAvatarDefines::ETextureIndex index );
310 LLGLuint getScratchTexName( LLGLenum format, U32* texture_bytes ); 310 LLGLuint getScratchTexName( LLGLenum format, U32* texture_bytes );