From 49576f8acaf7913a1156c682723df6036cf17de3 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Tue, 24 May 2016 20:59:17 +0200
Subject: [PATCH 1/2] FIRE-19374: Re-apply FIRE-9039: Close notecard after
 choosing "Save" in close confirmation

---
 indra/newview/llpreviewnotecard.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/indra/newview/llpreviewnotecard.cpp b/indra/newview/llpreviewnotecard.cpp
index 9c558b2d4c..641af090d8 100644
--- a/indra/newview/llpreviewnotecard.cpp
+++ b/indra/newview/llpreviewnotecard.cpp
@@ -460,10 +460,14 @@ void LLPreviewNotecard::finishInventoryUpload(LLUUID itemId, LLUUID newAssetId,
         {
             nc->setAssetId(newAssetId);
             nc->refreshFromInventory();
+			// <FS:Ansariel> FIRE-9039: Close notecard after choosing "Save" in close confirmation
+			nc->checkCloseAfterSave();
         }
         else
         {
             nc->refreshFromInventory(newItemId);
+			// <FS:Ansariel> FIRE-9039: Close notecard after choosing "Save" in close confirmation
+			nc->checkCloseAfterSave();
         }
     }
 }

From 003a5613c1bafcd8e2efd492f5215a636c8c900c Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Tue, 24 May 2016 21:05:37 +0200
Subject: [PATCH 2/2] Simplify previous commit

---
 indra/newview/llpreviewnotecard.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/indra/newview/llpreviewnotecard.cpp b/indra/newview/llpreviewnotecard.cpp
index 641af090d8..602d147eb6 100644
--- a/indra/newview/llpreviewnotecard.cpp
+++ b/indra/newview/llpreviewnotecard.cpp
@@ -460,15 +460,13 @@ void LLPreviewNotecard::finishInventoryUpload(LLUUID itemId, LLUUID newAssetId,
         {
             nc->setAssetId(newAssetId);
             nc->refreshFromInventory();
-			// <FS:Ansariel> FIRE-9039: Close notecard after choosing "Save" in close confirmation
-			nc->checkCloseAfterSave();
         }
         else
         {
             nc->refreshFromInventory(newItemId);
-			// <FS:Ansariel> FIRE-9039: Close notecard after choosing "Save" in close confirmation
-			nc->checkCloseAfterSave();
         }
+		// <FS:Ansariel> FIRE-9039: Close notecard after choosing "Save" in close confirmation
+		nc->checkCloseAfterSave();
     }
 }