From da11bc1cf4d85ffd16701f2bc49f1bd9a24b7c6a Mon Sep 17 00:00:00 2001
From: Nicky <none@none>
Date: Tue, 14 Jul 2015 11:35:32 +0200
Subject: [PATCH] FIRE-16469; Upgrade does not install plugins in case a higher
 version of OpenSSL was installed in the plugin folder.

---
 indra/newview/installers/windows_x64/firestorm.wxs | 2 ++
 indra/newview/installers/windows_x64/llplugin.wxs  | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/indra/newview/installers/windows_x64/firestorm.wxs b/indra/newview/installers/windows_x64/firestorm.wxs
index 288dad13bc..c4db8c2443 100644
--- a/indra/newview/installers/windows_x64/firestorm.wxs
+++ b/indra/newview/installers/windows_x64/firestorm.wxs
@@ -148,6 +148,8 @@
 
 
   <InstallExecuteSequence>
+	<RemoveExistingProducts After="InstallValidate" />
+
     <Custom Action="ExtractSkins_pre" After="InstallInitialize">Not Installed</Custom>
     <Custom Action="ExtractSkins" Before="InstallFinalize">Not Installed</Custom>
     <Custom Action="DeleteSkins_pre" After="InstallInitialize">REMOVE</Custom>
diff --git a/indra/newview/installers/windows_x64/llplugin.wxs b/indra/newview/installers/windows_x64/llplugin.wxs
index 625a308dd1..ccb2135872 100644
--- a/indra/newview/installers/windows_x64/llplugin.wxs
+++ b/indra/newview/installers/windows_x64/llplugin.wxs
@@ -6,10 +6,10 @@
         <File Source="$(var.PLUGIN_SOURCEDIR)/slplugin.exe" />
        </Component>
        <Directory Id="llplugin_dir" Name="llplugin">
-         <Component Id="llplugin_libs" Guid="{09911740-D305-4b46-AC19-17D366D78F70}">
-           <File Id="llplugin_lib_libeay32" KeyPath="yes" Source="$(var.PLUGIN_SOURCEDIR)\llplugin\libeay32.dll" />
+         <Component Id="llplugin_libs" Guid="{2bc1c2b0-2971-11e5-a2cb-0800200c9a66}">
+		   <File Id="llplugin_lib_libeay32" Source="$(var.PLUGIN_SOURCEDIR)\llplugin\libeay32.dll" />
            <File Id="llplugin_lib_media_plugin_quicktime" Source="$(var.PLUGIN_SOURCEDIR)\llplugin\media_plugin_quicktime.dll" />
-           <File Id="llplugin_lib_media_plugin_webkit" Source="$(var.PLUGIN_SOURCEDIR)\llplugin\media_plugin_webkit.dll" />
+           <File Id="llplugin_lib_media_plugin_webkit" KeyPath="yes" Source="$(var.PLUGIN_SOURCEDIR)\llplugin\media_plugin_webkit.dll" />
            <File Id="llplugin_lib_qtcore4" Source="$(var.PLUGIN_SOURCEDIR)\llplugin\qtcore4.dll" />
            <File Id="llplugin_lib_qtgui4" Source="$(var.PLUGIN_SOURCEDIR)\llplugin\qtgui4.dll" />
            <File Id="llplugin_lib_qtnetwork4" Source="$(var.PLUGIN_SOURCEDIR)\llplugin\qtnetwork4.dll" />