From 1d2ded8c5f1893a246fb1b7d7b5f12f451750827 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Thu, 17 Aug 2017 18:48:41 -0400 Subject: MAINT-7661: Make NSIS installer place .winstall marker file. This reduces a timing hole in which one instance of SL_Launcher might place a .winstall marker file in the download directory and run the downloaded installer, but another SL_Launcher instance might discover that marker and try to delete the directory before the NSIS install completes. --- indra/newview/installers/windows/installer_template.nsi | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'indra') diff --git a/indra/newview/installers/windows/installer_template.nsi b/indra/newview/installers/windows/installer_template.nsi index 4ca850e30f..ade808e3e2 100644 --- a/indra/newview/installers/windows/installer_template.nsi +++ b/indra/newview/installers/windows/installer_template.nsi @@ -714,6 +714,13 @@ FunctionEnd ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; Function .onInstSuccess Call CheckWindowsServPack # Warn if not on the latest SP before asking to launch. + ;; $EXEDIR is where we find the installer file + ;; Put a marker file there so VMP will know we're done + ;; and it can delete the download directory next time. + ;; http://nsis.sourceforge.net/Write_text_to_a_file + FileOpen $9 "$EXEDIR\nsis.winstall" w + FileWrite $9 "NSIS done$\n" + FileClose $9 Push $R0 # Option value, unused# StrCmp $SKIP_AUTORUN "true" +2; # Assumes SetOutPath $INSTDIR -- cgit v1.2.3 From 40b4cbf2c7601cbc652a14a8973f88f06fca6805 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Thu, 24 Aug 2017 07:21:23 -0400 Subject: DRTVWR-418: Trivial change to bump the TeamCity build. --- indra/llappearance/llavatarappearancedefines.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'indra') diff --git a/indra/llappearance/llavatarappearancedefines.cpp b/indra/llappearance/llavatarappearancedefines.cpp index f1c78946a1..b5282d4f6f 100644 --- a/indra/llappearance/llavatarappearancedefines.cpp +++ b/indra/llappearance/llavatarappearancedefines.cpp @@ -265,4 +265,3 @@ LLWearableType::EType LLAvatarAppearanceDictionary::getTEWearableType(ETextureIn { return getInstance()->getTexture(index)->mWearableType; } - -- cgit v1.2.3