From 15e30604fc30116ecf6b3ede43c0f994d0d9ebc8 Mon Sep 17 00:00:00 2001
From: Inusaito Sayori <Inusaito@gmail.com>
Date: Wed, 25 Jun 2014 00:12:12 -0400
Subject: [PATCH] Feature Request: Add an option to bypass closing active
 viewers when (un)installing

---
 .../installers/windows/installer_template.nsi |   6 ++++--
 .../newview/installers/windows/lang_en-us.nsi | Bin 7218 -> 7954 bytes
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/indra/newview/installers/windows/installer_template.nsi b/indra/newview/installers/windows/installer_template.nsi
index 1f3c8be57..8399d9f56 100644
--- a/indra/newview/installers/windows/installer_template.nsi
+++ b/indra/newview/installers/windows/installer_template.nsi
@@ -210,7 +210,8 @@ Function CloseSecondLife
   Push $0
   FindWindow $0 "Second Life" ""
   IntCmp $0 0 DONE
-  MessageBox MB_OKCANCEL $(CloseSecondLifeInstMB) IDOK CLOSE IDCANCEL CANCEL_INSTALL
+  MessageBox MB_YESNOCANCEL $(CloseSecondLifeInstMB) IDYES CLOSE IDNO DONE
+  Goto CANCEL_INSTALL ; IDCANCEL
 
   CANCEL_INSTALL:
     Quit
@@ -436,7 +437,8 @@ Function un.CloseSecondLife
   Push $0
   FindWindow $0 "Second Life" ""
   IntCmp $0 0 DONE
-  MessageBox MB_OKCANCEL $(CloseSecondLifeUnInstMB) IDOK CLOSE IDCANCEL CANCEL_UNINSTALL
+  MessageBox MB_YESNOCANCEL $(CloseSecondLifeUnInstMB) IDYES CLOSE IDNO DONE
+  Goto CANCEL_UNINSTALL ; IDCANCEL
 
   CANCEL_UNINSTALL:
     Quit
diff --git a/indra/newview/installers/windows/lang_en-us.nsi b/indra/newview/installers/windows/lang_en-us.nsi
index 331c4a3a38665348c4f650a3bca20924549cca51..9ff4820756075df220da2d38cea8b3d94aa1fdc8 100644
GIT binary patch
delta 733
zcmdT>I|{-;6nrS2Kr!u>3PMW7!bWVh5DN>DU=p(!qHK&}<sHmL#2m`jBRFq2A&QlS
zg)HRlzR%3O$*p%8Tp#t?oJKTF@6F|TOcN5cr!BraQiv<^a9q5PBvA>FOArMrA?`7<
z5v}!9fKEXNWIS|xnD5{{Bu7t3bVt<BJ0&I=!$Hn)d2~2qDAM3gp4>tP0|`wNqvn7%
z)W8WKn6MCL;FQj_&?9M+*I5|Tu+$Qx5YAjKYCg?;G%|n@@wy4S669+6#>Bi2$CLI%
uplZk!_Kk21K|8grZl)Tl@*hUC_IIQBFMe<KCr)YjqHz2thG(`_tvvzsc#S>)

delta 37
ncmbPax5;9|2VrJ^2JgvVh2uBx6P?5a<4oQss<7Ej>I@427H1A0