update llplugin to latest version of SG2, pull latest webkit

2 files changed, 3 insertions, 2 deletions

diff --git a/linden/indra/newview/llviewermedia.cpp b/linden/indra/newview/llviewermedia.cpp
index c0d1460..8c5cf6a 100644
--- a/linden/indra/newview/llviewermedia.cpp
+++ b/linden/indra/newview/llviewermedia.cpp
@@ -480,7 +480,7 @@ LLPluginClassMedia* LLViewerMediaImpl::newSourceFromMediaType(std::string media_
                 {
                         LLPluginClassMedia* media_source = new LLPluginClassMedia(owner);
                         media_source->setSize(default_width, default_height);
-                        if (media_source->init(launcher_name, plugin_name, false, user_data_path))
+                        if (media_source->init(launcher_name, plugin_name, false))
                         {
                                 return media_source;
                         }
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index fcebda9..0c00995 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -1092,7 +1092,8 @@ class Linux_x86_64Manifest(LinuxManifest):
             self.path("libcairo.so.2")
             self.path("libfontconfig.so.1")
             self.path("libfreetype.so.6")
-#            self.path("libgdk_pixbuf-2.0.so.0")        # use systems gdk pixbufs instead
+            self.path("libgdk_pixbuf-2.0.so.0") # was commented to use systems gdk pixbufs instead -
+                                                # but seems webkit needs it o_O . Packaging for testing now.
             self.path("libgdk-x11-2.0.so.0")
             self.path("libgtk-x11-2.0.so.0")
 #            self.path("libpango-1.0.so.0")             # use systems pango instead