Point to new third party llcef package and fix typo in interface

3 files changed, 10 insertions, 9 deletions

diff --git a/autobuild.xml b/autobuild.xml
index 63cd761a8f..3c0e35f681 100755
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1536,11 +1536,11 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>a2fad3f3b7a414fe75e13e242f897ede</string>
+              <string>84008a5652228d7ce89ebc31c2b08347</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/305214/arch/Darwin/installer/llceflib-1.0.1.305214-darwin-305214.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/llceflib_3p-llceflib/rev/305469/arch/Darwin/installer/llceflib-1.1.0.305469-darwin-305469.tar.bz2</string>
             </map>
             <key>name</key>
             <string>darwin</string>
@@ -1550,18 +1550,18 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>32ab846d7848aad28cac71d5543bad8c</string>
+              <string>254db281a410be2e25511f25e9b56c15</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/305320/arch/CYGWIN/installer/llceflib-1.1.0.305320-windows-305320.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/llceflib_3p-llceflib/rev/305469/arch/CYGWIN/installer/llceflib-1.1.0.305469-windows-305469.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows</string>
           </map>
         </map>
         <key>version</key>
-        <string>1.1.0.305320</string>
+        <string>1.1.0.305469</string>
       </map>
       <key>llphysicsextensions_source</key>
       <map>
diff --git a/indra/media_plugins/cef/media_plugin_cef.cpp b/indra/media_plugins/cef/media_plugin_cef.cpp
index c668076d93..ca7339669b 100644
--- a/indra/media_plugins/cef/media_plugin_cef.cpp
+++ b/indra/media_plugins/cef/media_plugin_cef.cpp
@@ -361,8 +361,8 @@ void MediaPluginCEF::receiveMessage(const char* message_string)
 				mLLCEFLib->setOnHTTPAuthCallback(boost::bind(&MediaPluginCEF::onHTTPAuthCallback, this, _1, _2, _3, _4));
 
 				LLCEFLibSettings settings;
-				settings.inital_width = 1024;
-				settings.inital_height = 1024;
+				settings.initial_width = 1024;
+				settings.initial_height = 1024;
 				settings.plugins_enabled = mPluginsEnabled;
 				settings.javascript_enabled = mJavascriptEnabled;
 				settings.cookies_enabled = mCookiesEnabled;
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index ad8a236f92..bc5be822d0 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -447,13 +447,13 @@ class Windows_i686_Manifest(ViewerManifest):
             if self.prefix(src=os.path.join(os.pardir, 'packages', 'bin', 'debug'), dst="llplugin"):
                 self.path("d3dcompiler_43.dll")
                 self.path("d3dcompiler_47.dll")
-                self.path("ffmpegsumo.dll")
                 self.path("libcef.dll")
                 self.path("libEGL.dll")
                 self.path("libGLESv2.dll")
                 self.path("llceflib_host.exe")
                 self.path("natives_blob.bin")
                 self.path("snapshot_blob.bin")
+                self.path("widevinecdmadapter.dll")
                 self.path("wow_helper.exe")
                 self.end_prefix()
         else:
@@ -461,13 +461,13 @@ class Windows_i686_Manifest(ViewerManifest):
             if self.prefix(src=os.path.join(os.pardir, 'packages', 'bin', 'release'), dst="llplugin"):
                 self.path("d3dcompiler_43.dll")
                 self.path("d3dcompiler_47.dll")
-                self.path("ffmpegsumo.dll")
                 self.path("libcef.dll")
                 self.path("libEGL.dll")
                 self.path("libGLESv2.dll")
                 self.path("llceflib_host.exe")
                 self.path("natives_blob.bin")
                 self.path("snapshot_blob.bin")
+                self.path("widevinecdmadapter.dll")
                 self.path("wow_helper.exe")
                 self.end_prefix()
 
@@ -476,6 +476,7 @@ class Windows_i686_Manifest(ViewerManifest):
             self.path("cef.pak")
             self.path("cef_100_percent.pak")
             self.path("cef_200_percent.pak")
+            self.path("cef_extensions.pak")
             self.path("devtools_resources.pak")
             self.path("icudtl.dat")
             self.end_prefix()