From 023644b4bcd41519f21cc350139d97e78254872c Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Fri, 8 Oct 2010 15:31:40 -0700
Subject: [PATCH] STORM-137: Fix windows packaging issue, namely, do not
require a manifest to move the fmod.dll
---
indra/newview/viewer_manifest.py | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 26adc784598..84dd37ead34 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -259,12 +259,6 @@ def construct(self):
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 @@ def construct(self):
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")
--
GitLab