update to viewer-external SLPlugin + webkit. Fixes (lots of) webpages not loading.

Issue: llqtwebkit needs update for Linux 64bit

1 files changed, 25 insertions, 1 deletions

diff --git a/linden/indra/llplugin/llpluginclassmedia.cpp b/linden/indra/llplugin/llpluginclassmedia.cpp
index b958f0c..8664524 100755
--- a/linden/indra/llplugin/llpluginclassmedia.cpp
+++ b/linden/indra/llplugin/llpluginclassmedia.cpp
@@ -59,11 +59,15 @@ LLPluginClassMedia::LLPluginClassMedia(LLPluginClassMediaOwner *owner)
         mOwner = owner;
         mPlugin = NULL;
         reset();
+
+        //debug use
+        mDeleteOK = true ;
 }
 
 
 LLPluginClassMedia::~LLPluginClassMedia()
 {
+        llassert_always(mDeleteOK) ;
         reset();
 }
 
@@ -162,7 +166,7 @@ void LLPluginClassMedia::idle(void)
                 mPlugin->idle();
         }
         
-        if((mMediaWidth == -1) || (!mTextureParamsReceived) || (mPlugin == NULL))
+        if((mMediaWidth == -1) || (!mTextureParamsReceived) || (mPlugin == NULL) || (mPlugin->isBlocked()))
         {
                 // Can't process a size change at this time
         }
@@ -439,6 +443,12 @@ void LLPluginClassMedia::mouseEvent(EMouseEventType type, int button, int x, int
 {
         if(type == MOUSE_EVENT_MOVE)
         {
+                if(!mPlugin || !mPlugin->isRunning() || mPlugin->isBlocked())
+                {
+                        // Don't queue up mouse move events that can't be delivered.
+                        return;
+                }
+
                 if((x == mLastMouseX) && (y == mLastMouseY))
                 {
                         // Don't spam unnecessary mouse move events.
@@ -995,6 +1005,13 @@ void LLPluginClassMedia::receivePluginMessage(const LLPluginMessage &message)
                         mClickTargetType = TARGET_NONE;
                         mediaEvent(LLPluginClassMediaOwner::MEDIA_EVENT_CLICK_LINK_NOFOLLOW);
                 }
+                else if(message_name == "cookie_set")
+                {
+                        if(mOwner)
+                        {
+                                mOwner->handleCookieSet(this, message.getValue("cookie"));
+                        }
+                }
                 else
                 {
                         LL_WARNS("Plugin") << "Unknown " << message_name << " class message: " << message_name << LL_ENDL;
@@ -1078,6 +1095,13 @@ void LLPluginClassMedia::clear_cookies()
         sendMessage(message);
 }
 
+void LLPluginClassMedia::set_cookies(const std::string &cookies)
+{
+        LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA_BROWSER, "set_cookies");
+        message.setValue("cookies", cookies);   
+        sendMessage(message);
+}
+
 void LLPluginClassMedia::enable_cookies(bool enable)
 {
         LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA_BROWSER, "enable_cookies");