summaryrefslogtreecommitdiff
path: root/indra/newview/viewer_manifest.py
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2010-10-15 16:38:42 -0400
committerOz Linden <oz@lindenlab.com>2010-10-15 16:38:42 -0400
commitdd69516213fdf20cbc254214e651c4df26afbff7 (patch)
treee880c4e88c1ca721dcec028534fc528eda72995c /indra/newview/viewer_manifest.py
parent69ae08acc949789daeff2c214eb569082e171fa9 (diff)
parent068e3cc469793c75b0d54ef0864388582bb3b63c (diff)
pull fix for STORM-376
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