Minor tweaks to fix up viewer_manifest.

-bad tcmalloc handling indentation
-added nsis path for x64 windows

1 files changed, 4 insertions, 2 deletions

diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 036fa4923f..4ce7c953ed 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -271,8 +271,8 @@ class WindowsManifest(ViewerManifest):
 
         # For google-perftools tcmalloc allocator.
         if self.prefix(src="../../libraries/i686-win32/lib/release", dst=""):
-                self.path("libtcmalloc_minimal.dll")
-                self.end_prefix()
+            self.path("libtcmalloc_minimal.dll")
+            self.end_prefix()
 
 
     def nsi_file_commands(self, install=True):
@@ -395,6 +395,8 @@ class WindowsManifest(ViewerManifest):
         # We use the Unicode version of NSIS, available from
         # http://www.scratchpaper.com/
         NSIS_path = 'C:\\Program Files\\NSIS\\Unicode\\makensis.exe'
+        if not os.path.exists(NSIS_path):
+            NSIS_path = os.path.expandvars('${ProgramFiles(x86)}\\NSIS\\Unicode\\makensis.exe')
         self.run_command('"' + proper_windows_path(NSIS_path) + '" ' + self.dst_path_of(tempfile))
         # self.remove(self.dst_path_of(tempfile))
         # If we're on a build machine, sign the code using our Authenticode certificate. JC