11 files changed, 56 insertions, 9 deletions

diff --git a/linden/indra/llplugin/CMakeLists.txt b/linden/indra/llplugin/CMakeLists.txt
index 7a7f4e5..5dbe07c 100644
--- a/linden/indra/llplugin/CMakeLists.txt
+++ b/linden/indra/llplugin/CMakeLists.txt
@@ -20,7 +20,6 @@ include_directories(
     ${LLRENDER_INCLUDE_DIRS}
     ${LLXML_INCLUDE_DIRS}
     ${LLWINDOW_INCLUDE_DIRS}
-    ${LLQTWEBKIT_INCLUDE_DIR}
     )
 
 set(llplugin_SOURCE_FILES
diff --git a/linden/indra/llplugin/llpluginclassmedia.cpp b/linden/indra/llplugin/llpluginclassmedia.cpp
index 5a81c46..f0a44f7 100755
--- a/linden/indra/llplugin/llpluginclassmedia.cpp
+++ b/linden/indra/llplugin/llpluginclassmedia.cpp
@@ -33,14 +33,14 @@
  * @endcond
  */
 
+/// IMPRUDENCE: this is part of the viewer
+
 #include "linden_common.h"
 #include "indra_constants.h"
 
 #include "llpluginclassmedia.h"
 #include "llpluginmessageclasses.h"
 
-#include "llqtwebkit.h"
-
 static int LOW_PRIORITY_TEXTURE_SIZE_DEFAULT = 256;
 
 static int nextPowerOf2( int value )
@@ -777,7 +777,7 @@ void LLPluginClassMedia::receivePluginMessage(const LLPluginMessage &message)
                                         mDirtyRect.unionWith(newDirtyRect);
                                 }
 
-                                LL_DEBUGS("PluginClassMedia") << "adjusted incoming rect is: ("
+                                LL_DEBUGS("PluginClassMediaRect") << "adjusted incoming rect is: ("
                                         << newDirtyRect.mLeft << ", "
                                         << newDirtyRect.mTop << ", "
                                         << newDirtyRect.mRight << ", "
@@ -973,6 +973,7 @@ void LLPluginClassMedia::receivePluginMessage(const LLPluginMessage &message)
                 {
                         mClickURL = message.getValue("uri");
                         mClickTarget = message.getValue("target");
+                        LL_DEBUGS("PluginClassMedia") << "Click target \"" << mClickTarget << "\"" << LL_ENDL;
                         mediaEvent(LLPluginClassMediaOwner::MEDIA_EVENT_CLICK_LINK_HREF);
                 }
                 else if(message_name == "click_nofollow")
diff --git a/linden/indra/llplugin/llpluginclassmediaowner.h b/linden/indra/llplugin/llpluginclassmediaowner.h
index 9d1f352..0e54f7f 100755
--- a/linden/indra/llplugin/llpluginclassmediaowner.h
+++ b/linden/indra/llplugin/llpluginclassmediaowner.h
@@ -41,7 +41,7 @@
 #include <queue>
 
 class LLPluginClassMedia;
-class LLPluginCookieStore;
+//class LLPluginCookieStore; // IMPRUDENCE: this is currently not used 
 
 class LLPluginClassMediaOwner
 {
diff --git a/linden/indra/llplugin/llplugincookiestore.cpp b/linden/indra/llplugin/llplugincookiestore.cpp
index 283ba35..6b193de 100644
--- a/linden/indra/llplugin/llplugincookiestore.cpp
+++ b/linden/indra/llplugin/llplugincookiestore.cpp
@@ -33,6 +33,8 @@
  * @endcond
  */
 
+/// IMPRUDENCE: this is currently not used
+
 #include "linden_common.h"
 #include "indra_constants.h"
 
diff --git a/linden/indra/llplugin/llplugininstance.cpp b/linden/indra/llplugin/llplugininstance.cpp
index 67457f2..399f157 100755
--- a/linden/indra/llplugin/llplugininstance.cpp
+++ b/linden/indra/llplugin/llplugininstance.cpp
@@ -33,6 +33,8 @@
  * @endcond
  */
 
+/// IMPRUDENCE: this is part of the SLPlugin
+
 #include "linden_common.h"
 
 #include "llplugininstance.h"
diff --git a/linden/indra/llplugin/llpluginmessage.cpp b/linden/indra/llplugin/llpluginmessage.cpp
index 6452f4a..0810a04 100755
--- a/linden/indra/llplugin/llpluginmessage.cpp
+++ b/linden/indra/llplugin/llpluginmessage.cpp
@@ -33,6 +33,8 @@
  * @endcond
  */
 
+/// IMPRUDENCE: this is part of the viewer and the SLPlugin and the libmedia_plugin_* libraries
+
 #include "linden_common.h"
 
 #include "llpluginmessage.h"
diff --git a/linden/indra/llplugin/llpluginmessagepipe.cpp b/linden/indra/llplugin/llpluginmessagepipe.cpp
index ac3a902..2cad188 100755
--- a/linden/indra/llplugin/llpluginmessagepipe.cpp
+++ b/linden/indra/llplugin/llpluginmessagepipe.cpp
@@ -33,6 +33,8 @@
  * @endcond
  */
 
+/// IMPRUDENCE: this is part of the viewer and the SLPlugin
+
 #include "linden_common.h"
 
 #include "llpluginmessagepipe.h"
diff --git a/linden/indra/llplugin/llpluginprocesschild.cpp b/linden/indra/llplugin/llpluginprocesschild.cpp
index a1291c0..0d95cac 100755
--- a/linden/indra/llplugin/llpluginprocesschild.cpp
+++ b/linden/indra/llplugin/llpluginprocesschild.cpp
@@ -33,6 +33,8 @@
  * @endcond
  */
 
+/// IMPRUDENCE: this is part of the SLPlugin
+
 #include "linden_common.h"
 
 #include "llpluginprocesschild.h"
diff --git a/linden/indra/llplugin/llpluginprocessparent.cpp b/linden/indra/llplugin/llpluginprocessparent.cpp
index 5a66279..26572a0 100755
--- a/linden/indra/llplugin/llpluginprocessparent.cpp
+++ b/linden/indra/llplugin/llpluginprocessparent.cpp
@@ -33,6 +33,8 @@
  * @endcond
  */
 
+/// IMPRUDENCE: this is part of the viewer
+
 #include "linden_common.h"
 
 #include "llpluginprocessparent.h"
diff --git a/linden/indra/llplugin/llpluginsharedmemory.cpp b/linden/indra/llplugin/llpluginsharedmemory.cpp
index 6becb8d..882a2a1 100755
--- a/linden/indra/llplugin/llpluginsharedmemory.cpp
+++ b/linden/indra/llplugin/llpluginsharedmemory.cpp
@@ -33,6 +33,8 @@
  * @endcond
  */
 
+/// IMPRUDENCE: this is part of the viewer and the SLPlugin
+
 #include "linden_common.h"
 
 #include "llpluginsharedmemory.h"
@@ -89,7 +91,6 @@
 #include <windows.h>
 #endif // USE_APR_SHARED_MEMORY
 
-
 int LLPluginSharedMemory::sSegmentNumber = 0;
 
 std::string LLPluginSharedMemory::createName(void)
diff --git a/linden/indra/llplugin/slplugin/slplugin.cpp b/linden/indra/llplugin/slplugin/slplugin.cpp
index 878577b..4ef24a2 100755
--- a/linden/indra/llplugin/slplugin/slplugin.cpp
+++ b/linden/indra/llplugin/slplugin/slplugin.cpp
@@ -35,6 +35,7 @@
  * @endcond
  */
 
+/// IMPRUDENCE: this is part of the SLPlugin
 
 #include "linden_common.h"
 
@@ -53,6 +54,20 @@
         #include <signal.h>
 #endif
 
+//imprudence: or we include lldir, or use apache runtime
+//though the one is probably bloat and the other we rather want to avoid
+#include <stdio.h>  // FILENAME_MAX
+#ifdef LL_WINDOWS
+    #include <direct.h>
+    #define getImpruDir _getcwd
+    #define DIR_DELIMITER "\\"
+#else
+    #include <unistd.h>
+    #define getImpruDir getcwd
+    #define DIR_DELIMITER "/"
+#endif
+
+
 /*
         On Mac OS, since we call WaitNextEvent, this process will show up in the dock unless we set the LSBackgroundOnly or LSUIElement flag in the Info.plist.
 
@@ -187,9 +202,28 @@ int main(int argc, char **argv)
 {
         // Set up llerror logging
         {
-                LLError::initForApplication(".");
-                LLError::setDefaultLevel(LLError::LEVEL_INFO);
-//              LLError::setTagLevel("Plugin", LLError::LEVEL_DEBUG);
+                std::string path;
+                char impruPath[FILENAME_MAX];
+
+                if (!getImpruDir(impruPath, sizeof(impruPath)))
+                {
+                        path = "."; //FIXME: root directory of the system - bad idea
+                }
+                else
+                {
+                        path = std::string(impruPath);
+
+                        path.append(DIR_DELIMITER);
+                        path.append("app_settings");
+                }
+                LLError::initForApplication(path);
+//              LLError::setDefaultLevel(LLError::LEVEL_INFO);
+//              LLError::setPrintLocation(true);
+//              LLError::setTagLevel("Plugin", LLError::LEVEL_DEBUG);
+//              LLError::setTagLevel("PluginPipe", LLError::LEVEL_DEBUG);
+//              LLError::setTagLevel("PluginChild", LLError::LEVEL_DEBUG);
+//              LLError::setTagLevel("PluginInstance", LLError::LEVEL_DEBUG);
+
 //              LLError::logToFile("slplugin.log");
         }