summaryrefslogtreecommitdiff
path: root/indra/newview/viewer_manifest.py
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2010-10-15 16:41:30 -0400
committerOz Linden <oz@lindenlab.com>2010-10-15 16:41:30 -0400
commitba2300b8aeff30a64d3f34b0cd5c49aa890e0639 (patch)
treed7a7f4aa61d1b2bd28374e5c61f3d6730d450574 /indra/newview/viewer_manifest.py
parenta8b5da9a70936923e650bd5c200276da49106784 (diff)
parent18321756297bd9b04a4204abe4fbb0e3e8112186 (diff)
pull fix for STORM-211
Diffstat (limited to 'indra/newview/viewer_manifest.py')
-rwxr-xr-x[-rw-r--r--]indra/newview/viewer_manifest.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 648366fa4c..6861f02bfb 100644..100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -271,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")
@@ -315,12 +321,6 @@ class WindowsManifest(ViewerManifest):
# For use in crash reporting (generates minidumps)
self.path("dbghelp.dll")
- try:
- # FMOD for sound
- self.path("fmod.dll")
- except:
- print "Skipping FMOD - not found"
-
self.enable_no_crt_manifest_check()
# Media plugins - QuickTime