diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-08-26 12:28:04 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-08-26 12:28:04 +0100 |
| commit | a1d010293d5a72fe31c927cd8fcc5e306cd964b0 (patch) | |
| tree | 86055fe95108185a73c42966063622c3b3a37a19 /indra/newview/viewer_manifest.py | |
| parent | 1d89a80ba7293309fd4fbdd03b802c5c2998aac7 (diff) | |
| parent | 3862dcd51b97b6b5ed3ab6ec2cb8b286773edb6e (diff) | |
re-merge viewer-public. has a rough edge or two, but this is closer to the snowglobe2.1 and viewer2.2 code, and beats people re-applying their viewer-public changes piecemeal while waiting for this to land.
Diffstat (limited to 'indra/newview/viewer_manifest.py')
| -rw-r--r-- | indra/newview/viewer_manifest.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 0eda4007e3..e963bcc9f7 100644 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -251,7 +251,7 @@ class WindowsManifest(ViewerManifest): if self.prefix(src=os.path.join(os.pardir, 'sharedlibs', self.args['configuration']), dst=""): - self.enable_no_crt_manifest_check() + self.enable_crt_manifest_check() # Get kdu dll, continue if missing. try: @@ -259,8 +259,6 @@ class WindowsManifest(ViewerManifest): except RuntimeError: print "Skipping llkdu.dll" - self.enable_crt_manifest_check() - # Get llcommon and deps. If missing assume static linkage and continue. try: self.path('llcommon.dll') |