diff options
| author | Callum Prentice <callum@gmail.com> | 2017-03-14 12:40:25 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@gmail.com> | 2017-03-14 12:40:25 -0700 |
| commit | c1f7c00869653e50a6599cc80ab755a773fadbff (patch) | |
| tree | 6d0ee77a196ed0773660d61f1403e52f1606f692 /indra | |
| parent | 062c345556ef74d33f6cdcaaae513211ced7c410 (diff) | |
SL-641 - Update CEF -> cef-bin -> Dullahan -> p64_3p-Dullahan -> media_plugin_cef.cpp to latest versionPull in p64_3p-dullahan that has the cef 2897/chrome 57
Diffstat (limited to 'indra')
| -rwxr-xr-x | indra/newview/viewer_manifest.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 743df609aa..3dd44fb19e 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -442,6 +442,7 @@ class WindowsManifest(ViewerManifest): # CEF runtime files - debug if self.args['configuration'].lower() == 'debug': if self.prefix(src=os.path.join(os.pardir, 'packages', 'bin', 'debug'), dst="llplugin"): + self.path("chrome_elf.dll") self.path("d3dcompiler_43.dll") self.path("d3dcompiler_47.dll") self.path("libcef.dll") @@ -455,6 +456,7 @@ class WindowsManifest(ViewerManifest): else: # CEF runtime files - not debug (release, relwithdebinfo etc.) if self.prefix(src=os.path.join(os.pardir, 'packages', 'bin', 'release'), dst="llplugin"): + self.path("chrome_elf.dll") self.path("d3dcompiler_43.dll") self.path("d3dcompiler_47.dll") self.path("libcef.dll") |