livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIRE-16469; Upgrade does not install plugins in case a higher version of OpenSSL was installed in the plugin folder.

meow-7.2.2
Nicky 2015-07-14 11:35:32 +02:00
parent 1d2f7cddd1
commit da11bc1cf4
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/installers/windows_x64/firestorm.wxs
View File

@ -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>

6
indra/newview/installers/windows_x64/llplugin.wxs
View File

@ -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" />