49 files changed, 514 insertions, 215 deletions
diff --git a/linden/indra/llplugin/CMakeLists.txt b/linden/indra/llplugin/CMakeLists.txt
index e41cdf7..e41cdf7 100644..100755
--- a/linden/indra/llplugin/CMakeLists.txt
+++ b/linden/indra/llplugin/CMakeLists.txt
diff --git a/linden/indra/llplugin/llpluginclassmedia.cpp b/linden/indra/llplugin/llpluginclassmedia.cpp
index a6f6f30..2e8bf3f 100644..100755
--- a/linden/indra/llplugin/llpluginclassmedia.cpp
+++ b/linden/indra/llplugin/llpluginclassmedia.cpp
@@ -2,9 +2,10 @@
 * @file llpluginclassmedia.cpp
 * @brief LLPluginClassMedia handles a plugin which knows about the "media" message class.
 *
+ * @cond
 * $LicenseInfo:firstyear=2008&license=viewergpl$
 * 
- * Copyright (c) 2008-2009, Linden Research, Inc.
+ * Copyright (c) 2008-2010, Linden Research, Inc.
 * 
 * Second Life Viewer Source Code
 * The source code in this file ("Source Code") is provided by Linden Lab
@@ -28,6 +29,7 @@
 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
 * COMPLETENESS OR PERFORMANCE.
 * $/LicenseInfo$
+ * @endcond
 */
 #include "linden_common.h"
@@ -36,6 +38,8 @@
 #include "llpluginclassmedia.h"
 #include "llpluginmessageclasses.h"
+#include "llqtwebkit.h"
 static int LOW_PRIORITY_TEXTURE_SIZE_DEFAULT = 256;
 static int nextPowerOf2( int value )
@@ -101,6 +105,8 @@ void LLPluginClassMedia::reset()
        mSetMediaHeight = -1;
        mRequestedMediaWidth = 0;
        mRequestedMediaHeight = 0;
+        mRequestedTextureWidth = 0;
+        mRequestedTextureHeight = 0;
        mFullMediaWidth = 0;
        mFullMediaHeight = 0;
        mTextureWidth = 0;
@@ -123,7 +129,8 @@ void LLPluginClassMedia::reset()
        mCanPaste = false;
        mMediaName.clear();
        mMediaDescription.clear();
+        mBackgroundColor = LLColor4(1.0f, 1.0f, 1.0f, 1.0f);
+        
        // media_browser class
        mNavigateURI.clear();
        mNavigateResultCode = -1;
@@ -132,6 +139,9 @@ void LLPluginClassMedia::reset()
        mHistoryForwardAvailable = false;
        mStatusText.clear();
        mProgressPercent = 0;   
+        mClickURL.clear();
+        mClickTarget.clear();
+        mClickTargetType = TARGET_NONE;
        
        // media_time class
        mCurrentTime = 0.0f;
@@ -233,6 +243,10 @@ void LLPluginClassMedia::idle(void)
                        message.setValueS32("height", mRequestedMediaHeight);
                        message.setValueS32("texture_width", mRequestedTextureWidth);
                        message.setValueS32("texture_height", mRequestedTextureHeight);
+                        message.setValueReal("background_r", mBackgroundColor.mV[VX]);
+                        message.setValueReal("background_g", mBackgroundColor.mV[VY]);
+                        message.setValueReal("background_b", mBackgroundColor.mV[VZ]);
+                        message.setValueReal("background_a", mBackgroundColor.mV[VW]);
                        mPlugin->sendMessage(message);  // DO NOT just use sendMessage() here -- we want this to jump ahead of the queue.
                        
                        LL_DEBUGS("Plugin") << "Sending size_change" << LL_ENDL;
@@ -370,7 +384,7 @@ bool LLPluginClassMedia::textureValid(void)
 bool LLPluginClassMedia::getDirty(LLRect *dirty_rect)
 {
-        bool result = !mDirtyRect.isNull();
+        bool result = !mDirtyRect.isNull();//awfixme isEmpty();
        if(dirty_rect != NULL)
        {
@@ -458,7 +472,7 @@ void LLPluginClassMedia::mouseEvent(EMouseEventType type, int button, int x, int
        sendMessage(message);
 }
-bool LLPluginClassMedia::keyEvent(EKeyEventType type, int key_code, MASK modifiers)
+bool LLPluginClassMedia::keyEvent(EKeyEventType type, int key_code, MASK modifiers, LLSD native_key_data)
 {
        bool result = true;
        
@@ -515,6 +529,7 @@ bool LLPluginClassMedia::keyEvent(EKeyEventType type, int key_code, MASK modifie
                message.setValueS32("key", key_code);
                message.setValue("modifiers", translateModifiers(modifiers));
+                message.setValueLLSD("native_key_data", native_key_data);
                
                sendMessage(message);
        }
@@ -533,12 +548,13 @@ void LLPluginClassMedia::scrollEvent(int x, int y, MASK modifiers)
        sendMessage(message);
 }
        
-bool LLPluginClassMedia::textInput(const std::string &text, MASK modifiers)
+bool LLPluginClassMedia::textInput(const std::string &text, MASK modifiers, LLSD native_key_data)
 {
        LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA, "text_event");
        message.setValue("text", text);
        message.setValue("modifiers", translateModifiers(modifiers));
+        message.setValueLLSD("native_key_data", native_key_data);
        
        sendMessage(message);
        
@@ -663,6 +679,26 @@ void LLPluginClassMedia::paste()
        sendMessage(message);
 }
+LLPluginClassMedia::ETargetType getTargetTypeFromLLQtWebkit(int target_type)
+{
+        // convert a LinkTargetType value from llqtwebkit to an ETargetType
+        // so that we don't expose the llqtwebkit header in viewer code
+        switch (target_type)
+        {
+        case LLQtWebKit::LTT_TARGET_NONE:
+                return LLPluginClassMedia::TARGET_NONE;
+        case LLQtWebKit::LTT_TARGET_BLANK:
+                return LLPluginClassMedia::TARGET_BLANK;
+        case LLQtWebKit::LTT_TARGET_EXTERNAL:
+                return LLPluginClassMedia::TARGET_EXTERNAL;
+        default:
+                return LLPluginClassMedia::TARGET_OTHER;
+        }
+}
 /* virtual */ 
 void LLPluginClassMedia::receivePluginMessage(const LLPluginMessage &message)
 {
@@ -710,7 +746,7 @@ void LLPluginClassMedia::receivePluginMessage(const LLPluginMessage &message)
                                        newDirtyRect.mBottom = temp;
                                }
                                
-                                if(mDirtyRect.isNull())
+                                if(mDirtyRect.isNull())//awfixme isEmpty())
                                {
                                        mDirtyRect = newDirtyRect;
                                }
@@ -915,12 +951,15 @@ void LLPluginClassMedia::receivePluginMessage(const LLPluginMessage &message)
                {
                        mClickURL = message.getValue("uri");
                        mClickTarget = message.getValue("target");
+                        U32 target_type = message.getValueU32("target_type");
+                        mClickTargetType = ::getTargetTypeFromLLQtWebkit(target_type);
                        mediaEvent(LLPluginClassMediaOwner::MEDIA_EVENT_CLICK_LINK_HREF);
                }
                else if(message_name == "click_nofollow")
                {
                        mClickURL = message.getValue("uri");
                        mClickTarget.clear();
+                        mClickTargetType = TARGET_NONE;
                        mediaEvent(LLPluginClassMediaOwner::MEDIA_EVENT_CLICK_LINK_NOFOLLOW);
                }
                else
diff --git a/linden/indra/llplugin/llpluginclassmedia.h b/linden/indra/llplugin/llpluginclassmedia.h
index c45010e..ab54348 100644..100755
--- a/linden/indra/llplugin/llpluginclassmedia.h
+++ b/linden/indra/llplugin/llpluginclassmedia.h
@@ -2,9 +2,10 @@
 * @file llpluginclassmedia.h
 * @brief LLPluginClassMedia handles interaction with a plugin which knows about the "media" message class.
 *
+ * @cond
 * $LicenseInfo:firstyear=2008&license=viewergpl$
 * 
- * Copyright (c) 2008-2009, Linden Research, Inc.
+ * Copyright (c) 2008-2010, Linden Research, Inc.
 * 
 * Second Life Viewer Source Code
 * The source code in this file ("Source Code") is provided by Linden Lab
@@ -28,6 +29,7 @@
 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
 * COMPLETENESS OR PERFORMANCE.
 * $/LicenseInfo$
+ * @endcond
 */
 #ifndef LL_LLPLUGINCLASSMEDIA_H
@@ -38,7 +40,7 @@
 #include "llrect.h"
 #include "llpluginclassmediaowner.h"
 #include <queue>
+#include "v4color.h"
 class LLPluginClassMedia : public LLPluginProcessParentOwner
 {
@@ -85,6 +87,8 @@ public:
        void setSize(int width, int height);
        void setAutoScale(bool auto_scale);
        
+        void setBackgroundColor(LLColor4 color) { mBackgroundColor = color; };
+        
        // Returns true if all of the texture parameters (depth, format, size, and texture size) are set up and consistent.
        // This will initially be false, and will also be false for some time after setSize while the resize is processed.
        // Note that if this returns true, it is safe to use all the get() functions above without checking for invalid return values
@@ -111,12 +115,12 @@ public:
                KEY_EVENT_REPEAT
        }EKeyEventType;
        
-        bool keyEvent(EKeyEventType type, int key_code, MASK modifiers);
+        bool keyEvent(EKeyEventType type, int key_code, MASK modifiers, LLSD native_key_data);
        void scrollEvent(int x, int y, MASK modifiers);
        
        // Text may be unicode (utf8 encoded)
-        bool textInput(const std::string &text, MASK modifiers);
+        bool textInput(const std::string &text, MASK modifiers, LLSD native_key_data);
        
        void loadURI(const std::string &uri);
        
@@ -211,6 +215,17 @@ public:
        // This is valid after MEDIA_EVENT_CLICK_LINK_HREF
        std::string getClickTarget() const { return mClickTarget; };
+        typedef enum 
+        {
+                TARGET_NONE,        // empty href target string
+                TARGET_BLANK,       // target to open link in user's preferred browser
+                TARGET_EXTERNAL,    // target to open link in external browser
+                TARGET_OTHER        // nonempty and unsupported target type
+        }ETargetType;
+        // This is valid after MEDIA_EVENT_CLICK_LINK_HREF
+        ETargetType getClickTargetType() const { return mClickTargetType; };
        std::string getMediaName() const { return mMediaName; };
        std::string getMediaDescription() const { return mMediaDescription; };
@@ -327,6 +342,8 @@ protected:
        std::string             mMediaName;
        std::string             mMediaDescription;
        
+        LLColor4                mBackgroundColor;
+        
        /////////////////////////////////////////
        // media_browser class
        std::string             mNavigateURI;
@@ -339,6 +356,7 @@ protected:
        std::string             mLocation;
        std::string             mClickURL;
        std::string             mClickTarget;
+        ETargetType     mClickTargetType;
        
        /////////////////////////////////////////
        // media_time class
diff --git a/linden/indra/llplugin/llpluginclassmediaowner.h b/linden/indra/llplugin/llpluginclassmediaowner.h
index 182eb92..239f692 100644..100755
--- a/linden/indra/llplugin/llpluginclassmediaowner.h
+++ b/linden/indra/llplugin/llpluginclassmediaowner.h
@@ -2,9 +2,10 @@
 * @file llpluginclassmediaowner.h
 * @brief LLPluginClassMedia handles interaction with a plugin which knows about the "media" message class.
 *
+ * @cond
 * $LicenseInfo:firstyear=2008&license=viewergpl$
 * 
- * Copyright (c) 2008-2009, Linden Research, Inc.
+ * Copyright (c) 2008-2010, Linden Research, Inc.
 * 
 * Second Life Viewer Source Code
 * The source code in this file ("Source Code") is provided by Linden Lab
@@ -28,6 +29,7 @@
 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
 * COMPLETENESS OR PERFORMANCE.
 * $/LicenseInfo$
+ * @endcond
 */
 #ifndef LL_LLPLUGINCLASSMEDIAOWNER_H
diff --git a/linden/indra/llplugin/llplugininstance.cpp b/linden/indra/llplugin/llplugininstance.cpp
index 5185b36..ce10cb6 100644..100755
--- a/linden/indra/llplugin/llplugininstance.cpp
+++ b/linden/indra/llplugin/llplugininstance.cpp
@@ -2,9 +2,10 @@
 * @file llplugininstance.cpp
 * @brief LLPluginInstance handles loading the dynamic library of a plugin and setting up its entry points for message passing.
 *
+ * @cond
 * $LicenseInfo:firstyear=2008&license=viewergpl$
 * 
- * Copyright (c) 2008-2009, Linden Research, Inc.
+ * Copyright (c) 2008-2010, Linden Research, Inc.
 * 
 * Second Life Viewer Source Code
 * The source code in this file ("Source Code") is provided by Linden Lab
@@ -28,6 +29,7 @@
 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
 * COMPLETENESS OR PERFORMANCE.
 * $/LicenseInfo$
+ * @endcond
 */
 #include "linden_common.h"
diff --git a/linden/indra/llplugin/llplugininstance.h b/linden/indra/llplugin/llplugininstance.h
index 0b53b5f..baa51cc 100644..100755
--- a/linden/indra/llplugin/llplugininstance.h
+++ b/linden/indra/llplugin/llplugininstance.h
@@ -1,10 +1,10 @@
 /** 
 * @file llplugininstance.h
- * @brief LLPluginInstance handles loading the dynamic library of a plugin and setting up its entry points for message passing.
 *
+ * @cond
 * $LicenseInfo:firstyear=2008&license=viewergpl$
 * 
- * Copyright (c) 2008-2009, Linden Research, Inc.
+ * Copyright (c) 2008-2010, Linden Research, Inc.
 * 
 * Second Life Viewer Source Code
 * The source code in this file ("Source Code") is provided by Linden Lab
@@ -28,6 +28,7 @@
 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
 * COMPLETENESS OR PERFORMANCE.
 * $/LicenseInfo$
+ * @endcond
 */
 #ifndef LL_LLPLUGININSTANCE_H
diff --git a/linden/indra/llplugin/llpluginmessage.cpp b/linden/indra/llplugin/llpluginmessage.cpp
index 67ac995..8efc774 100644..100755
--- a/linden/indra/llplugin/llpluginmessage.cpp
+++ b/linden/indra/llplugin/llpluginmessage.cpp
@@ -2,9 +2,10 @@
 * @file llpluginmessage.cpp
 * @brief LLPluginMessage encapsulates the serialization/deserialization of messages passed to and from plugins.
 *
+ * @cond
 * $LicenseInfo:firstyear=2008&license=viewergpl$
 * 
- * Copyright (c) 2008-2009, Linden Research, Inc.
+ * Copyright (c) 2008-2010, Linden Research, Inc.
 * 
 * Second Life Viewer Source Code
 * The source code in this file ("Source Code") is provided by Linden Lab
@@ -28,6 +29,7 @@
 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
 * COMPLETENESS OR PERFORMANCE.
 * $/LicenseInfo$
+ * @endcond
 */
 #include "linden_common.h"
diff --git a/linden/indra/llplugin/llpluginmessage.h b/linden/indra/llplugin/llpluginmessage.h
index 8bcb896..82eb89f 100644..100755
--- a/linden/indra/llplugin/llpluginmessage.h
+++ b/linden/indra/llplugin/llpluginmessage.h
@@ -1,10 +1,10 @@
 /** 
 * @file llpluginmessage.h
- * @brief LLPluginMessage encapsulates the serialization/deserialization of messages passed to and from plugins.
 *
+ * @cond
 * $LicenseInfo:firstyear=2008&license=viewergpl$
 * 
- * Copyright (c) 2008-2009, Linden Research, Inc.
+ * Copyright (c) 2008-2010, Linden Research, Inc.
 * 
 * Second Life Viewer Source Code
 * The source code in this file ("Source Code") is provided by Linden Lab
@@ -28,6 +28,7 @@
 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
 * COMPLETENESS OR PERFORMANCE.
 * $/LicenseInfo$
+ * @endcond
 */
 #ifndef LL_LLPLUGINMESSAGE_H
diff --git a/linden/indra/llplugin/llpluginmessageclasses.h b/linden/indra/llplugin/llpluginmessageclasses.h
index 1f60d5e..9a39e98 100644..100755
--- a/linden/indra/llplugin/llpluginmessageclasses.h
+++ b/linden/indra/llplugin/llpluginmessageclasses.h
@@ -2,9 +2,10 @@
 * @file llpluginmessageclasses.h
 * @brief This file defines the versions of existing message classes for LLPluginMessage.
 *
+ * @cond
 * $LicenseInfo:firstyear=2008&license=viewergpl$
 * 
- * Copyright (c) 2008-2009, Linden Research, Inc.
+ * Copyright (c) 2008-2010, Linden Research, Inc.
 * 
 * Second Life Viewer Source Code
 * The source code in this file ("Source Code") is provided by Linden Lab
@@ -28,6 +29,7 @@
 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
 * COMPLETENESS OR PERFORMANCE.
 * $/LicenseInfo$
+ * @endcond
 */
 #ifndef LL_LLPLUGINMESSAGECLASSES_H
diff --git a/linden/indra/llplugin/llpluginmessagepipe.cpp b/linden/indra/llplugin/llpluginmessagepipe.cpp
index 209f49f..85ed227 100644..100755
--- a/linden/indra/llplugin/llpluginmessagepipe.cpp
+++ b/linden/indra/llplugin/llpluginmessagepipe.cpp
@@ -2,9 +2,10 @@
 * @file llpluginmessagepipe.cpp
 * @brief Classes that implement connections from the plugin system to pipes/pumps.
 *
+ * @cond
 * $LicenseInfo:firstyear=2008&license=viewergpl$
 * 
- * Copyright (c) 2008-2009, Linden Research, Inc.
+ * Copyright (c) 2008-2010, Linden Research, Inc.
 * 
 * Second Life Viewer Source Code
 * The source code in this file ("Source Code") is provided by Linden Lab
@@ -28,6 +29,7 @@
 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
 * COMPLETENESS OR PERFORMANCE.
 * $/LicenseInfo$
+ * @endcond
 */
 #include "linden_common.h"
@@ -303,7 +305,14 @@ void LLPluginMessagePipe::processInput(void)
        while((delim = mInput.find(MESSAGE_DELIMITER, start)) != std::string::npos)
        {       
                // Let the owner process this message
-                mOwner->receiveMessageRaw(mInput.substr(start, delim - start));
+                if (mOwner)
+                {
+                        mOwner->receiveMessageRaw(mInput.substr(start, delim - start));
+                }
+                else
+                {
+                        LL_WARNS("Plugin") << "!mOwner" << LL_ENDL;
+                }
                
                start = delim + 1;
        }
diff --git a/linden/indra/llplugin/llpluginmessagepipe.h b/linden/indra/llplugin/llpluginmessagepipe.h
index 9bf1781..63fd569 100644..100755
--- a/linden/indra/llplugin/llpluginmessagepipe.h
+++ b/linden/indra/llplugin/llpluginmessagepipe.h
@@ -2,9 +2,10 @@
 * @file llpluginmessagepipe.h
 * @brief Classes that implement connections from the plugin system to pipes/pumps.
 *
+ * @cond
 * $LicenseInfo:firstyear=2008&license=viewergpl$
 * 
- * Copyright (c) 2008-2009, Linden Research, Inc.
+ * Copyright (c) 2008-2010, Linden Research, Inc.
 * 
 * Second Life Viewer Source Code
 * The source code in this file ("Source Code") is provided by Linden Lab
@@ -28,6 +29,7 @@
 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
 * COMPLETENESS OR PERFORMANCE.
 * $/LicenseInfo$
+ * @endcond
 */
 #ifndef LL_LLPLUGINMESSAGEPIPE_H
diff --git a/linden/indra/llplugin/llpluginprocesschild.cpp b/linden/indra/llplugin/llpluginprocesschild.cpp
index 9b5eafc..e13376f 100644..100755
--- a/linden/indra/llplugin/llpluginprocesschild.cpp
+++ b/linden/indra/llplugin/llpluginprocesschild.cpp
@@ -2,9 +2,10 @@
 * @file llpluginprocesschild.cpp
 * @brief LLPluginProcessChild handles the child side of the external-process plugin API. 
 *
+ * @cond
 * $LicenseInfo:firstyear=2008&license=viewergpl$
 * 
- * Copyright (c) 2008-2009, Linden Research, Inc.
+ * Copyright (c) 2008-2010, Linden Research, Inc.
 * 
 * Second Life Viewer Source Code
 * The source code in this file ("Source Code") is provided by Linden Lab
@@ -28,6 +29,7 @@
 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
 * COMPLETENESS OR PERFORMANCE.
 * $/LicenseInfo$
+ * @endcond
 */
 #include "linden_common.h"
@@ -42,6 +44,7 @@ static const F32 PLUGIN_IDLE_SECONDS = 1.0f / 100.0f;  // Each call to idle will
 LLPluginProcessChild::LLPluginProcessChild()
 {
+        mState = STATE_UNINITIALIZED;
        mInstance = NULL;
        mSocket = LLSocket::create(gAPRPoolp, LLSocket::STREAM_TCP);
        mSleepTime = PLUGIN_IDLE_SECONDS;       // default: send idle messages at 100Hz
@@ -53,8 +56,14 @@ LLPluginProcessChild::~LLPluginProcessChild()
        if(mInstance != NULL)
        {
                sendMessageToPlugin(LLPluginMessage("base", "cleanup"));
-                delete mInstance;
-                mInstance = NULL;
+                // IMPORTANT: under some (unknown) circumstances the apr_dso_unload() triggered when mInstance is deleted 
+                // appears to fail and lock up which means that a given instance of the slplugin process never exits. 
+                // This is bad, especially when users try to update their version of SL - it fails because the slplugin 
+                // process as well as a bunch of plugin specific files are locked and cannot be overwritten.
+                exit( 0 );
+                //delete mInstance;
+                //mInstance = NULL;
        }
 }
@@ -270,14 +279,21 @@ bool LLPluginProcessChild::isDone(void)
 void LLPluginProcessChild::sendMessageToPlugin(const LLPluginMessage &message)
 {
-        std::string buffer = message.generate();
+        if (mInstance)
+        {
-        LL_DEBUGS("Plugin") << "Sending to plugin: " << buffer << LL_ENDL;
+                std::string buffer = message.generate();
-        LLTimer elapsed;
+                
-        
+                LL_DEBUGS("Plugin") << "Sending to plugin: " << buffer << LL_ENDL;
-        mInstance->sendMessage(buffer);
+                LLTimer elapsed;
+                
-        mCPUElapsed += elapsed.getElapsedTimeF64();
+                mInstance->sendMessage(buffer);
+                
+                mCPUElapsed += elapsed.getElapsedTimeF64();
+        }
+        else
+        {
+                LL_WARNS("Plugin") << "mInstance == NULL" << LL_ENDL;
+        }
 }
 void LLPluginProcessChild::sendMessageToParent(const LLPluginMessage &message)
@@ -352,6 +368,7 @@ void LLPluginProcessChild::receiveMessageRaw(const std::string &message)
                                        else
                                        {
                                                LL_WARNS("Plugin") << "Couldn't create a shared memory segment!" << LL_ENDL;
+                                                delete region;
                                        }
                                }
                                
diff --git a/linden/indra/llplugin/llpluginprocesschild.h b/linden/indra/llplugin/llpluginprocesschild.h
index 16a1ae8..8e9579e 100644..100755
--- a/linden/indra/llplugin/llpluginprocesschild.h
+++ b/linden/indra/llplugin/llpluginprocesschild.h
@@ -2,9 +2,10 @@
 * @file llpluginprocesschild.h
 * @brief LLPluginProcessChild handles the child side of the external-process plugin API. 
 *
+ * @cond
 * $LicenseInfo:firstyear=2008&license=viewergpl$
 * 
- * Copyright (c) 2008-2009, Linden Research, Inc.
+ * Copyright (c) 2008-2010, Linden Research, Inc.
 * 
 * Second Life Viewer Source Code
 * The source code in this file ("Source Code") is provided by Linden Lab
@@ -28,6 +29,7 @@
 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
 * COMPLETENESS OR PERFORMANCE.
 * $/LicenseInfo$
+ * @endcond
 */
 #ifndef LL_LLPLUGINPROCESSCHILD_H
@@ -88,8 +90,9 @@ private:
                STATE_ERROR,                            // generic bailout state
                STATE_DONE                                      // state machine will sit in this state after either error or normal termination.
        };
-        EState mState;
        void setState(EState state);
+        EState mState;
        
        LLHost mLauncherHost;
        LLSocket::ptr_t mSocket;
diff --git a/linden/indra/llplugin/llpluginprocessparent.cpp b/linden/indra/llplugin/llpluginprocessparent.cpp
index bd36d11..9b8ea8b 100644..100755
--- a/linden/indra/llplugin/llpluginprocessparent.cpp
+++ b/linden/indra/llplugin/llpluginprocessparent.cpp
@@ -2,9 +2,10 @@
 * @file llpluginprocessparent.cpp
 * @brief LLPluginProcessParent handles the parent side of the external-process plugin API.
 *
+ * @cond
 * $LicenseInfo:firstyear=2008&license=viewergpl$
 * 
- * Copyright (c) 2008-2009, Linden Research, Inc.
+ * Copyright (c) 2008-2010, Linden Research, Inc.
 * 
 * Second Life Viewer Source Code
 * The source code in this file ("Source Code") is provided by Linden Lab
@@ -28,6 +29,7 @@
 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
 * COMPLETENESS OR PERFORMANCE.
 * $/LicenseInfo$
+ * @endcond
 */
 #include "linden_common.h"
@@ -49,11 +51,13 @@ LLPluginProcessParent::LLPluginProcessParent(LLPluginProcessParentOwner *owner)
        mOwner = owner;
        mBoundPort = 0;
        mState = STATE_UNINITIALIZED;
+        mSleepTime = 0.0;
+        mCPUUsage = 0.0;
        mDisableTimeout = false;
        mDebug = false;
        mPluginLaunchTimeout = 60.0f;
-        mPluginLockupTimeout = 30.0f;
+        mPluginLockupTimeout = 15.0f;
        
        // Don't start the timer here -- start it when we actually launch the plugin process.
        mHeartbeat.stop();
diff --git a/linden/indra/llplugin/llpluginprocessparent.h b/linden/indra/llplugin/llpluginprocessparent.h
index 00c60b5..6dbe0c1 100644..100755
--- a/linden/indra/llplugin/llpluginprocessparent.h
+++ b/linden/indra/llplugin/llpluginprocessparent.h
@@ -2,9 +2,10 @@
 * @file llpluginprocessparent.h
 * @brief LLPluginProcessParent handles the parent side of the external-process plugin API.
 *
+ * @cond
 * $LicenseInfo:firstyear=2008&license=viewergpl$
 * 
- * Copyright (c) 2008-2009, Linden Research, Inc.
+ * Copyright (c) 2008-2010, Linden Research, Inc.
 * 
 * Second Life Viewer Source Code
 * The source code in this file ("Source Code") is provided by Linden Lab
@@ -28,6 +29,7 @@
 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
 * COMPLETENESS OR PERFORMANCE.
 * $/LicenseInfo$
+ * @endcond
 */
 #ifndef LL_LLPLUGINPROCESSPARENT_H
diff --git a/linden/indra/llplugin/llpluginsharedmemory.cpp b/linden/indra/llplugin/llpluginsharedmemory.cpp
index c946619..a475f12 100644..100755
--- a/linden/indra/llplugin/llpluginsharedmemory.cpp
+++ b/linden/indra/llplugin/llpluginsharedmemory.cpp
@@ -1,10 +1,11 @@
 /** 
 * @file llpluginsharedmemory.cpp
- * @brief LLPluginSharedMemory manages a shared memory segment for use by the LLPlugin API.
+ * LLPluginSharedMemory manages a shared memory segment for use by the LLPlugin API.
 *
+ * @cond
 * $LicenseInfo:firstyear=2008&license=viewergpl$
 * 
- * Copyright (c) 2008-2009, Linden Research, Inc.
+ * Copyright (c) 2008-2010, Linden Research, Inc.
 * 
 * Second Life Viewer Source Code
 * The source code in this file ("Source Code") is provided by Linden Lab
@@ -28,6 +29,7 @@
 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
 * COMPLETENESS OR PERFORMANCE.
 * $/LicenseInfo$
+ * @endcond
 */
 #include "linden_common.h"
diff --git a/linden/indra/llplugin/llpluginsharedmemory.h b/linden/indra/llplugin/llpluginsharedmemory.h
index 2dc550e..1d23cbe 100644..100755
--- a/linden/indra/llplugin/llpluginsharedmemory.h
+++ b/linden/indra/llplugin/llpluginsharedmemory.h
@@ -1,10 +1,10 @@
 /** 
 * @file llpluginsharedmemory.h
- * @brief LLPluginSharedMemory manages a shared memory segment for use by the LLPlugin API.
 *
+ * @cond
 * $LicenseInfo:firstyear=2008&license=viewergpl$
 * 
- * Copyright (c) 2008-2009, Linden Research, Inc.
+ * Copyright (c) 2008-2010, Linden Research, Inc.
 * 
 * Second Life Viewer Source Code
 * The source code in this file ("Source Code") is provided by Linden Lab
@@ -28,6 +28,7 @@
 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
 * COMPLETENESS OR PERFORMANCE.
 * $/LicenseInfo$
+ * @endcond
 */
 #ifndef LL_LLPLUGINSHAREDMEMORY_H
diff --git a/linden/indra/llplugin/slplugin/CMakeLists.txt b/linden/indra/llplugin/slplugin/CMakeLists.txt
index 4a7d670..4a7d670 100644..100755
--- a/linden/indra/llplugin/slplugin/CMakeLists.txt
+++ b/linden/indra/llplugin/slplugin/CMakeLists.txt
diff --git a/linden/indra/llplugin/slplugin/slplugin.cpp b/linden/indra/llplugin/slplugin/slplugin.cpp
index fa3924b..526734a 100644..100755
--- a/linden/indra/llplugin/slplugin/slplugin.cpp
+++ b/linden/indra/llplugin/slplugin/slplugin.cpp
@@ -1,10 +1,12 @@
-/** 
+/**
 * @file slplugin.cpp
 * @brief Loader shell for plugins, intended to be launched by the plugin host application, which directly loads a plugin dynamic library.
 *
+ * @cond
+ *
 * $LicenseInfo:firstyear=2008&license=viewergpl$
 * 
- * Copyright (c) 2008-2009, Linden Research, Inc.
+ * Copyright (c) 2008-2010, Linden Research, Inc.
 * 
 * Second Life Viewer Source Code
 * The source code in this file ("Source Code") is provided by Linden Lab
@@ -28,6 +30,8 @@
 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
 * COMPLETENESS OR PERFORMANCE.
 * $/LicenseInfo$
+ *
+ * @endcond
 */
@@ -49,15 +53,15 @@
 /*
        On Mac OS, since we call WaitNextEvent, this process will show up in the dock unless we set the LSBackgroundOnly flag in the Info.plist.
-        
        Normally non-bundled binaries don't have an info.plist file, but it's possible to embed one in the binary by adding this to the linker flags:
-        
        -sectcreate __TEXT __info_plist /path/to/slplugin_info.plist
-        
        which means adding this to the gcc flags:
-        
        -Wl,-sectcreate,__TEXT,__info_plist,/path/to/slplugin_info.plist
-        
 */
 #if LL_DARWIN || LL_LINUX
@@ -68,7 +72,7 @@ static void crash_handler(int sig)
        // TODO: add our own crash reporting
        _exit(1);
 }
-#endif  
+#endif
 #if LL_WINDOWS
 #include <windows.h>
@@ -81,7 +85,7 @@ LONG WINAPI myWin32ExceptionHandler( struct _EXCEPTION_POINTERS* exception_infop
        //std::cerr << "intercepted an unhandled exception and will exit immediately." << std::endl;
        // TODO: replace exception handler before we exit?
-        return EXCEPTION_EXECUTE_HANDLER;       
+        return EXCEPTION_EXECUTE_HANDLER;
 }
 // Taken from : http://blog.kalmbachnet.de/?postid=75
@@ -153,7 +157,7 @@ bool checkExceptionHandler()
        if (prev_filter == NULL)
        {
                ok = FALSE;
-                if (myWin32ExceptionHandler == NULL)
+                if (NULL == myWin32ExceptionHandler)
                {
                        LL_WARNS("AppInit") << "Exception handler uninitialized." << LL_ENDL;
                }
@@ -167,7 +171,7 @@ bool checkExceptionHandler()
 }
 #endif
-// If this application on Windows platform is a console application, a console is always 
+// If this application on Windows platform is a console application, a console is always
 // created which is bad. Making it a Windows "application" via CMake settings but not
 // adding any code to explicitly create windows does the right thing.
 #if LL_WINDOWS
@@ -178,7 +182,7 @@ int main(int argc, char **argv)
 {
        ll_init_apr();
-        // Set up llerror logging 
+        // Set up llerror logging
        {
                LLError::initForApplication(".");
                LLError::setDefaultLevel(LLError::LEVEL_INFO);
@@ -191,14 +195,14 @@ int main(int argc, char **argv)
        {
                LL_ERRS("slplugin") << "usage: " << "SLPlugin" << " launcher_port" << LL_ENDL;
        };
-        
        U32 port = 0;
        if(!LLStringUtil::convertToU32(lpCmdLine, port))
        {
                LL_ERRS("slplugin") << "port number must be numeric" << LL_ENDL;
        };
-        // Insert our exception handler into the system so this plugin doesn't 
+        // Insert our exception handler into the system so this plugin doesn't
        // display a crash message if something bad happens. The host app will
        // see the missing heartbeat and log appropriately.
        initExceptionHandler();
@@ -207,7 +211,7 @@ int main(int argc, char **argv)
        {
                LL_ERRS("slplugin") << "usage: " << argv[0] << " launcher_port" << LL_ENDL;
        }
-        
        U32 port = 0;
        if(!LLStringUtil::convertToU32(argv[1], port))
        {
@@ -228,17 +232,17 @@ int main(int argc, char **argv)
        LLPluginProcessChild *plugin = new LLPluginProcessChild();
        plugin->init(port);
-        
        LLTimer timer;
        timer.start();
 #if LL_WINDOWS
        checkExceptionHandler();
 #endif
-                
        while(!plugin->isDone())
        {
-                timer.reset();  
+                timer.reset();
                plugin->idle();
 #if LL_DARWIN
                {
@@ -249,7 +253,7 @@ int main(int argc, char **argv)
 #endif
                F64 elapsed = timer.getElapsedTimeF64();
                F64 remaining = plugin->getSleepTime() - elapsed;
-                
                if(remaining <= 0.0f)
                {
                        // We've already used our full allotment.
@@ -262,26 +266,26 @@ int main(int argc, char **argv)
                {
 //                      LL_INFOS("slplugin") << "elapsed = " << elapsed * 1000.0f << " ms, remaining = " << remaining * 1000.0f << " ms, sleeping for " << remaining * 1000.0f << " ms" << LL_ENDL;
-//                      timer.reset();  
+//                      timer.reset();
-                        
                        // This also services the network as needed.
                        plugin->sleep(remaining);
-                        
 //                      LL_INFOS("slplugin") << "slept for "<< timer.getElapsedTimeF64() * 1000.0f << " ms" <<  LL_ENDL;
                }
 #if LL_WINDOWS
        // More agressive checking of interfering exception handlers.
-        // Doesn't appear to be required so far - even for plugins 
+        // Doesn't appear to be required so far - even for plugins
-        // that do crash with a single call to the intercept 
+        // that do crash with a single call to the intercept
        // exception handler such as QuickTime.
        //checkExceptionHandler();
 #endif
        }
        delete plugin;
-        
-        ll_cleanup_apr();       
+        ll_cleanup_apr();
        return 0;
 }
diff --git a/linden/indra/llplugin/slplugin/slplugin_info.plist b/linden/indra/llplugin/slplugin/slplugin_info.plist
index b1daf87..b1daf87 100644..100755
--- a/linden/indra/llplugin/slplugin/slplugin_info.plist
+++ b/linden/indra/llplugin/slplugin/slplugin_info.plist
diff --git a/linden/indra/llwindow/llwindow.h b/linden/indra/llwindow/llwindow.h
index 14759cc..2e96294 100644
--- a/linden/indra/llwindow/llwindow.h
+++ b/linden/indra/llwindow/llwindow.h
@@ -37,6 +37,7 @@
 #include "llcoord.h"
 #include "llstring.h"
 #include "llcursortypes.h"
+#include "llsd.h"
 class LLSplashScreen;
@@ -208,6 +209,9 @@ public:
        static std::vector<std::string> getDynamicFallbackFontList();
+        // Provide native key event data
+        virtual LLSD getNativeKeyData() { return LLSD::emptyMap(); }
 protected:
        LLWindow(BOOL fullscreen, U32 flags);
        virtual ~LLWindow() {}
diff --git a/linden/indra/llwindow/llwindowmacosx.cpp b/linden/indra/llwindow/llwindowmacosx.cpp
index 7efba51..430687b 100644
--- a/linden/indra/llwindow/llwindowmacosx.cpp
+++ b/linden/indra/llwindow/llwindowmacosx.cpp
@@ -3217,7 +3217,7 @@ void LLWindowMacOSX::ShellEx(const std::string& command)
        }
 }
-BOOL LLWindowMacOSX::dialog_color_picker ( F32 *r, F32 *g, F32 *b)
+BOOL LLWindowMacOSX::dialog_color_picker( F32 *r, F32 *g, F32 *b)
 {
        BOOL    retval = FALSE;
        OSErr   error = noErr;
diff --git a/linden/indra/llwindow/llwindowmacosx.h b/linden/indra/llwindow/llwindowmacosx.h
index 9e87e9f..92c73e8 100644
--- a/linden/indra/llwindow/llwindowmacosx.h
+++ b/linden/indra/llwindow/llwindowmacosx.h
@@ -117,6 +117,10 @@ public:
        static std::vector<std::string> getDynamicFallbackFontList();
+        // Provide native key event data
+        /*virtual*/ LLSD getNativeKeyData();
 protected:
        LLWindowMacOSX(
                const std::string& title, const std::string& name, int x, int y, int width, int height, U32 flags,
diff --git a/linden/indra/llwindow/llwindowsdl.cpp b/linden/indra/llwindow/llwindowsdl.cpp
index bf339f2..9310ff5 100644
--- a/linden/indra/llwindow/llwindowsdl.cpp
+++ b/linden/indra/llwindow/llwindowsdl.cpp
@@ -250,6 +250,10 @@ LLWindowSDL::LLWindowSDL(const std::string& title, S32 x, S32 y, S32 width,
 #if LL_X11
        mFlashing = FALSE;
 #endif // LL_X11
+        mKeyScanCode = 0;
+        mKeyVirtualKey = 0;
+        mKeyModifiers = KMOD_NONE;
 }
 static SDL_Surface *Load_BMP_Resource(const char *basename)
@@ -2227,7 +2231,40 @@ static void color_changed_callback(GtkWidget *widget,
        gtk_color_selection_get_current_color(colorsel, colorp);
 }
-BOOL LLWindowSDL::dialog_color_picker ( F32 *r, F32 *g, F32 *b)
+/*
+        Make the raw keyboard data available - used to poke through to LLQtWebKit so
+        that Qt/Webkit has access to the virtual keycodes etc. that it needs
+*/
+LLSD LLWindowSDL::getNativeKeyData()
+{
+        LLSD result = LLSD::emptyMap();
+        U32 modifiers = 0; // pretend-native modifiers... oh what a tangled web we weave!
+        // we go through so many levels of device abstraction that I can't really guess
+        // what a plugin under GDK under Qt under SL under SDL under X11 considers
+        // a 'native' modifier mask.  this has been sort of reverse-engineered... they *appear*
+        // to match GDK consts, but that may be co-incidence.
+        modifiers |= (mKeyModifiers & KMOD_LSHIFT) ? 0x0001 : 0;
+        modifiers |= (mKeyModifiers & KMOD_RSHIFT) ? 0x0001 : 0;// munge these into the same shift
+        modifiers |= (mKeyModifiers & KMOD_CAPS)   ? 0x0002 : 0;
+        modifiers |= (mKeyModifiers & KMOD_LCTRL)  ? 0x0004 : 0;
+        modifiers |= (mKeyModifiers & KMOD_RCTRL)  ? 0x0004 : 0;// munge these into the same ctrl
+        modifiers |= (mKeyModifiers & KMOD_LALT)   ? 0x0008 : 0;// untested
+        modifiers |= (mKeyModifiers & KMOD_RALT)   ? 0x0008 : 0;// untested
+        // *todo: test ALTs - I don't have a case for testing these.  Do you?
+        // *todo: NUM? - I don't care enough right now (and it's not a GDK modifier).
+        result["scan_code"] = (S32)mKeyScanCode;
+        result["virtual_key"] = (S32)mKeyVirtualKey;
+        result["modifiers"] = (S32)modifiers;
+        return result;
+}
+BOOL LLWindowSDL::dialog_color_picker( F32 *r, F32 *g, F32 *b)
 {
        BOOL rtn = FALSE;
diff --git a/linden/indra/llwindow/llwindowsdl.h b/linden/indra/llwindow/llwindowsdl.h
index 39a6007..37b0835 100644
--- a/linden/indra/llwindow/llwindowsdl.h
+++ b/linden/indra/llwindow/llwindowsdl.h
@@ -154,6 +154,8 @@ protected:
                BOOL ignore_pixel_depth, U32 fsaa_samples);
        ~LLWindowSDL();
+        /*virtual*/ LLSD    getNativeKeyData();
        void    initCursors();
        void    quitCursors();
        BOOL    isValid();
@@ -206,12 +208,17 @@ protected:
        friend class LLWindowManager;
-#if LL_X11
 private:
+#if LL_X11
        void x11_set_urgent(BOOL urgent);
        BOOL mFlashing;
        LLTimer mFlashTimer;
 #endif //LL_X11
+        U32 mKeyScanCode;
+        U32 mKeyVirtualKey;
+        SDLMod mKeyModifiers;
 };
diff --git a/linden/indra/llwindow/llwindowwin32.cpp b/linden/indra/llwindow/llwindowwin32.cpp
index e47cab4..12a488a 100644
--- a/linden/indra/llwindow/llwindowwin32.cpp
+++ b/linden/indra/llwindow/llwindowwin32.cpp
@@ -3052,6 +3052,19 @@ void LLWindowWin32::spawnWebBrowser(const std::string& escaped_url )
        */
 }
+/*
+        Make the raw keyboard data available - used to poke through to LLQtWebKit so
+        that Qt/Webkit has access to the virtual keycodes etc. that it needs
+*/
+LLSD LLWindowWin32::getNativeKeyData()
+{
+        LLSD result = LLSD::emptyMap();
+        result["scan_code"] = (S32)mKeyScanCode;
+        result["virtual_key"] = (S32)mKeyVirtualKey;
+        return result;
+}
 BOOL LLWindowWin32::dialog_color_picker ( F32 *r, F32 *g, F32 *b )
 {
diff --git a/linden/indra/llwindow/llwindowwin32.h b/linden/indra/llwindow/llwindowwin32.h
index cc95993..0e40115 100644
--- a/linden/indra/llwindow/llwindowwin32.h
+++ b/linden/indra/llwindow/llwindowwin32.h
@@ -128,7 +128,7 @@ protected:
        HCURSOR loadColorCursor(LPCTSTR name);
        BOOL    isValid();
        void    moveWindow(const LLCoordScreen& position,const LLCoordScreen& size);
+        LLSD    getNativeKeyData();
        // Changes display resolution. Returns true if successful
        BOOL    setDisplayResolution(S32 width, S32 height, S32 bits, S32 refresh);
@@ -208,6 +208,12 @@ protected:
        LLPreeditor             *mPreeditor;
+        
+        U32                             mKeyCharCode;
+        U32                             mKeyScanCode;
+        U32                             mKeyVirtualKey;
        friend class LLWindowManager;
 };
diff --git a/linden/indra/media_plugins/CMakeLists.txt b/linden/indra/media_plugins/CMakeLists.txt
index cc03d9c..cc03d9c 100644..100755
--- a/linden/indra/media_plugins/CMakeLists.txt
+++ b/linden/indra/media_plugins/CMakeLists.txt
diff --git a/linden/indra/media_plugins/base/CMakeLists.txt b/linden/indra/media_plugins/base/CMakeLists.txt
index a3ee02e..a3ee02e 100644..100755
--- a/linden/indra/media_plugins/base/CMakeLists.txt
+++ b/linden/indra/media_plugins/base/CMakeLists.txt
diff --git a/linden/indra/media_plugins/base/media_plugin_base.cpp b/linden/indra/media_plugins/base/media_plugin_base.cpp
index 4d5e374..baae68c 100644..100755
--- a/linden/indra/media_plugins/base/media_plugin_base.cpp
+++ b/linden/indra/media_plugins/base/media_plugin_base.cpp
@@ -4,9 +4,10 @@
 *
 * All plugins should be a subclass of MediaPluginBase. 
 *
+ * @cond
 * $LicenseInfo:firstyear=2008&license=viewergpl$
 * 
- * Copyright (c) 2008-2009, Linden Research, Inc.
+ * Copyright (c) 2008-2010, Linden Research, Inc.
 * 
 * Second Life Viewer Source Code
 * The source code in this file ("Source Code") is provided by Linden Lab
@@ -30,6 +31,7 @@
 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
 * COMPLETENESS OR PERFORMANCE.
 * $/LicenseInfo$
+ * @endcond
 */
 #include "linden_common.h"
diff --git a/linden/indra/media_plugins/base/media_plugin_base.exp b/linden/indra/media_plugins/base/media_plugin_base.exp
index 1e27d1f..d8c7bb7 100644..100755
--- a/linden/indra/media_plugins/base/media_plugin_base.exp
+++ b/linden/indra/media_plugins/base/media_plugin_base.exp
@@ -1 +1,2 @@
 _LLPluginInitEntryPoint
diff --git a/linden/indra/media_plugins/base/media_plugin_base.h b/linden/indra/media_plugins/base/media_plugin_base.h
index 24198af..8311e66 100644..100755
--- a/linden/indra/media_plugins/base/media_plugin_base.h
+++ b/linden/indra/media_plugins/base/media_plugin_base.h
@@ -2,9 +2,10 @@
 * @file media_plugin_base.h
 * @brief Media plugin base class for LLMedia API plugin system
 *
+ * @cond
 * $LicenseInfo:firstyear=2008&license=viewergpl$
 * 
- * Copyright (c) 2008-2009, Linden Research, Inc.
+ * Copyright (c) 2008-2010, Linden Research, Inc.
 * 
 * Second Life Viewer Source Code
 * The source code in this file ("Source Code") is provided by Linden Lab
@@ -28,6 +29,7 @@
 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
 * COMPLETENESS OR PERFORMANCE.
 * $/LicenseInfo$
+ * @endcond
 */
 #include "linden_common.h"
diff --git a/linden/indra/media_plugins/example/CMakeLists.txt b/linden/indra/media_plugins/example/CMakeLists.txt
index b074a1d..6d14c1b 100644..100755
--- a/linden/indra/media_plugins/example/CMakeLists.txt
+++ b/linden/indra/media_plugins/example/CMakeLists.txt
@@ -14,7 +14,7 @@ include(PluginAPI)
 include(MediaPluginBase)
 include(FindOpenGL)
-include(ExamplePlugin)
+#awfixme include(ExamplePlugin)
 include_directories(
    ${LLPLUGIN_INCLUDE_DIRS}
diff --git a/linden/indra/media_plugins/example/media_plugin_example.cpp b/linden/indra/media_plugins/example/media_plugin_example.cpp
index 99e0199..83abae0 100644..100755
--- a/linden/indra/media_plugins/example/media_plugin_example.cpp
+++ b/linden/indra/media_plugins/example/media_plugin_example.cpp
@@ -2,31 +2,34 @@
 * @file media_plugin_example.cpp
 * @brief Example plugin for LLMedia API plugin system
 *
+ * @cond
 * $LicenseInfo:firstyear=2008&license=viewergpl$
- *
+ * 
- * Copyright (c) 2009, Linden Research, Inc.
+ * Copyright (c) 2008-2010, Linden Research, Inc.
- *
+ * 
 * Second Life Viewer Source Code
 * The source code in this file ("Source Code") is provided by Linden Lab
 * to you under the terms of the GNU General Public License, version 2.0
 * ("GPL"), unless you have obtained a separate licensing agreement
 * ("Other License"), formally executed by you and Linden Lab.  Terms of
 * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
- *
+ * 
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at
- *
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
 * and agree to abide by those obligations.
- *
+ * 
 * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
 * COMPLETENESS OR PERFORMANCE.
 * $/LicenseInfo$
+ * @endcond
 */
 #include "linden_common.h"
diff --git a/linden/indra/media_plugins/gstreamer010/CMakeLists.txt b/linden/indra/media_plugins/gstreamer010/CMakeLists.txt
index a3a32d8..3b73e04 100644..100755
--- a/linden/indra/media_plugins/gstreamer010/CMakeLists.txt
+++ b/linden/indra/media_plugins/gstreamer010/CMakeLists.txt
@@ -42,12 +42,12 @@ set(media_plugin_gstreamer010_HEADER_FILES
    llmediaimplgstreamertriviallogging.h
    )
-#awfixme if (${CXX_VERSION_NUMBER} MATCHES "4[23].")
+if (${CXX_VERSION_NUMBER} MATCHES "4[23].")
    # Work around a bad interaction between broken gstreamer headers and
    # g++ 4.3's increased strictness.
    set_source_files_properties(llmediaimplgstreamervidplug.cpp PROPERTIES
                                COMPILE_FLAGS -Wno-write-strings)
-#awfixme endif (${CXX_VERSION_NUMBER} MATCHES "4[23].")
+endif (${CXX_VERSION_NUMBER} MATCHES "4[23].")
 add_library(media_plugin_gstreamer010
    SHARED
diff --git a/linden/indra/media_plugins/gstreamer010/llmediaimplgstreamer.h b/linden/indra/media_plugins/gstreamer010/llmediaimplgstreamer.h
index ef41736..6920c3b 100644..100755
--- a/linden/indra/media_plugins/gstreamer010/llmediaimplgstreamer.h
+++ b/linden/indra/media_plugins/gstreamer010/llmediaimplgstreamer.h
@@ -3,9 +3,10 @@
 * @author Tofu Linden
 * @brief implementation that supports media playback via GStreamer.
 *
+ * @cond
 * $LicenseInfo:firstyear=2007&license=viewergpl$
 * 
- * Copyright (c) 2007-2009, Linden Research, Inc.
+ * Copyright (c) 2007-2010, Linden Research, Inc.
 * 
 * Second Life Viewer Source Code
 * The source code in this file ("Source Code") is provided by Linden Lab
@@ -29,6 +30,7 @@
 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
 * COMPLETENESS OR PERFORMANCE.
 * $/LicenseInfo$
+ * @endcond
 */
 // header guard
diff --git a/linden/indra/media_plugins/gstreamer010/llmediaimplgstreamer_syms.cpp b/linden/indra/media_plugins/gstreamer010/llmediaimplgstreamer_syms.cpp
index cc52232..28960ac 100644..100755
--- a/linden/indra/media_plugins/gstreamer010/llmediaimplgstreamer_syms.cpp
+++ b/linden/indra/media_plugins/gstreamer010/llmediaimplgstreamer_syms.cpp
@@ -2,9 +2,10 @@
 * @file llmediaimplgstreamer_syms.cpp
 * @brief dynamic GStreamer symbol-grabbing code
 *
+ * @cond
 * $LicenseInfo:firstyear=2007&license=viewergpl$
 * 
- * Copyright (c) 2007-2009, Linden Research, Inc.
+ * Copyright (c) 2007-2010, Linden Research, Inc.
 * 
 * Second Life Viewer Source Code
 * The source code in this file ("Source Code") is provided by Linden Lab
@@ -28,6 +29,7 @@
 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
 * COMPLETENESS OR PERFORMANCE.
 * $/LicenseInfo$
+ * @endcond
 */
 #if LL_GSTREAMER010_ENABLED
diff --git a/linden/indra/media_plugins/gstreamer010/llmediaimplgstreamer_syms.h b/linden/indra/media_plugins/gstreamer010/llmediaimplgstreamer_syms.h
index ee7473d..7955898 100644..100755
--- a/linden/indra/media_plugins/gstreamer010/llmediaimplgstreamer_syms.h
+++ b/linden/indra/media_plugins/gstreamer010/llmediaimplgstreamer_syms.h
@@ -2,9 +2,10 @@
 * @file llmediaimplgstreamer_syms.h
 * @brief dynamic GStreamer symbol-grabbing code
 *
+ * @cond
 * $LicenseInfo:firstyear=2007&license=viewergpl$
 * 
- * Copyright (c) 2007-2009, Linden Research, Inc.
+ * Copyright (c) 2007-2010, Linden Research, Inc.
 * 
 * Second Life Viewer Source Code
 * The source code in this file ("Source Code") is provided by Linden Lab
@@ -28,6 +29,7 @@
 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
 * COMPLETENESS OR PERFORMANCE.
 * $/LicenseInfo$
+ * @endcond
 */
 #include "linden_common.h"
diff --git a/linden/indra/media_plugins/gstreamer010/llmediaimplgstreamer_syms_raw.inc b/linden/indra/media_plugins/gstreamer010/llmediaimplgstreamer_syms_raw.inc
index b33e593..b33e593 100644..100755
--- a/linden/indra/media_plugins/gstreamer010/llmediaimplgstreamer_syms_raw.inc
+++ b/linden/indra/media_plugins/gstreamer010/llmediaimplgstreamer_syms_raw.inc
diff --git a/linden/indra/media_plugins/gstreamer010/llmediaimplgstreamer_syms_rawv.inc b/linden/indra/media_plugins/gstreamer010/llmediaimplgstreamer_syms_rawv.inc
index 14fbcb4..14fbcb4 100644..100755
--- a/linden/indra/media_plugins/gstreamer010/llmediaimplgstreamer_syms_rawv.inc
+++ b/linden/indra/media_plugins/gstreamer010/llmediaimplgstreamer_syms_rawv.inc
diff --git a/linden/indra/media_plugins/gstreamer010/llmediaimplgstreamertriviallogging.h b/linden/indra/media_plugins/gstreamer010/llmediaimplgstreamertriviallogging.h
index 04976b9..27f0eed 100644..100755
--- a/linden/indra/media_plugins/gstreamer010/llmediaimplgstreamertriviallogging.h
+++ b/linden/indra/media_plugins/gstreamer010/llmediaimplgstreamertriviallogging.h
@@ -2,9 +2,10 @@
 * @file llmediaimplgstreamertriviallogging.h
 * @brief minimal logging utilities.
 *
+ * @cond
 * $LicenseInfo:firstyear=2009&license=viewergpl$
 * 
- * Copyright (c) 2009, Linden Research, Inc.
+ * Copyright (c) 2009-2010, Linden Research, Inc.
 * 
 * Second Life Viewer Source Code
 * The source code in this file ("Source Code") is provided by Linden Lab
@@ -28,6 +29,7 @@
 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
 * COMPLETENESS OR PERFORMANCE.
 * $/LicenseInfo$
+ * @endcond
 */
 #ifndef __LLMEDIAIMPLGSTREAMERTRIVIALLOGGING_H__
diff --git a/linden/indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.cpp b/linden/indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.cpp
index ef8ff58..2b10a2a 100644..100755
--- a/linden/indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.cpp
+++ b/linden/indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.cpp
@@ -1,10 +1,11 @@
 /**
- * @file llmediaimplgstreamervidplug.cpp
+ * @file llmediaimplgstreamervidplug.h
 * @brief Video-consuming static GStreamer plugin for gst-to-LLMediaImpl
 *
+ * @cond
 * $LicenseInfo:firstyear=2007&license=viewergpl$
 * 
- * Copyright (c) 2007-2009, Linden Research, Inc.
+ * Copyright (c) 2007-2010, Linden Research, Inc.
 * 
 * Second Life Viewer Source Code
 * The source code in this file ("Source Code") is provided by Linden Lab
@@ -28,6 +29,7 @@
 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
 * COMPLETENESS OR PERFORMANCE.
 * $/LicenseInfo$
+ * @endcond
 */
 #if LL_GSTREAMER010_ENABLED
diff --git a/linden/indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.h b/linden/indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.h
index 8cdc72d..fad80cb 100644..100755
--- a/linden/indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.h
+++ b/linden/indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.h
@@ -2,9 +2,10 @@
 * @file llmediaimplgstreamervidplug.h
 * @brief Video-consuming static GStreamer plugin for gst-to-LLMediaImpl
 *
+ * @cond
 * $LicenseInfo:firstyear=2007&license=viewergpl$
 * 
- * Copyright (c) 2007-2009, Linden Research, Inc.
+ * Copyright (c) 2007-2010, Linden Research, Inc.
 * 
 * Second Life Viewer Source Code
 * The source code in this file ("Source Code") is provided by Linden Lab
@@ -28,6 +29,7 @@
 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
 * COMPLETENESS OR PERFORMANCE.
 * $/LicenseInfo$
+ * @endcond
 */
 #ifndef __GST_SLVIDEO_H__
diff --git a/linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp b/linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp
index 5b3152d..82e6fdc 100644..100755
--- a/linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp
+++ b/linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp
@@ -2,9 +2,10 @@
 * @file media_plugin_gstreamer010.cpp
 * @brief GStreamer-0.10 plugin for LLMedia API plugin system
 *
+ * @cond
 * $LicenseInfo:firstyear=2007&license=viewergpl$
 * 
- * Copyright (c) 2007-2009, Linden Research, Inc.
+ * Copyright (c) 2007-2010, Linden Research, Inc.
 * 
 * Second Life Viewer Source Code
 * The source code in this file ("Source Code") is provided by Linden Lab
@@ -28,6 +29,7 @@
 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
 * COMPLETENESS OR PERFORMANCE.
 * $/LicenseInfo$
+ * @endcond
 */
 #include "linden_common.h"
diff --git a/linden/indra/media_plugins/quicktime/CMakeLists.txt b/linden/indra/media_plugins/quicktime/CMakeLists.txt
index df191f5..df191f5 100644..100755
--- a/linden/indra/media_plugins/quicktime/CMakeLists.txt
+++ b/linden/indra/media_plugins/quicktime/CMakeLists.txt
diff --git a/linden/indra/media_plugins/quicktime/media_plugin_quicktime.cpp b/linden/indra/media_plugins/quicktime/media_plugin_quicktime.cpp
index 6c8c41d..9b4c531 100644..100755
--- a/linden/indra/media_plugins/quicktime/media_plugin_quicktime.cpp
+++ b/linden/indra/media_plugins/quicktime/media_plugin_quicktime.cpp
@@ -1,10 +1,11 @@
-/** 
+/**
 * @file media_plugin_quicktime.cpp
 * @brief QuickTime plugin for LLMedia API plugin system
 *
+ * @cond
 * $LicenseInfo:firstyear=2008&license=viewergpl$
 * 
- * Copyright (c) 2008-2009, Linden Research, Inc.
+ * Copyright (c) 2008-2010, Linden Research, Inc.
 * 
 * Second Life Viewer Source Code
 * The source code in this file ("Source Code") is provided by Linden Lab
@@ -28,6 +29,7 @@
 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
 * COMPLETENESS OR PERFORMANCE.
 * $/LicenseInfo$
+ * @endcond
 */
 #include "linden_common.h"
@@ -102,14 +104,14 @@ private:
                message.setValueS32("top", top);
                message.setValueS32("right", right);
                message.setValueS32("bottom", bottom);
-                
                if(mMovieHandle)
                {
                        message.setValueReal("current_time", getCurrentTime());
                        message.setValueReal("duration", getDuration());
                        message.setValueReal("current_rate", Fix2X(GetMovieRate(mMovieHandle)));
                }
-                        
                sendMessage(message);
        }
@@ -117,16 +119,16 @@ private:
        static Rect rectFromSize(int width, int height)
        {
                Rect result;
-                
                result.left = 0;
                result.top = 0;
                result.right = width;
                result.bottom = height;
-                
                return result;
        }
-        
        Fixed getPlayRate(void)
        {
                Fixed result;
@@ -145,25 +147,27 @@ private:
                {
                        result = X2Fix(mPlayRate);
                }
-                
                return result;
        }
-        
        void load( const std::string url )
        {
                if ( url.empty() )
                        return;
-                
                // Stop and unload any existing movie before starting another one.
                unload();
-                        
                setStatus(STATUS_LOADING);
-                
                //In case std::string::c_str() makes a copy of the url data,
                //make sure there is memory to hold it before allocating memory for handle.
                //if fails, NewHandleClear(...) should return NULL.
                const char* url_string = url.c_str() ;
                Handle handle = NewHandleClear( ( Size )( url.length() + 1 ) );
                if ( NULL == handle || noErr != MemError() || NULL == *handle )
                {
                        setStatus(STATUS_ERROR);
@@ -202,7 +206,7 @@ private:
                SetMovieDrawingCompleteProc( mMovieHandle, movieDrawingCallWhenChanged, movieDrawingCompleteCallback, ( long )this );
                setStatus(STATUS_LOADED);
-                
                sizeChanged();
        };
@@ -239,7 +243,7 @@ private:
                        DisposeGWorld( mGWorldHandle );
                        mGWorldHandle = NULL;
                };
-                
                setStatus(STATUS_NONE);
                return true;
@@ -249,7 +253,7 @@ private:
        {
                unload();
                load( url );
-                
                return true;
        };
@@ -257,7 +261,7 @@ private:
        {
                if ( ! mMovieHandle )
                        return false;
-                
                // Check to see whether the movie's natural size has updated
                {
                        int width, height;
@@ -275,14 +279,14 @@ private:
                                //std::cerr << "<--- Sending size change request to application with name: " << mTextureSegmentName << " - size is " << width << " x " << height << std::endl;
                        }
                }
-                
                // sanitize destination size
                Rect dest_rect = rectFromSize(mWidth, mHeight);
                // media depth won't change
                int depth_bits = mDepth * 8;
                long rowbytes = mDepth * mTextureWidth;
-                                
                GWorldPtr old_gworld_handle = mGWorldHandle;
                if(mPixels != NULL)
@@ -314,7 +318,7 @@ private:
                {
                        DisposeGWorld( old_gworld_handle );
                }
-                
                // Set up the movie display matrix
                {
                        // scale movie to fit rect and invert vertically to match opengl image format
@@ -327,7 +331,7 @@ private:
                        ScaleMatrix( &transform, X2Fix( scaleX ), X2Fix( scaleY ), X2Fix( centerX ), X2Fix( centerY ) );
                        SetMovieMatrix( mMovieHandle, &transform );
                }
-                
                // update movie controller
                if ( mMovieController )
                {
@@ -345,7 +349,6 @@ private:
                return true;
        }
        static Boolean mcActionFilterCallBack( MovieController mc, short action, void *params, long ref )
        {
                Boolean result = false;
@@ -355,9 +358,9 @@ private:
                switch( action )
                {
                        // handle window resizing
-                        case mcActionControllerSizeChanged:                             
+                        case mcActionControllerSizeChanged:
                                // Ensure that the movie draws correctly at the new size
-                                self->sizeChanged();                                            
+                                self->sizeChanged();
                                break;
                        // Block any movie controller actions that open URLs.
@@ -386,6 +389,7 @@ private:
 //              self->updateQuickTime();
                // TODO ^^^
                if ( self->mWidth > 0 && self->mHeight > 0 )
                        self->setDirty( 0, 0, self->mWidth, self->mHeight );
@@ -434,7 +438,7 @@ private:
                                                MCDoAction( mMovieController, mcActionPlay, (void*)rate );
                                                rewind();
                                        };
-                                        
                                        MCDoAction( mMovieController, mcActionPrerollAndPlay, (void*)getPlayRate() );
                                        MCDoAction( mMovieController, mcActionSetVolume, (void*)mCurVolume );
                                        setStatus(STATUS_PLAYING);
@@ -462,7 +466,7 @@ private:
                if ( mCommand == COMMAND_PAUSE )
                {
                        if ( mStatus == STATUS_PLAYING )
-                        {                               
+                        {
                                if ( GetMovieLoadState( mMovieHandle ) >= kMovieLoadStatePlaythroughOK )
                                {
                                        Fixed rate = X2Fix( 0.0 );
@@ -495,7 +499,7 @@ private:
        void getMovieNaturalSize(int *movie_width, int *movie_height)
        {
                Rect rect;
-                
                GetMovieNaturalBoundsRect( mMovieHandle, &rect );
                int width  = ( rect.right - rect.left );
@@ -518,7 +522,7 @@ private:
                *movie_width = width;
                *movie_height = height;
        }
-        
        void updateQuickTime(int milliseconds)
        {
                if ( ! mMovieHandle )
@@ -721,8 +725,8 @@ private:
                        return false;
                // allocate some space and grab it
-                UInt8* item_data = new UInt8( size + 1 );
+                UInt8* item_data = new UInt8[ size + 1 ];
-                memset( item_data, 0, ( size + 1 ) * sizeof( UInt8* ) );
+                memset( item_data, 0, ( size + 1 ) * sizeof( UInt8 ) );
                result = QTMetaDataGetItemValue( media_data_ref, item, item_data, size, NULL );
                if ( noErr != result ) 
                {
@@ -861,7 +865,7 @@ void MediaPluginQuickTime::receiveMessage(const char *message_string)
                                message.setMessage(LLPLUGIN_MESSAGE_CLASS_MEDIA, "texture_params");
                                #if defined(LL_WINDOWS)
                                        // Values for Windows
-                                        mDepth = 3;     
+                                        mDepth = 3;
                                        message.setValueU32("format", GL_RGB);
                                        message.setValueU32("type", GL_UNSIGNED_BYTE);
@@ -870,7 +874,7 @@ void MediaPluginQuickTime::receiveMessage(const char *message_string)
                                        message.setValueU32("padding", 32 * 3);
                                #else
                                        // Values for Mac
-                                        mDepth = 4;     
+                                        mDepth = 4;
                                        message.setValueU32("format", GL_BGRA_EXT);
                                        #ifdef __BIG_ENDIAN__
                                                message.setValueU32("type", GL_UNSIGNED_INT_8_8_8_8_REV );
@@ -891,7 +895,7 @@ void MediaPluginQuickTime::receiveMessage(const char *message_string)
                        {
                                // no response is necessary here.
                                F64 time = message_in.getValueReal("time");
-                                
                                // Convert time to milliseconds for update()
                                update((int)(time * 1000.0f));
                        }
@@ -905,8 +909,6 @@ void MediaPluginQuickTime::receiveMessage(const char *message_string)
                                info.mAddress = message_in.getValuePointer("address");
                                info.mSize = (size_t)message_in.getValueS32("size");
                                std::string name = message_in.getValue("name");
 //                              std::cerr << "MediaPluginQuickTime::receiveMessage: shared memory added, name: " << name
 //                                      << ", size: " << info.mSize
 //                                      << ", address: " << info.mAddress
@@ -929,9 +931,9 @@ void MediaPluginQuickTime::receiveMessage(const char *message_string)
                                                // This is the currently active pixel buffer.  Make sure we stop drawing to it.
                                                mPixels = NULL;
                                                mTextureSegmentName.clear();
-                                                
                                                // Make sure the movie GWorld is no longer pointed at the shared segment.
-                                                sizeChanged();                                          
+                                                sizeChanged();
                                        }
                                        mSharedSegments.erase(iter);
                                }
@@ -988,9 +990,9 @@ void MediaPluginQuickTime::receiveMessage(const char *message_string)
                                                mTextureHeight = texture_height;
                                                mMediaSizeChanging = false;
-                                                
                                                sizeChanged();
-                                                
                                                update();
                                        };
                                };
@@ -999,14 +1001,14 @@ void MediaPluginQuickTime::receiveMessage(const char *message_string)
                        {
                                std::string uri = message_in.getValue("uri");
                                load( uri );
-                                sendStatus();           
+                                sendStatus();
                        }
                        else if(message_name == "mouse_event")
                        {
                                std::string event = message_in.getValue("event");
                                S32 x = message_in.getValueS32("x");
                                S32 y = message_in.getValueS32("y");
-                                
                                if(event == "down")
                                {
                                        mouseDown(x, y);
@@ -1099,7 +1101,7 @@ MediaPluginQuickTime::~MediaPluginQuickTime()
 void MediaPluginQuickTime::receiveMessage(const char *message_string)
 {
-    // no-op 
+    // no-op
 }
 // We're building without quicktime enabled.  Just refuse to initialize.
diff --git a/linden/indra/media_plugins/webkit/CMakeLists.txt b/linden/indra/media_plugins/webkit/CMakeLists.txt
index 54bc364..1c999ba 100644
--- a/linden/indra/media_plugins/webkit/CMakeLists.txt
+++ b/linden/indra/media_plugins/webkit/CMakeLists.txt
@@ -9,6 +9,7 @@ include(LLPlugin)
 include(LLMath)
 include(LLRender)
 include(LLWindow)
+include(UI)
 include(Linking)
 include(PluginAPI)
 include(MediaPluginBase)
@@ -50,6 +51,11 @@ set(media_plugin_webkit_LINK_LIBRARIES
  ${PLUGIN_API_WINDOWS_LIBRARIES}
 )
+if(LINUX)
+  list(APPEND media_plugin_webkit_LINK_LIBRARIES
+    ${UI_LIBRARIES}  # for glib/GTK
+    )
+endif(LINUX)
 add_library(media_plugin_webkit
@@ -93,3 +99,4 @@ if (DARWIN)
    )
    
 endif (DARWIN)
diff --git a/linden/indra/media_plugins/webkit/media_plugin_webkit.cpp b/linden/indra/media_plugins/webkit/media_plugin_webkit.cpp
index 91efdae..2e3f06d 100644..100755
--- a/linden/indra/media_plugins/webkit/media_plugin_webkit.cpp
+++ b/linden/indra/media_plugins/webkit/media_plugin_webkit.cpp
@@ -2,9 +2,10 @@
 * @file media_plugin_webkit.cpp
 * @brief Webkit plugin for LLMedia API plugin system
 *
+ * @cond
 * $LicenseInfo:firstyear=2008&license=viewergpl$
 * 
- * Copyright (c) 2008-2009, Linden Research, Inc.
+ * Copyright (c) 2008-2010, Linden Research, Inc.
 * 
 * Second Life Viewer Source Code
 * The source code in this file ("Source Code") is provided by Linden Lab
@@ -28,8 +29,9 @@
 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
 * COMPLETENESS OR PERFORMANCE.
 * $/LicenseInfo$
+ * @endcond
 */
+#include <iomanip>//FIXME: This is included from elsewhere in SG2.0
 #include "llqtwebkit.h"
 #include "linden_common.h"
@@ -50,7 +52,7 @@
 #endif
 #if LL_WINDOWS
-        // NOTE - This captures the module handle of the dll. This is used below
+        // *NOTE:Mani - This captures the module handle fo rthe dll. This is used below
        // to get the path to this dll for webkit initialization.
        // I don't know how/if this can be done with apr...
        namespace {     HMODULE gModuleHandle;};
@@ -83,6 +85,7 @@ private:
                INIT_STATE_NAVIGATING,                  // Browser instance has been set up and initial navigate to about:blank has been issued
                INIT_STATE_NAVIGATE_COMPLETE,   // initial navigate to about:blank has completed
                INIT_STATE_WAIT_REDRAW,                 // First real navigate begin has been received, waiting for page changed event to start handling redraws
+                INIT_STATE_WAIT_COMPLETE,               // Waiting for first real navigate complete event
                INIT_STATE_RUNNING                              // All initialization gymnastics are complete.
        };
        int mBrowserWindowId;
@@ -96,6 +99,9 @@ private:
        int mLastMouseX;
        int mLastMouseY;
        bool mFirstFocus;
+        F32 mBackgroundR;
+        F32 mBackgroundG;
+        F32 mBackgroundB;
        
        void setInitState(int state)
        {
@@ -121,7 +127,7 @@ private:
                        }
                }
                
-                if ( (mInitState == INIT_STATE_RUNNING) && mNeedsUpdate )
+                if ( (mInitState > INIT_STATE_WAIT_REDRAW) && mNeedsUpdate )
                {
                        const unsigned char* browser_pixels = LLQtWebKit::getInstance()->grabBrowserWindow( mBrowserWindowId );
@@ -170,8 +176,17 @@ private:
                }
                std::string application_dir = std::string( cwd );
+#if LL_DARWIN
+        // When running under the Xcode debugger, there's a setting called "Break on Debugger()/DebugStr()" which defaults to being turned on.
+        // This causes the environment variable USERBREAK to be set to 1, which causes these legacy calls to break into the debugger.
+        // This wouldn't cause any problems except for the fact that the current release version of the Flash plugin has a call to Debugger() in it
+        // which gets hit when the plugin is probed by webkit.
+        // Unsetting the environment variable here works around this issue.
+        unsetenv("USERBREAK");
+#endif
 #if LL_WINDOWS
-                // NOTE - On windows, at least, the component path is the
+                //*NOTE:Mani - On windows, at least, the component path is the
                // location of this dll's image file. 
                std::string component_dir;
                char dll_path[_MAX_PATH];
@@ -187,8 +202,8 @@ private:
                }
                else
                {
-                        // NOTE - This case should be a rare exception. 
+                        // *NOTE:Mani - This case should be an rare exception. 
-                        // GetModuleFileNameA should always give you a full path.
+                        // GetModuleFileNameA should always give you a full path, no?
                        component_dir = application_dir;
                }
 #else
@@ -210,7 +225,6 @@ private:
                {
                        // create single browser window
                        mBrowserWindowId = LLQtWebKit::getInstance()->createBrowserWindow( mWidth, mHeight );
 #if LL_WINDOWS
                        // Enable plugins
                        LLQtWebKit::getInstance()->enablePlugins(true);
@@ -236,8 +250,9 @@ private:
                        // don't flip bitmap
                        LLQtWebKit::getInstance()->flipWindow( mBrowserWindowId, true );
                        
-                        // set background color to be black - mostly for initial login page
+                        // set background color
-                        LLQtWebKit::getInstance()->setBackgroundColor( mBrowserWindowId, 0x00, 0x00, 0x00 );
+                        // convert background color channels from [0.0, 1.0] to [0, 255];
+                        LLQtWebKit::getInstance()->setBackgroundColor( mBrowserWindowId, int(mBackgroundR * 255.0f), int(mBackgroundG * 255.0f), int(mBackgroundB * 255.0f) );
                        // Set state _before_ starting the navigate, since onNavigateBegin might get called before this call returns.
                        setInitState(INIT_STATE_NAVIGATING);
@@ -245,7 +260,21 @@ private:
                        // Don't do this here -- it causes the dreaded "white flash" when loading a browser instance.
                        // FIXME: Re-added this because navigating to a "page" initializes things correctly - especially
                        // for the HTTP AUTH dialog issues (DEV-41731). Will fix at a later date.
-                        LLQtWebKit::getInstance()->navigateTo( mBrowserWindowId, "about:blank" );
+                        // Build a data URL like this: "data:text/html,%3Chtml%3E%3Cbody bgcolor=%22#RRGGBB%22%3E%3C/body%3E%3C/html%3E"
+                        // where RRGGBB is the background color in HTML style
+                        std::stringstream url;
+                        
+                        url << "data:text/html,%3Chtml%3E%3Cbody%20bgcolor=%22#";
+                        // convert background color channels from [0.0, 1.0] to [0, 255];
+                        url << std::setfill('0') << std::setw(2) << std::hex << int(mBackgroundR * 255.0f);
+                        url << std::setfill('0') << std::setw(2) << std::hex << int(mBackgroundG * 255.0f);
+                        url << std::setfill('0') << std::setw(2) << std::hex << int(mBackgroundB * 255.0f);
+                        url << "%22%3E%3C/body%3E%3C/html%3E";
+                        
+                        lldebugs << "data url is: " << url.str() << llendl;
+                                                
+                        LLQtWebKit::getInstance()->navigateTo( mBrowserWindowId, url.str() );
+//                      LLQtWebKit::getInstance()->navigateTo( mBrowserWindowId, "about:blank" );
                        return true;
                };
@@ -253,6 +282,7 @@ private:
                return false;
        };
        ////////////////////////////////////////////////////////////////////////////////
        // virtual
        void onCursorChanged(const EventType& event)
@@ -294,7 +324,7 @@ private:
        {
                if(mInitState == INIT_STATE_WAIT_REDRAW)
                {
-                        setInitState(INIT_STATE_RUNNING);
+                        setInitState(INIT_STATE_WAIT_COMPLETE);
                }
                
                // flag that an update is required
@@ -316,7 +346,9 @@ private:
                if(mInitState == INIT_STATE_NAVIGATE_COMPLETE)
                {
-                        setInitState(INIT_STATE_WAIT_REDRAW);
+                        // Skip the WAIT_REDRAW state now -- with the right background color set, it should no longer be necessary.
+//                      setInitState(INIT_STATE_WAIT_REDRAW);
+                        setInitState(INIT_STATE_WAIT_COMPLETE);
                }
                
        }
@@ -327,6 +359,14 @@ private:
        {
                if(mInitState >= INIT_STATE_NAVIGATE_COMPLETE)
                {
+                        if(mInitState < INIT_STATE_RUNNING)
+                        {
+                                setInitState(INIT_STATE_RUNNING);
+                                
+                                // Clear the history, so the "back" button doesn't take you back to "about:blank".
+                                LLQtWebKit::getInstance()->clearHistory(mBrowserWindowId);
+                        }
+                        
                        LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA_BROWSER, "navigate_complete");
                        message.setValue("uri", event.getEventUri());
                        message.setValueS32("result_code", event.getIntValue());
@@ -399,6 +439,7 @@ private:
                LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA_BROWSER, "click_href");
                message.setValue("uri", event.getStringValue());
                message.setValue("target", event.getStringValue2());
+                message.setValueU32("target_type", event.getLinkType());
                sendMessage(message);
        }
        
@@ -430,92 +471,96 @@ private:
                return (LLQtWebKit::EKeyboardModifier)result;
        }
        
        ////////////////////////////////////////////////////////////////////////////////
        //
-        void keyEvent(LLQtWebKit::EKeyEvent key_event, int key, LLQtWebKit::EKeyboardModifier modifiers)
+        void deserializeKeyboardData( LLSD native_key_data, uint32_t& native_scan_code, uint32_t& native_virtual_key, uint32_t& native_modifiers )
        {
-                int llqt_key;
+                native_scan_code = 0;
+                native_virtual_key = 0;
+                native_modifiers = 0;
                
+                if( native_key_data.isMap() )
+                {
+#if LL_DARWIN
+                        native_scan_code = (uint32_t)(native_key_data["char_code"].asInteger());
+                        native_virtual_key = (uint32_t)(native_key_data["key_code"].asInteger());
+                        native_modifiers = (uint32_t)(native_key_data["modifiers"].asInteger());
+#elif LL_WINDOWS
+                        native_scan_code = (uint32_t)(native_key_data["scan_code"].asInteger());
+                        native_virtual_key = (uint32_t)(native_key_data["virtual_key"].asInteger());
+                        // TODO: I don't think we need to do anything with native modifiers here -- please verify
+#elif LL_LINUX
+                        native_scan_code = (uint32_t)(native_key_data["scan_code"].asInteger());
+                        native_virtual_key = (uint32_t)(native_key_data["virtual_key"].asInteger());
+                        native_modifiers = (uint32_t)(native_key_data["modifiers"].asInteger());
+#else
+                        // Add other platforms here as needed
+#endif
+                };
+        };
+        ////////////////////////////////////////////////////////////////////////////////
+        //
+        void keyEvent(LLQtWebKit::EKeyEvent key_event, int key, LLQtWebKit::EKeyboardModifier modifiers, LLSD native_key_data = LLSD::emptyMap())
+        {
                // The incoming values for 'key' will be the ones from indra_constants.h
-                // the outgoing values are the ones from llqtwebkit.h
+                std::string utf8_text;
                
+                if(key < KEY_SPECIAL)
+                {
+                        // Low-ascii characters need to get passed through.
+                        utf8_text = (char)key;
+                }
+                
+                // Any special-case handling we want to do for particular keys...
                switch((KEY)key)
                {
-                        // This is the list that the llqtwebkit implementation actually maps into Qt keys.
+                        // ASCII codes for some standard keys
-//                      case KEY_XXX:                   llqt_key = LL_DOM_VK_CANCEL;                    break;
+                        case LLQtWebKit::KEY_BACKSPACE:         utf8_text = (char)8;            break;
-//                      case KEY_XXX:                   llqt_key = LL_DOM_VK_HELP;                      break;
+                        case LLQtWebKit::KEY_TAB:                       utf8_text = (char)9;            break;
-                        case KEY_BACKSPACE:             llqt_key = LL_DOM_VK_BACK_SPACE;                break;
+                        case LLQtWebKit::KEY_RETURN:            utf8_text = (char)13;           break;
-                        case KEY_TAB:                   llqt_key = LL_DOM_VK_TAB;                       break;
+                        case LLQtWebKit::KEY_PAD_RETURN:        utf8_text = (char)13;           break;
-//                      case KEY_XXX:                   llqt_key = LL_DOM_VK_CLEAR;                     break;
+                        case LLQtWebKit::KEY_ESCAPE:            utf8_text = (char)27;           break;
-                        case KEY_RETURN:                llqt_key = LL_DOM_VK_RETURN;                    break;
-                        case KEY_PAD_RETURN:    llqt_key = LL_DOM_VK_ENTER;                     break;
-                        case KEY_SHIFT:                 llqt_key = LL_DOM_VK_SHIFT;                     break;
-                        case KEY_CONTROL:               llqt_key = LL_DOM_VK_CONTROL;           break;
-                        case KEY_ALT:                   llqt_key = LL_DOM_VK_ALT;                       break;
-//                      case KEY_XXX:                   llqt_key = LL_DOM_VK_PAUSE;                     break;
-                        case KEY_CAPSLOCK:              llqt_key = LL_DOM_VK_CAPS_LOCK;         break;
-                        case KEY_ESCAPE:                llqt_key = LL_DOM_VK_ESCAPE;                    break;
-                        case KEY_PAGE_UP:               llqt_key = LL_DOM_VK_PAGE_UP;           break;
-                        case KEY_PAGE_DOWN:             llqt_key = LL_DOM_VK_PAGE_DOWN;         break;
-                        case KEY_END:                   llqt_key = LL_DOM_VK_END;                       break;
-                        case KEY_HOME:                  llqt_key = LL_DOM_VK_HOME;                      break;
-                        case KEY_LEFT:                  llqt_key = LL_DOM_VK_LEFT;                      break;
-                        case KEY_UP:                    llqt_key = LL_DOM_VK_UP;                                break;
-                        case KEY_RIGHT:                 llqt_key = LL_DOM_VK_RIGHT;                     break;
-                        case KEY_DOWN:                  llqt_key = LL_DOM_VK_DOWN;                      break;
-//                      case KEY_XXX:                   llqt_key = LL_DOM_VK_PRINTSCREEN;       break;
-                        case KEY_INSERT:                llqt_key = LL_DOM_VK_INSERT;                    break;
-                        case KEY_DELETE:                llqt_key = LL_DOM_VK_DELETE;                    break;
-//                      case KEY_XXX:                   llqt_key = LL_DOM_VK_CONTEXT_MENU;      break;
                        
-                        default:
+                        default:  
-                                if(key < KEY_SPECIAL)
-                                {
-                                        // Pass the incoming key through -- it should be regular ASCII, which should be correct for webkit.
-                                        llqt_key = key;
-                                }
-                                else
-                                {
-                                        // Don't pass through untranslated special keys -- they'll be all wrong.
-                                        llqt_key = 0;
-                                }
                        break;
                }
                
-//              std::cerr << "keypress, original code = 0x" << std::hex << key << ", converted code = 0x" << std::hex << llqt_key << std::dec << std::endl;
+//              std::cerr << "key event " << (int)key_event << ", native_key_data = " << native_key_data << std::endl;
                
-                if(llqt_key != 0)
+                uint32_t native_scan_code = 0;
-                {
+                uint32_t native_virtual_key = 0;
-                        LLQtWebKit::getInstance()->keyEvent( mBrowserWindowId, key_event, llqt_key, modifiers);
+                uint32_t native_modifiers = 0;
-                }
+                deserializeKeyboardData( native_key_data, native_scan_code, native_virtual_key, native_modifiers );
+                
+                LLQtWebKit::getInstance()->keyboardEvent( mBrowserWindowId, key_event, (uint32_t)key, utf8_text.c_str(), modifiers, native_scan_code, native_virtual_key, native_modifiers);
                checkEditState();
        };
        ////////////////////////////////////////////////////////////////////////////////
        //
-        void unicodeInput( const std::string &utf8str, LLQtWebKit::EKeyboardModifier modifiers)
+        void unicodeInput( const std::string &utf8str, LLQtWebKit::EKeyboardModifier modifiers, LLSD native_key_data = LLSD::emptyMap())
-        {
+        {               
-                LLWString wstr = utf8str_to_wstring(utf8str);
+                uint32_t key = LLQtWebKit::KEY_NONE;
                
-                unsigned int i;
+//              std::cerr << "unicode input, native_key_data = " << native_key_data << std::endl;
-                for(i=0; i < wstr.size(); i++)
+                
+                if(utf8str.size() == 1)
                {
-//                      std::cerr << "unicode input, code = 0x" << std::hex << (unsigned long)(wstr[i]) << std::dec << std::endl;
+                        // The only way a utf8 string can be one byte long is if it's actually a single 7-bit ascii character.
-                        
+                        // In this case, use it as the key value.
-                        if(wstr[i] == 32)
+                        key = utf8str[0];
-                        {
-                                // For some reason, the webkit plugin really wants the space bar to come in through the key-event path, not the unicode path.
-                                LLQtWebKit::getInstance()->keyEvent( mBrowserWindowId, LLQtWebKit::KE_KEY_DOWN, 32, modifiers);
-                                LLQtWebKit::getInstance()->keyEvent( mBrowserWindowId, LLQtWebKit::KE_KEY_UP, 32, modifiers);
-                        }
-                        else
-                        {
-                                LLQtWebKit::getInstance()->unicodeInput(mBrowserWindowId, wstr[i], modifiers);
-                        }
                }
+                uint32_t native_scan_code = 0;
+                uint32_t native_virtual_key = 0;
+                uint32_t native_modifiers = 0;
+                deserializeKeyboardData( native_key_data, native_scan_code, native_virtual_key, native_modifiers );
+                
+                LLQtWebKit::getInstance()->keyboardEvent( mBrowserWindowId, LLQtWebKit::KE_KEY_DOWN, (uint32_t)key, utf8str.c_str(), modifiers, native_scan_code, native_virtual_key, native_modifiers);
+                LLQtWebKit::getInstance()->keyboardEvent( mBrowserWindowId, LLQtWebKit::KE_KEY_UP, (uint32_t)key, utf8str.c_str(), modifiers, native_scan_code, native_virtual_key, native_modifiers);
                checkEditState();
        };
        
@@ -568,6 +613,9 @@ MediaPluginWebKit::MediaPluginWebKit(LLPluginInstance::sendMessageFunction host_
        mLastMouseX = 0;
        mLastMouseY = 0;
        mFirstFocus = true;
+        mBackgroundR = 0.0f;
+        mBackgroundG = 0.0f;
+        mBackgroundB = 0.0f;
 }
 MediaPluginWebKit::~MediaPluginWebKit()
@@ -645,7 +693,6 @@ void MediaPluginWebKit::receiveMessage(const char *message_string)
                                info.mSize = (size_t)message_in.getValueS32("size");
                                std::string name = message_in.getValue("name");
                                
-                                
 //                              std::cerr << "MediaPluginWebKit::receiveMessage: shared memory added, name: " << name 
 //                                      << ", size: " << info.mSize 
 //                                      << ", address: " << info.mAddress 
@@ -695,7 +742,11 @@ void MediaPluginWebKit::receiveMessage(const char *message_string)
                                S32 height = message_in.getValueS32("height");
                                S32 texture_width = message_in.getValueS32("texture_width");
                                S32 texture_height = message_in.getValueS32("texture_height");
-                                
+                                mBackgroundR = message_in.getValueReal("background_r");
+                                mBackgroundG = message_in.getValueReal("background_g");
+                                mBackgroundB = message_in.getValueReal("background_b");
+//                              mBackgroundA = message_in.setValueReal("background_a");         // Ignore any alpha
+                                                                
                                if(!name.empty())
                                {
                                        // Find the shared memory region with this name
@@ -809,6 +860,7 @@ void MediaPluginWebKit::receiveMessage(const char *message_string)
                                std::string event = message_in.getValue("event");
                                S32 key = message_in.getValueS32("key");
                                std::string modifiers = message_in.getValue("modifiers");
+                                LLSD native_key_data = message_in.getValueLLSD("native_key_data");
                                
                                // Treat unknown events as key-up for safety.
                                LLQtWebKit::EKeyEvent key_event = LLQtWebKit::KE_KEY_UP;
@@ -821,14 +873,15 @@ void MediaPluginWebKit::receiveMessage(const char *message_string)
                                        key_event = LLQtWebKit::KE_KEY_REPEAT;
                                }
                                
-                                keyEvent(key_event, key, decodeModifiers(modifiers));
+                                keyEvent(key_event, key, decodeModifiers(modifiers), native_key_data);
                        }
                        else if(message_name == "text_event")
                        {
                                std::string text = message_in.getValue("text");
                                std::string modifiers = message_in.getValue("modifiers");
+                                LLSD native_key_data = message_in.getValueLLSD("native_key_data");
                                
-                                unicodeInput(text, decodeModifiers(modifiers));
+                                unicodeInput(text, decodeModifiers(modifiers), native_key_data);
                        }
                        if(message_name == "edit_cut")
                        {
diff --git a/linden/indra/newview/llviewermedia.cpp b/linden/indra/newview/llviewermedia.cpp
index 5bdb26f..c0d1460 100644
--- a/linden/indra/newview/llviewermedia.cpp
+++ b/linden/indra/newview/llviewermedia.cpp
@@ -770,7 +770,38 @@ bool LLViewerMediaImpl::handleKeyHere(KEY key, MASK mask)
        
        if (mMediaSource)
        {
-                result = mMediaSource->keyEvent(LLPluginClassMedia::KEY_EVENT_DOWN ,key, mask);
+                // FIXME: THIS IS SO WRONG.
+                // Menu keys should be handled by the menu system and not passed to UI elements, but this is how LLTextEditor and LLLineEditor do it...
+                if( MASK_CONTROL & mask )
+                {
+                        if( 'C' == key )
+                        {
+                                mMediaSource->copy();
+                                result = true;
+                        }
+                        else
+                        if( 'V' == key )
+                        {
+                                mMediaSource->paste();
+                                result = true;
+                        }
+                        else
+                        if( 'X' == key )
+                        {
+                                mMediaSource->cut();
+                                result = true;
+                        }
+                }
+                
+                if(!result)
+                {
+                        
+                        LLSD native_key_data = gViewerWindow->getWindow()->getNativeKeyData();
+                        
+                        result = mMediaSource->keyEvent(LLPluginClassMedia::KEY_EVENT_DOWN ,key, mask, native_key_data);
+                        // Since the viewer internal event dispatching doesn't give us key-up events, simulate one here.
+                        (void)mMediaSource->keyEvent(LLPluginClassMedia::KEY_EVENT_UP ,key, mask, native_key_data);
+                }
        }
        
        return result;
@@ -787,7 +818,9 @@ bool LLViewerMediaImpl::handleUnicodeCharHere(llwchar uni_char)
                if (uni_char >= 32 // discard 'control' characters
                        && uni_char != 127) // SDL thinks this is 'delete' - yuck.
                {
-                        mMediaSource->textInput(wstring_to_utf8str(LLWString(1, uni_char)), gKeyboard->currentMask(FALSE));
+                        LLSD native_key_data = gViewerWindow->getWindow()->getNativeKeyData();
+                        
+                        mMediaSource->textInput(wstring_to_utf8str(LLWString(1, uni_char)), gKeyboard->currentMask(FALSE), native_key_data);
                }
        }