summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorcallum_linden <none@none>2014-12-23 13:44:29 -0800
committercallum_linden <none@none>2014-12-23 13:44:29 -0800
commit3fde4149d821bcd84d5e8b99bcede5aeaa99c968 (patch)
tree15572951e8a6cd259dc395bc9904a214104643a8 /indra
parentcdfd470f2e8a03b976d8562c8c7f597c2f0233c0 (diff)
Updated path to NSIS installer for most recent (non-beta) version of NSIS v2.46
Diffstat (limited to 'indra')
-rwxr-xr-xindra/newview/viewer_manifest.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index c360fc32ac..fc6f0c0021 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -604,9 +604,9 @@ class Windows_i686_Manifest(ViewerManifest):
# 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