From 731e907653d44febc1fe746ffafc1b12c6b025ab Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Sun, 14 Feb 2016 22:22:26 -0500
Subject: [PATCH] Add back the ability to install while a separate instance of
 the viewer is running.

---
 .../installers/windows/installer_template.nsi        | 12 ++++--------
 indra/newview/installers/windows/lang_en-us.nsi      |  4 ++--
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/indra/newview/installers/windows/installer_template.nsi b/indra/newview/installers/windows/installer_template.nsi
index d2b683109..74ee4a7c3 100644
--- a/indra/newview/installers/windows/installer_template.nsi
+++ b/indra/newview/installers/windows/installer_template.nsi
@@ -320,10 +320,8 @@ Function CloseSecondLife
   IntCmp $0 0 DONE
   
   StrCmp $SKIP_DIALOGS "true" CLOSE
-    MessageBox MB_OKCANCEL $(CloseSecondLifeInstMB) IDOK CLOSE IDCANCEL CANCEL_INSTALL
-
-  CANCEL_INSTALL:
-    Quit
+    MessageBox MB_YESNOCANCEL $(CloseSecondLifeInstMB) IDYES CLOSE IDNO DONE
+  Quit
 
   CLOSE:
     DetailPrint $(CloseSecondLifeInstDP)
@@ -348,10 +346,8 @@ Function un.CloseSecondLife
   Push $0
   FindWindow $0 "Second Life" ""
   IntCmp $0 0 DONE
-  MessageBox MB_OKCANCEL $(CloseSecondLifeUnInstMB) IDOK CLOSE IDCANCEL CANCEL_UNINSTALL
-
-  CANCEL_UNINSTALL:
-    Quit
+  MessageBox MB_YESNOCANCEL $(CloseSecondLifeUnInstMB) IDYES CLOSE IDNO DONE
+  Quit
 
   CLOSE:
     DetailPrint $(CloseSecondLifeUnInstDP)
diff --git a/indra/newview/installers/windows/lang_en-us.nsi b/indra/newview/installers/windows/lang_en-us.nsi
index b83a35cdb..9b0b64a7a 100644
--- a/indra/newview/installers/windows/lang_en-us.nsi
+++ b/indra/newview/installers/windows/lang_en-us.nsi
@@ -37,11 +37,11 @@ LangString MissingSSE2 ${LANG_ENGLISH} "This machine may not have a CPU with SSE
 
 ; closesecondlife function (install)
 LangString CloseSecondLifeInstDP ${LANG_ENGLISH} "Waiting for ${APPNAME} to shut down..."
-LangString CloseSecondLifeInstMB ${LANG_ENGLISH} "${APPNAME} can't be installed while it is already running.$\n$\nFinish what you're doing then select OK to close ${APPNAME} and continue.$\nSelect CANCEL to cancel installation."
+LangString CloseSecondLifeInstMB ${LANG_ENGLISH} "${APPNAME} can't be installed while it is already running.$\n$\nFinish what you're doing then select OK to close ${APPNAME} and continue.$\nSelect NO to proceed without closing the viewer, Caution: this can prevent a proper install, use with care (like when installing a different viewer than the one you are running).$\nSelect CANCEL to cancel installation."
 
 ; closesecondlife function (uninstall)
 LangString CloseSecondLifeUnInstDP ${LANG_ENGLISH} "Waiting for ${APPNAME} to shut down..."
-LangString CloseSecondLifeUnInstMB ${LANG_ENGLISH} "${APPNAME} can't be uninstalled while it is already running.$\n$\nFinish what you're doing then select OK to close ${APPNAME} and continue.$\nSelect CANCEL to cancel."
+LangString CloseSecondLifeUnInstMB ${LANG_ENGLISH} "${APPNAME} can't be uninstalled while it is already running.$\n$\nFinish what you're doing then select OK to close ${APPNAME} and continue.$\nSelect NO to proceed without closing the viewer, Caution: this can prevent a proper uninstall, use with care (like when uninstalling a different viewer than the one you are running).$\nSelect CANCEL to cancel."
 
 ; CheckNetworkConnection
 LangString CheckNetworkConnectionDP ${LANG_ENGLISH} "Checking network connection..."