port SG2.0 Mediaplugs (webkit supports flash now)

20 files changed, 178 insertions, 67 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();
-
-        LL_DEBUGS("Plugin") << "Sending to plugin: " << buffer << LL_ENDL;
-        LLTimer elapsed;
-        
-        mInstance->sendMessage(buffer);
-
-        mCPUElapsed += elapsed.getElapsedTimeF64();
+        if (mInstance)
+        {
+                std::string buffer = message.generate();
+                
+                LL_DEBUGS("Plugin") << "Sending to plugin: " << buffer << LL_ENDL;
+                LLTimer elapsed;
+                
+                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 
-        // that do crash with a single call to the intercept 
+        // Doesn't appear to be required so far - even for plugins
+        // 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