From 3fde4149d821bcd84d5e8b99bcede5aeaa99c968 Mon Sep 17 00:00:00 2001
From: callum_linden <none@none>
Date: Tue, 23 Dec 2014 13:44:29 -0800
Subject: [PATCH] Updated path to NSIS installer for most recent (non-beta)
version of NSIS v2.46
---
indra/newview/viewer_manifest.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index c360fc32ac1..fc6f0c00213 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -604,9 +604,9 @@ def package_finish(self):
# http://www.scratchpaper.com/
# Check two paths, one for Program Files, and one for Program Files (x86).
# Yay 64bit windows.
- NSIS_path = os.path.expandvars('${ProgramFiles}\\NSIS\\Unicode\\makensis.exe')
+ NSIS_path = os.path.expandvars('${ProgramFiles}\\NSIS\\makensis.exe')
if not os.path.exists(NSIS_path):
- NSIS_path = os.path.expandvars('${ProgramFiles(x86)}\\NSIS\\Unicode\\makensis.exe')
+ NSIS_path = os.path.expandvars('${ProgramFiles(x86)}\\NSIS\\makensis.exe')
installer_created=False
nsis_attempts=3
nsis_retry_wait=15
--
GitLab