summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2018-11-02 08:24:28 -0400
committerNat Goodspeed <nat@lindenlab.com>2018-11-02 08:24:28 -0400
commite7ce166469dafe815ab002be76c6f80acaaff35c (patch)
tree1dcdf5bd8ddc9dd9c0750e7314ed4715b5146ac8
parent559899f1bd4cbdb8627d005379ba29622ace07ba (diff)
DRTVWR-447: Fix NSIS installer icons with "Modern UI" mechanism.
-rw-r--r--indra/newview/installers/windows/installer_template.nsi7
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/installers/windows/installer_template.nsi b/indra/newview/installers/windows/installer_template.nsi
index 219ee2695b..bd290b710b 100644
--- a/indra/newview/installers/windows/installer_template.nsi
+++ b/indra/newview/installers/windows/installer_template.nsi
@@ -80,9 +80,12 @@ Name ${INSTNAME}
SubCaption 0 $(LicenseSubTitleSetup) # Override "license agreement" text
+!define MUI_ICON "%%SOURCE%%\installers\windows\install_icon.ico"
+!define MUI_UNICON "%%SOURCE%%\installers\windows\uninstall_icon.ico"
+
BrandingText " " # Bottom of window text
-Icon %%SOURCE%%\installers\windows\install_icon.ico
-UninstallIcon %%SOURCE%%\installers\windows\uninstall_icon.ico
+Icon "${MUI_ICON}"
+UninstallIcon "${MUI_UNICON}"
WindowIcon on # Show our icon in left corner
BGGradient off # No big background window
CRCCheck on # Make sure CRC is OK