Second Life viewer sources 1.18.3.2-RC

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,
 // virtual
 BOOL LLPreviewGesture::canClose()
 {
-        if(!mDirty)
+
+        if(!mDirty || mForceClose)
         {
                 return TRUE;
         }
@@ -884,7 +885,7 @@ void LLPreviewGesture::loadAsset()
 void LLPreviewGesture::onLoadComplete(LLVFS *vfs,
                                                                            const LLUUID& asset_uuid,
                                                                            LLAssetType::EType type,
-                                                                           void* user_data, S32 status)
+                                                                           void* user_data, S32 status, LLExtStat ext_status)
 {
         LLUUID* item_idp = (LLUUID*)user_data;
         LLPreview* preview = LLPreview::find(*item_idp);
@@ -1180,7 +1181,7 @@ void LLPreviewGesture::saveIfNeeded()
 // TODO: This is very similar to LLPreviewNotecard::onSaveComplete.
 // Could merge code.
 // static
-void LLPreviewGesture::onSaveComplete(const LLUUID& asset_uuid, void* user_data, S32 status) // StoreAssetData callback (fixed)
+void LLPreviewGesture::onSaveComplete(const LLUUID& asset_uuid, void* user_data, S32 status, LLExtStat ext_status) // StoreAssetData callback (fixed)
 {
         LLSaveInfo* info = (LLSaveInfo*)user_data;
         if (info && (status == 0))