summaryrefslogtreecommitdiff
path: root/indra/newview/viewer_manifest.py
diff options
context:
space:
mode:
authorRichard Nelson <none@none>2010-04-27 09:41:33 -0700
committerRichard Nelson <none@none>2010-04-27 09:41:33 -0700
commitbd08f1989461b8b81ed04df6f8dc2097862a20e8 (patch)
tree491873fa21a9da11d812e4e98410890407ce289e /indra/newview/viewer_manifest.py
parent3a7490e492b35d5dc55f6124d2e1acbca3bd4d79 (diff)
EXT-6921 - Windows Xp/Vista unified volume control
Diffstat (limited to 'indra/newview/viewer_manifest.py')
-rwxr-xr-xindra/newview/viewer_manifest.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 18ac10fe38..25509f6173 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -332,6 +332,12 @@ class WindowsManifest(ViewerManifest):
self.path("media_plugin_webkit.dll")
self.end_prefix()
+ # winmm.dll shim
+ if self.prefix(src='../media_plugins/winmmshim/%s' % self.args['configuration'], dst="llplugin"):
+ self.path("winmm.dll")
+ self.end_prefix()
+
+
if self.args['configuration'].lower() == 'debug':
if self.prefix(src=os.path.join(os.pardir, os.pardir, 'libraries', 'i686-win32', 'lib', 'debug'),
dst="llplugin"):