diff options
Diffstat (limited to 'linden/indra/newview/llpreviewgesture.cpp')
-rw-r--r-- | linden/indra/newview/llpreviewgesture.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/linden/indra/newview/llpreviewgesture.cpp b/linden/indra/newview/llpreviewgesture.cpp index 23e6aa5..1afa523 100644 --- a/linden/indra/newview/llpreviewgesture.cpp +++ b/linden/indra/newview/llpreviewgesture.cpp | |||
@@ -266,7 +266,8 @@ BOOL LLPreviewGesture::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, | |||
266 | // virtual | 266 | // virtual |
267 | BOOL LLPreviewGesture::canClose() | 267 | BOOL LLPreviewGesture::canClose() |
268 | { | 268 | { |
269 | if(!mDirty) | 269 | |
270 | if(!mDirty || mForceClose) | ||
270 | { | 271 | { |
271 | return TRUE; | 272 | return TRUE; |
272 | } | 273 | } |
@@ -884,7 +885,7 @@ void LLPreviewGesture::loadAsset() | |||
884 | void LLPreviewGesture::onLoadComplete(LLVFS *vfs, | 885 | void LLPreviewGesture::onLoadComplete(LLVFS *vfs, |
885 | const LLUUID& asset_uuid, | 886 | const LLUUID& asset_uuid, |
886 | LLAssetType::EType type, | 887 | LLAssetType::EType type, |
887 | void* user_data, S32 status) | 888 | void* user_data, S32 status, LLExtStat ext_status) |
888 | { | 889 | { |
889 | LLUUID* item_idp = (LLUUID*)user_data; | 890 | LLUUID* item_idp = (LLUUID*)user_data; |
890 | LLPreview* preview = LLPreview::find(*item_idp); | 891 | LLPreview* preview = LLPreview::find(*item_idp); |
@@ -1180,7 +1181,7 @@ void LLPreviewGesture::saveIfNeeded() | |||
1180 | // TODO: This is very similar to LLPreviewNotecard::onSaveComplete. | 1181 | // TODO: This is very similar to LLPreviewNotecard::onSaveComplete. |
1181 | // Could merge code. | 1182 | // Could merge code. |
1182 | // static | 1183 | // static |
1183 | void LLPreviewGesture::onSaveComplete(const LLUUID& asset_uuid, void* user_data, S32 status) // StoreAssetData callback (fixed) | 1184 | void LLPreviewGesture::onSaveComplete(const LLUUID& asset_uuid, void* user_data, S32 status, LLExtStat ext_status) // StoreAssetData callback (fixed) |
1184 | { | 1185 | { |
1185 | LLSaveInfo* info = (LLSaveInfo*)user_data; | 1186 | LLSaveInfo* info = (LLSaveInfo*)user_data; |
1186 | if (info && (status == 0)) | 1187 | if (info && (status == 0)) |