diff options
| author | Callum Prentice <callum@lindenlab.com> | 2014-03-17 15:50:06 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2014-03-17 15:50:06 -0700 |
| commit | d1499e5253cdc1f9b3c40765f80c000fa2e07a28 (patch) | |
| tree | 4407ad45783d7d9697ba0b2abd6937c7f4d3b88c /indra/newview | |
| parent | f232096bba9280dd78ef378612eeb65ae2814307 (diff) | |
WENG-1470 (Partial) Secondlife Login Screen Redesign - auto merge messed up a python script somehow.
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/viewer_manifest.py | 2 |
1 files changed, 1 insertions, 1 deletions
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: |