From e188badaf29a1a02307f93864eed6737096bd9a1 Mon Sep 17 00:00:00 2001 From: Adam Moss Date: Tue, 3 Feb 2009 17:56:26 +0000 Subject: QAR-1177 maint-viewer-12 + uploadfees-viewer combo mergeme svn merge -r108355:109316 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/maint-viewer-12-uploadfees-qa108314 Whew. --- indra/newview/installers/windows/install_icon.BMP | Bin 0 -> 262198 bytes indra/newview/installers/windows/install_icon.ico | Bin 0 -> 25214 bytes .../newview/installers/windows/installer_template.nsi | 4 ++-- indra/newview/installers/windows/uninstall_icon.BMP | Bin 0 -> 262198 bytes indra/newview/installers/windows/uninstall_icon.ico | Bin 0 -> 25214 bytes 5 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 indra/newview/installers/windows/install_icon.BMP create mode 100644 indra/newview/installers/windows/install_icon.ico create mode 100644 indra/newview/installers/windows/uninstall_icon.BMP create mode 100644 indra/newview/installers/windows/uninstall_icon.ico (limited to 'indra/newview/installers') diff --git a/indra/newview/installers/windows/install_icon.BMP b/indra/newview/installers/windows/install_icon.BMP new file mode 100644 index 0000000000..09df573870 Binary files /dev/null and b/indra/newview/installers/windows/install_icon.BMP differ diff --git a/indra/newview/installers/windows/install_icon.ico b/indra/newview/installers/windows/install_icon.ico new file mode 100644 index 0000000000..1e00530c90 Binary files /dev/null and b/indra/newview/installers/windows/install_icon.ico differ diff --git a/indra/newview/installers/windows/installer_template.nsi b/indra/newview/installers/windows/installer_template.nsi index 0a68d6badc..483568f974 100644 --- a/indra/newview/installers/windows/installer_template.nsi +++ b/indra/newview/installers/windows/installer_template.nsi @@ -68,8 +68,8 @@ Name ${INSTNAME} SubCaption 0 $(LicenseSubTitleSetup) ; override "license agreement" text BrandingText " " ; bottom of window text -Icon %%SOURCE%%\res\install_icon.ico ; our custom icon -UninstallIcon %%SOURCE%%\res\uninstall_icon.ico ; our custom icon +Icon %%SOURCE%%\installers\windows\install_icon.ico +UninstallIcon %%SOURCE%%\installers\windows\uninstall_icon.ico WindowIcon on ; show our icon in left corner BGGradient off ; no big background window CRCCheck on ; make sure CRC is OK diff --git a/indra/newview/installers/windows/uninstall_icon.BMP b/indra/newview/installers/windows/uninstall_icon.BMP new file mode 100644 index 0000000000..562b56676a Binary files /dev/null and b/indra/newview/installers/windows/uninstall_icon.BMP differ diff --git a/indra/newview/installers/windows/uninstall_icon.ico b/indra/newview/installers/windows/uninstall_icon.ico new file mode 100644 index 0000000000..c4ec6c70bd Binary files /dev/null and b/indra/newview/installers/windows/uninstall_icon.ico differ -- cgit v1.2.3