diff options
| author | Oz Linden <oz@lindenlab.com> | 2017-08-24 09:48:04 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2017-08-24 09:48:04 -0400 |
| commit | c662e173ab541ffb497085e55ddfa444ab51cda6 (patch) | |
| tree | 21ef4a0264bb34b80580b135eb51cdf99c64a3f3 /indra | |
| parent | bd08855ec5dfbb5fa1c3d74b9ff49d125c91fd61 (diff) | |
| parent | 40b4cbf2c7601cbc652a14a8973f88f06fca6805 (diff) | |
merge up latest integration repo
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llappearance/llavatarappearancedefines.cpp | 1 | ||||
| -rw-r--r-- | indra/newview/installers/windows/installer_template.nsi | 7 |
2 files changed, 7 insertions, 1 deletions
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; } - 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
|