Feature Request: Add an option to bypass closing active viewers when (un)installing

2014-06-25 00:12:12 -04:00
parent dbc7c6e74d
commit 15e30604fc
2 changed files with 4 additions and 2 deletions
--- 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
--- a/indra/newview/installers/windows/lang_en-us.nsi
+++ b/indra/newview/installers/windows/lang_en-us.nsi