1 files changed, 14 insertions, 15 deletions

diff --git a/linden/indra/llplugin/llplugininstance.cpp b/linden/indra/llplugin/llplugininstance.cpp
index b822b9e..67457f2 100755
--- a/linden/indra/llplugin/llplugininstance.cpp
+++ b/linden/indra/llplugin/llplugininstance.cpp
@@ -36,8 +36,7 @@
 #include "linden_common.h"
 
 #include "llplugininstance.h"
-
-#include "llapr.h"
+#include "aiaprpool.h"
 
 /** Virtual destructor. */
 LLPluginInstanceMessageListener::~LLPluginInstanceMessageListener()
@@ -86,16 +85,16 @@ int LLPluginInstance::load(std::string &plugin_file)
         
         int result = apr_dso_load(&mDSOHandle,
                                           plugin_file.c_str(),
-                                          gAPRPoolp);
+                                          AIAPRRootPool::get()());
         if(result != APR_SUCCESS)
         {
                 char buf[1024];
                 apr_dso_error(mDSOHandle, buf, sizeof(buf));
 
-                LL_WARNS("Plugin") << "apr_dso_load of " << plugin_file << " failed with error " << result << " , additional info string: " << buf << LL_ENDL;
-                
+                LL_WARNS("PluginInstance") << "apr_dso_load of " << plugin_file << " failed with error " << result << " , additional info string: " << buf << LL_ENDL;
+
         }
-        
+
         if(result == APR_SUCCESS)
         {
                 result = apr_dso_sym((apr_dso_handle_sym_t*)&init_function,
@@ -104,20 +103,20 @@ int LLPluginInstance::load(std::string &plugin_file)
 
                 if(result != APR_SUCCESS)
                 {
-                        LL_WARNS("Plugin") << "apr_dso_sym failed with error " << result << LL_ENDL;
+                        LL_WARNS("PluginInstance") << "apr_dso_sym failed with error " << result << LL_ENDL;
                 }
         }
-        
+
         if(result == APR_SUCCESS)
         {
                 result = init_function(staticReceiveMessage, (void*)this, &mPluginSendMessageFunction, &mPluginUserData);
 
                 if(result != APR_SUCCESS)
                 {
-                        LL_WARNS("Plugin") << "call to init function failed with error " << result << LL_ENDL;
+                        LL_WARNS("PluginInstance") << "call to init function failed with error " << result << LL_ENDL;
                 }
         }
-        
+
         return (int)result;
 }
 
@@ -130,12 +129,12 @@ void LLPluginInstance::sendMessage(const std::string &message)
 {
         if(mPluginSendMessageFunction)
         {
-                LL_DEBUGS("Plugin") << "sending message to plugin: \"" << message << "\"" << LL_ENDL;
+                LL_DEBUGS("PluginInstance") << "sending message to plugin: \"" << message << "\"" << LL_ENDL;
                 mPluginSendMessageFunction(message.c_str(), &mPluginUserData);
         }
         else
         {
-                LL_WARNS("Plugin") << "dropping message: \"" << message << "\"" << LL_ENDL;
+                LL_WARNS("PluginInstance") << "dropping message: \"" << message << "\"" << LL_ENDL;
         }
 }
 
@@ -165,11 +164,11 @@ void LLPluginInstance::receiveMessage(const char *message_string)
 {
         if(mOwner)
         {
-                LL_DEBUGS("Plugin") << "processing incoming message: \"" << message_string << "\"" << LL_ENDL;          
+                LL_DEBUGS("PluginInstance") << "processing incoming message: \"" << message_string << "\"" << LL_ENDL;
                 mOwner->receivePluginMessage(message_string);
         }
         else
         {
-                LL_WARNS("Plugin") << "dropping incoming message: \"" << message_string << "\"" << LL_ENDL;             
-        }       
+                LL_WARNS("PluginInstance") << "dropping incoming message: \"" << message_string << "\"" << LL_ENDL;
+        }
 }