diff options
| author | Dessie Linden <dessie@lindenlab.com> | 2010-07-02 07:07:23 -0700 |
|---|---|---|
| committer | Dessie Linden <dessie@lindenlab.com> | 2010-07-02 07:07:23 -0700 |
| commit | ef735d839317c5d8837c3ce9afd66cb576a2ba94 (patch) | |
| tree | 12a993fde38848529cdcdbadbce2d58cc383d7d2 /indra/newview/llpreviewtexture.cpp | |
| parent | 9cef95ca2bf8a7194c6ce80ba744d9c936695e86 (diff) | |
| parent | 1417bd3985f339915f259bf5971ef21e47e30163 (diff) | |
Merged from viewer-release
Diffstat (limited to 'indra/newview/llpreviewtexture.cpp')
| -rw-r--r-- | indra/newview/llpreviewtexture.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llpreviewtexture.cpp b/indra/newview/llpreviewtexture.cpp index 22a1ef94a7..bf18c9e5e7 100644 --- a/indra/newview/llpreviewtexture.cpp +++ b/indra/newview/llpreviewtexture.cpp @@ -87,6 +87,8 @@ LLPreviewTexture::LLPreviewTexture(const LLSD& key) LLPreviewTexture::~LLPreviewTexture() { + LLLoadedCallbackEntry::cleanUpCallbackList(&mCallbackTextureList, this) ; + if( mLoadingFullImage ) { getWindow()->decBusyCount(); @@ -278,7 +280,7 @@ void LLPreviewTexture::saveAs() mLoadingFullImage = TRUE; getWindow()->incBusyCount(); mImage->setLoadedCallback( LLPreviewTexture::onFileLoadedForSave, - 0, TRUE, FALSE, new LLUUID( mItemUUID ) ); + 0, TRUE, FALSE, new LLUUID( mItemUUID ), this, &mCallbackTextureList ); } // virtual |