diff options
author | brad kittenbrink <brad@lindenlab.com> | 2010-11-19 17:47:31 -0800 |
---|---|---|
committer | brad kittenbrink <brad@lindenlab.com> | 2010-11-19 17:47:31 -0800 |
commit | ef07a4b239cb111ec17d7a7a90c161aff9821441 (patch) | |
tree | d76b009b792f9cc5104814e11a1d271061c3a0a6 | |
parent | 7e8929ad535f4be4340ff66978b09ca32b64f4fd (diff) | |
parent | 870773ec17b032164f5dd6711969a6e60778a53b (diff) |
Merge
-rw-r--r-- | indra/newview/viewer_manifest.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 54bf3a5918..1bc118139f 100644 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -247,13 +247,12 @@ class WindowsManifest(ViewerManifest): self.disable_manifest_check() - self.path(src="../viewer_components/updater/scripts/windows/update_install.bat", dst="") + self.path(src="../viewer_components/updater/scripts/windows/update_install.bat", dst="update_install.bat") # Get shared libs from the shared libs staging directory if self.prefix(src=os.path.join(os.pardir, 'sharedlibs', self.args['configuration']), dst=""): - self.enable_crt_manifest_check() # Get kdu dll, continue if missing. |