QAR-1619: At Sam's request, move SLPlugin to viewer executable dir, consistent with Mac and Linux.

1 files changed, 5 insertions, 5 deletions

diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index bb48e8e572..109c437730 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -169,6 +169,11 @@ class WindowsManifest(ViewerManifest):
         # Find secondlife-bin.exe in the 'configuration' dir, then rename it to the result of final_exe.

         self.path(src='%s/secondlife-bin.exe' % self.args['configuration'], dst=self.final_exe())

 

+        # Plugin host application

+        self.path(os.path.join(os.pardir,

+                               'llplugin', 'slplugin', self.args['configuration'], "slplugin.exe"),

+                  "slplugin.exe")

+

         # need to get the llcommon.dll from the build directory as well

         if self.prefix(src=self.args['configuration'], dst=""):

             try:

@@ -206,11 +211,6 @@ class WindowsManifest(ViewerManifest):
                 self.path("openjpeg.dll")

             self.end_prefix()

 

-        # Plugin host application

-        if self.prefix(src='../llplugin/slplugin/%s' % self.args['configuration'], dst="llplugin"):

-            self.path("slplugin.exe")

-            self.end_prefix()

-

         # Media plugins - QuickTime

         if self.prefix(src='../media_plugins/quicktime/%s' % self.args['configuration'], dst="llplugin"):

             self.path("media_plugin_quicktime.dll")