summaryrefslogtreecommitdiff
path: root/indra/newview/viewer_manifest.py
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2018-11-15 16:02:47 -0500
committerNat Goodspeed <nat@lindenlab.com>2018-11-15 16:02:47 -0500
commitdb2cddf93fd3f39ca0330a8a8b93641377404dd1 (patch)
tree02222a63a646d0d1ce0d9c4a55f78a4da627feb3 /indra/newview/viewer_manifest.py
parentdd9f6784ccc5d285ef50f0b8693ee92bb872d992 (diff)
SL-10010: Use trunk NSIS + Unicode attrib, instead of Unicode fork.
Back out misguided attempt to overwrite $PROGRAMFILES with $PROGRAMFILES64.
Diffstat (limited to 'indra/newview/viewer_manifest.py')
-rwxr-xr-xindra/newview/viewer_manifest.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 3e8bb388d2..32773b2c36 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -830,12 +830,10 @@ class WindowsManifest(ViewerManifest):
):
self.sign(exe)
- # We use the Unicode version of NSIS, available from
- # http://www.scratchpaper.com/
# Check two paths, one for Program Files, and one for Program Files (x86).
# Yay 64bit windows.
for ProgramFiles in 'ProgramFiles', 'ProgramFiles(x86)':
- NSIS_path = os.path.expandvars(r'${%s}\NSIS\Unicode\makensis.exe' % ProgramFiles)
+ NSIS_path = os.path.expandvars(r'${%s}\NSIS\makensis.exe' % ProgramFiles)
if os.path.exists(NSIS_path):
break
installer_created=False