diff options
author | Loren Shih <seraph@lindenlab.com> | 2011-03-16 14:54:56 -0400 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2011-03-16 14:54:56 -0400 |
commit | 037a83cd47e016f70092bccfdb2c13e759c6ff0a (patch) | |
tree | 2183c8ef1364d5f4e784cb91ea4d67b1861b2452 /indra/newview/viewer_manifest.py | |
parent | 15b0509c01dbeec6854f4a0a5965e900eda06de1 (diff) | |
parent | 742dd75751f65224d80eb4f7d20daf5a21776c5f (diff) |
Automated merge up from viewer-development into mesh-development
Diffstat (limited to 'indra/newview/viewer_manifest.py')
-rw-r--r-- | indra/newview/viewer_manifest.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 1a4551d069..2d7a6f7a67 100644 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -345,7 +345,7 @@ class WindowsManifest(ViewerManifest): self.end_prefix() # winmm.dll shim - if self.prefix(src='../media_plugins/winmmshim/%s' % self.args['configuration'], dst="llplugin"): + if self.prefix(src='../media_plugins/winmmshim/%s' % self.args['configuration'], dst=""): self.path("winmm.dll") self.end_prefix() |