diff options
author | Merov Linden <merov@lindenlab.com> | 2010-10-08 15:31:40 -0700 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2010-10-08 15:31:40 -0700 |
commit | 023644b4bcd41519f21cc350139d97e78254872c (patch) | |
tree | 362b18d02ffa7f4e3b5b01dfa413ab74924e2384 | |
parent | 6697a7179ba54df7a654d0065f55b23d62cb5254 (diff) |
STORM-137: Fix windows packaging issue, namely, do not require a manifest to move the fmod.dll
-rwxr-xr-x | indra/newview/viewer_manifest.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 26adc78459..84dd37ead3 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -259,12 +259,6 @@ class WindowsManifest(ViewerManifest): except RuntimeError: print "Skipping llkdu.dll" - # Get fmod dll, continue if missing - try: - self.path("fmod.dll") - except: - print "Skipping fmod.dll" - # Get llcommon and deps. If missing assume static linkage and continue. try: self.path('llcommon.dll') @@ -277,6 +271,12 @@ class WindowsManifest(ViewerManifest): self.disable_manifest_check() + # Get fmod dll, continue if missing + try: + self.path("fmod.dll") + except: + print "Skipping fmod.dll" + # For textures if self.args['configuration'].lower() == 'debug': self.path("openjpegd.dll") |