From d1499e5253cdc1f9b3c40765f80c000fa2e07a28 Mon Sep 17 00:00:00 2001 From: Callum Prentice Date: Mon, 17 Mar 2014 15:50:06 -0700 Subject: WENG-1470 (Partial) Secondlife Login Screen Redesign - auto merge messed up a python script somehow. --- indra/newview/viewer_manifest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra') diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index c331fa2c6c..fe0774b409 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -628,7 +628,7 @@ class Windows_i686_Manifest(ViewerManifest): while (not installer_created) and (nsis_attempts > 0): try: nsis_attempts-=1; - self.run_command('"' + proper_windows_path(NSIS_path) + '" ' + self.dst_path_of(tempfile)) + self.run_command('"' + proper_windows_path(NSIS_path) + '" ' + self.dst_path_of(tempfile)) installer_created=True # if no exception was raised, the codesign worked except ManifestError, err: if nsis_attempts: -- cgit v1.2.3