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

Point to LLCEFLib with updated 2357 version and support for setting language for embedded browser

master
callum_linden 2015-07-16 16:11:19 -07:00
parent af54cd28db
commit 0d6d281cb3
3 changed files with 607 additions and 598 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
autobuild.xml
View File

@ -1550,18 +1550,18 @@
<key>archive</key>
<map>
<key>hash</key>
<string>d3532a19f33ba42cfcfc14a3889134ef</string>
<string>bae64d0e6d787daa6299079351ceacf8</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/llceflib_3p-llceflib/rev/303597/arch/CYGWIN/installer/llceflib-1.0.0.CEF-WIN-3.2272.gbda8dc7-32.303597-windows-303597.tar.bz2</string>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/llceflib_3p-llceflib/rev/303625/arch/CYGWIN/installer/llceflib-1.0.0.303625-windows-303625.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
</map>
</map>
<key>version</key>
<string>1.0.0.CEF-WIN-3.2272.gbda8dc7-32.303597</string>
<string>1.0.0.303625</string>
</map>
<key>llphysicsextensions_source</key>
<map>

1193
indra/media_plugins/cef/media_plugin_cef.cpp
View File

File diff suppressed because it is too large Load Diff

6
indra/newview/viewer_manifest.py
View File

@ -452,7 +452,8 @@ class Windows_i686_Manifest(ViewerManifest):
self.path("libEGL.dll")
self.path("libGLESv2.dll")
self.path("llceflib_host.exe")
self.path("pdf.dll")
self.path("natives_blob.bin")
self.path("snapshot_blob.bin")
self.path("wow_helper.exe")
self.end_prefix()
else:
@ -465,7 +466,8 @@ class Windows_i686_Manifest(ViewerManifest):
self.path("libEGL.dll")
self.path("libGLESv2.dll")
self.path("llceflib_host.exe")
self.path("pdf.dll")
self.path("natives_blob.bin")
self.path("snapshot_blob.bin")
self.path("wow_helper.exe")
self.end_prefix()