aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llvoavatar.cpp
diff options
context:
space:
mode:
authorArmin Weatherwax2010-07-13 18:32:20 +0200
committerMcCabe Maxsted2010-07-15 02:09:38 -0700
commit783fa5610649675dc84f5790f9588d73f369fe64 (patch)
tree7d53ae763185f5787bb15046d59481e46a7fc1ab /linden/indra/newview/llvoavatar.cpp
parentfix bug #283: LM-floater crashes after logout/login on clicking teleport (diff)
downloadmeta-impy-783fa5610649675dc84f5790f9588d73f369fe64.zip
meta-impy-783fa5610649675dc84f5790f9588d73f369fe64.tar.gz
meta-impy-783fa5610649675dc84f5790f9588d73f369fe64.tar.bz2
meta-impy-783fa5610649675dc84f5790f9588d73f369fe64.tar.xz
cleanup: removed dead code
Diffstat (limited to 'linden/indra/newview/llvoavatar.cpp')
-rw-r--r--linden/indra/newview/llvoavatar.cpp29
1 files changed, 3 insertions, 26 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{