diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-07-01 16:55:19 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-07-01 16:55:19 -0400 |
| commit | ddf87b874a0841a65ec95d2d8ed4764412cd394c (patch) | |
| tree | 956fedc2cc55b74c3959b9f9c1a8de9c12206178 /indra/newview/llwearable.cpp | |
| parent | 5cda3ccad729f21dee0ea5517be4dcd8304943fe (diff) | |
| parent | eed8e6adc93ed85ce9fe15f946fb4035672f6190 (diff) | |
merge
Diffstat (limited to 'indra/newview/llwearable.cpp')
| -rw-r--r-- | indra/newview/llwearable.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llwearable.cpp b/indra/newview/llwearable.cpp index 2eb233ddd9..c74782162b 100644 --- a/indra/newview/llwearable.cpp +++ b/indra/newview/llwearable.cpp @@ -106,6 +106,7 @@ LLWearable::LLWearable(const LLAssetID& asset_id) : LLWearable::~LLWearable() { + LLLoadedCallbackEntry::cleanUpCallbackList(&mCallbackTextureList, this) ; } const std::string& LLWearable::getTypeLabel() const @@ -444,8 +445,8 @@ BOOL LLWearable::importFile( LLFILE* file ) delete mSavedTEMap[te]; } - image->setLoadedCallback(LLVOAvatarSelf::debugOnTimingLocalTexLoaded,0,TRUE,FALSE, new LLVOAvatarSelf::LLAvatarTexData(id, (LLVOAvatarDefines::ETextureIndex)te)); - + image->setBoostLevel(LLViewerTexture::BOOST_AVATAR_SELF) ; + image->setLoadedCallback(LLVOAvatarSelf::debugOnTimingLocalTexLoaded,0,TRUE,FALSE, new LLVOAvatarSelf::LLAvatarTexData(id, (LLVOAvatarDefines::ETextureIndex)te), this, &mCallbackTextureList); LLUUID textureid(text_buffer); mTEMap[te] = new LLLocalTextureObject(image, textureid); |