diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2010-07-01 15:38:19 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2010-07-01 15:38:19 -0600 |
| commit | d875b34de0dbc34d5435fe1f87822a70974851d6 (patch) | |
| tree | 54b73e766e55010d3ba5ace29e170ed0cae7cbcc /indra/newview/llwearable.cpp | |
| parent | ddf87b874a0841a65ec95d2d8ed4764412cd394c (diff) | |
| parent | 9fafe9853ad00dea98c39dc4501eedf4b5970207 (diff) | |
Automated merge with ssh://hg.lindenlab.com/q/viewer-release
Diffstat (limited to 'indra/newview/llwearable.cpp')
| -rw-r--r-- | indra/newview/llwearable.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llwearable.cpp b/indra/newview/llwearable.cpp index c74782162b..ec9c78ee53 100644 --- a/indra/newview/llwearable.cpp +++ b/indra/newview/llwearable.cpp @@ -106,7 +106,6 @@ LLWearable::LLWearable(const LLAssetID& asset_id) : LLWearable::~LLWearable() { - LLLoadedCallbackEntry::cleanUpCallbackList(&mCallbackTextureList, this) ; } const std::string& LLWearable::getTypeLabel() const @@ -446,7 +445,7 @@ BOOL LLWearable::importFile( LLFILE* file ) } image->setBoostLevel(LLViewerTexture::BOOST_AVATAR_SELF) ; - image->setLoadedCallback(LLVOAvatarSelf::debugOnTimingLocalTexLoaded,0,TRUE,FALSE, new LLVOAvatarSelf::LLAvatarTexData(id, (LLVOAvatarDefines::ETextureIndex)te), this, &mCallbackTextureList); + image->setLoadedCallback(LLVOAvatarSelf::debugOnTimingLocalTexLoaded,0,TRUE,FALSE, new LLVOAvatarSelf::LLAvatarTexData(id, (LLVOAvatarDefines::ETextureIndex)te), NULL, NULL); LLUUID textureid(text_buffer); mTEMap[te] = new LLLocalTextureObject(image, textureid); |