summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorcallum_linden <none@none>2015-12-16 18:09:30 -0800
committercallum_linden <none@none>2015-12-16 18:09:30 -0800
commitdd3b3a4fcae6b144d9ca38e10f01872d2cc3ed6f (patch)
treeed72f9549a13c89f2af5be6e05353de01831fae5 /indra/newview
parent3bf8929d932a6253177be55766cd2a80bb6e224d (diff)
maint-5875 fix llceflib_host.exe' error about missing MSVCP120.dll
Diffstat (limited to 'indra/newview')
-rwxr-xr-xindra/newview/viewer_manifest.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 9a65171d44..f7992dba90 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -471,6 +471,12 @@ class Windows_i686_Manifest(ViewerManifest):
self.path("wow_helper.exe")
self.end_prefix()
+ # MSVC DLLs needed for CEF and have to be in same directory as plugin
+ if self.prefix(src=os.path.join(os.pardir, 'sharedlibs', 'Release'), dst="llplugin"):
+ self.path("msvcp120.dll")
+ self.path("msvcr120.dll")
+ self.end_prefix()
+
# CEF files common to all configurations
if self.prefix(src=os.path.join(os.pardir, 'packages', 'resources'), dst="llplugin"):
self.path("cef.pak")