diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2011-01-21 16:25:23 -0700 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2011-01-21 16:25:23 -0700 |
| commit | 4af7e9eb64097c9fdcef86758fc42932d3ccd477 (patch) | |
| tree | 3d4d5300b0c476d8343baad8d28c0809806d5c8b /indra/newview/llpreviewtexture.cpp | |
| parent | bb3be2c07f492577254ae9ace5675eb92d10f061 (diff) | |
| parent | e3f5b66d5a649b061e470bba44fa29a56f7b93b5 (diff) | |
Merge viewer-development-shining up to REV 3bf724ecb7c6 (fix for SH-829: Viewer attempting to load precached images in file types that are not being used.)
Diffstat (limited to 'indra/newview/llpreviewtexture.cpp')
| -rw-r--r-- | indra/newview/llpreviewtexture.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llpreviewtexture.cpp b/indra/newview/llpreviewtexture.cpp index 7657cccd4e..6cfb708112 100644 --- a/indra/newview/llpreviewtexture.cpp +++ b/indra/newview/llpreviewtexture.cpp @@ -273,6 +273,8 @@ void LLPreviewTexture::saveAs() mSaveFileName = file_picker.getFirstFile(); mLoadingFullImage = TRUE; getWindow()->incBusyCount(); + + mImage->forceToSaveRawImage(0) ;//re-fetch the raw image if the old one is removed. mImage->setLoadedCallback( LLPreviewTexture::onFileLoadedForSave, 0, TRUE, FALSE, new LLUUID( mItemUUID ), &mCallbackTextureList ); } |