Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add back the ability to install while a separate instance of the viewer is running.

Browse Source
This commit is contained in:
Lirusaito
2016-02-14 22:22:26 -05:00
parent bf9899a99b
commit 731e907653
2 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
indra/newview/installers/windows/installer_template.nsi
View File

@@ -320,10 +320,8 @@ Function CloseSecondLife
IntCmp $0 0 DONE IntCmp $0 0 DONE
StrCmp $SKIP_DIALOGS "true" CLOSE StrCmp $SKIP_DIALOGS "true" CLOSE
MessageBox MB_OKCANCEL $(CloseSecondLifeInstMB) IDOK CLOSE IDCANCEL CANCEL_INSTALL MessageBox MB_YESNOCANCEL $(CloseSecondLifeInstMB) IDYES CLOSE IDNO DONE
Quit
CANCEL_INSTALL:
Quit
CLOSE: CLOSE:
DetailPrint $(CloseSecondLifeInstDP) DetailPrint $(CloseSecondLifeInstDP)
@@ -348,10 +346,8 @@ Function un.CloseSecondLife
Push $0 Push $0
FindWindow $0 "Second Life" "" FindWindow $0 "Second Life" ""
IntCmp $0 0 DONE IntCmp $0 0 DONE
MessageBox MB_OKCANCEL $(CloseSecondLifeUnInstMB) IDOK CLOSE IDCANCEL CANCEL_UNINSTALL MessageBox MB_YESNOCANCEL $(CloseSecondLifeUnInstMB) IDYES CLOSE IDNO DONE
Quit
CANCEL_UNINSTALL:
Quit
CLOSE: CLOSE:
DetailPrint $(CloseSecondLifeUnInstDP) DetailPrint $(CloseSecondLifeUnInstDP)

4
indra/newview/installers/windows/lang_en-us.nsi
View File

@@ -37,11 +37,11 @@ LangString MissingSSE2 ${LANG_ENGLISH} "This machine may not have a CPU with SSE
; closesecondlife function (install) ; closesecondlife function (install)
LangString CloseSecondLifeInstDP ${LANG_ENGLISH} "Waiting for ${APPNAME} to shut down..." 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) ; closesecondlife function (uninstall)
LangString CloseSecondLifeUnInstDP ${LANG_ENGLISH} "Waiting for ${APPNAME} to shut down..." 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 ; CheckNetworkConnection
LangString CheckNetworkConnectionDP ${LANG_ENGLISH} "Checking network connection..." LangString CheckNetworkConnectionDP ${LANG_ENGLISH} "Checking network connection..."