Merge branch 'weekly' of git://github.com/mccabe/imprudence into weekly

1 files changed, 4 insertions, 7 deletions

diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index 41495ca..6dcd977 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -246,7 +246,9 @@ class WindowsManifest(ViewerManifest):
         #self.path("fmod.dll")
         
         # For spellchecking
-        self.path("libhunspell.dll")
+        if self.prefix(src=self.args['configuration'], dst=""):
+            self.path("libhunspell.dll")
+            self.end_prefix()
 
         # For textures
         if self.prefix(src="../../libraries/i686-win32/lib/release", dst=""):
@@ -268,12 +270,7 @@ class WindowsManifest(ViewerManifest):
         if self.prefix(src='../media_plugins/webkit/%s' % self.args['configuration'], dst="llplugin"):
             self.path("media_plugin_webkit.dll")
             self.end_prefix()
-            
-        # Media plugins - Gstreamer
-        if self.prefix(src='../media_plugins/gstreamer/%s' % self.args['configuration'], dst="llplugin"):
-            self.path("media_plugin_gstreamer010.dll", "media_plugin_gstreamer.dll")
-            self.end_prefix()
-            
+ 
         # For WebKit/Qt plugin runtimes
         if self.prefix(src="../../libraries/i686-win32/lib/release", dst="llplugin"):
             self.path("libeay32.dll")