1 files changed, 29 insertions, 29 deletions

diff --git a/linden/indra/llplugin/llpluginprocesschild.cpp b/linden/indra/llplugin/llpluginprocesschild.cpp
index 8dbf2b3..a1291c0 100755
--- a/linden/indra/llplugin/llpluginprocesschild.cpp
+++ b/linden/indra/llplugin/llpluginprocesschild.cpp
@@ -47,7 +47,7 @@ LLPluginProcessChild::LLPluginProcessChild()
 {
         mState = STATE_UNINITIALIZED;
         mInstance = NULL;
-        mSocket = LLSocket::create(gAPRPoolp, LLSocket::STREAM_TCP);
+        mSocket = LLSocket::create(LLSocket::STREAM_TCP);
         mSleepTime = PLUGIN_IDLE_SECONDS;       // default: send idle messages at 100Hz
         mCPUElapsed = 0.0f;
         mBlockingRequest = false;
@@ -94,18 +94,18 @@ void LLPluginProcessChild::idle(void)
                 }
                 else if(mSocketError != APR_SUCCESS)
                 {
-                        LL_INFOS("Plugin") << "message pipe is in error state (" << mSocketError << "), moving to STATE_ERROR"<< LL_ENDL;
+                        LL_INFOS("PluginChild") << "message pipe is in error state (" << mSocketError << "), moving to STATE_ERROR"<< LL_ENDL;
                         setState(STATE_ERROR);
-                }       
+                }
 
                 if((mState > STATE_INITIALIZED) && (mMessagePipe == NULL))
                 {
                         // The pipe has been closed -- we're done.
                         // TODO: This could be slightly more subtle, but I'm not sure it needs to be.
-                        LL_INFOS("Plugin") << "message pipe went away, moving to STATE_ERROR"<< LL_ENDL;
+                        LL_INFOS("PluginChild") << "message pipe went away, moving to STATE_ERROR"<< LL_ENDL;
                         setState(STATE_ERROR);
                 }
-        
+
                 // If a state needs to go directly to another state (as a performance enhancement), it can set idle_again to true after calling setState().
                 // USE THIS CAREFULLY, since it can starve other code.  Specifically make sure there's no way to get into a closed cycle and never return.
                 // When in doubt, don't do it.
@@ -291,17 +291,17 @@ void LLPluginProcessChild::sendMessageToPlugin(const LLPluginMessage &message)
         if (mInstance)
         {
                 std::string buffer = message.generate();
-                
-                LL_DEBUGS("Plugin") << "Sending to plugin: " << buffer << LL_ENDL;
+
+                LL_DEBUGS("PluginChild") << "Sending to plugin: " << buffer << LL_ENDL;
                 LLTimer elapsed;
-                
+
                 mInstance->sendMessage(buffer);
                 
                 mCPUElapsed += elapsed.getElapsedTimeF64();
         }
         else
         {
-                LL_WARNS("Plugin") << "mInstance == NULL" << LL_ENDL;
+                LL_WARNS("PluginChild") << "mInstance == NULL" << LL_ENDL;
         }
 }
 
@@ -309,7 +309,7 @@ void LLPluginProcessChild::sendMessageToParent(const LLPluginMessage &message)
 {
         std::string buffer = message.generate();
 
-        LL_DEBUGS("Plugin") << "Sending to parent: " << buffer << LL_ENDL;
+        LL_DEBUGS("PluginChild") << "Sending to parent: " << buffer << LL_ENDL;
 
         writeMessageRaw(buffer);
 }
@@ -318,7 +318,7 @@ void LLPluginProcessChild::receiveMessageRaw(const std::string &message)
 {
         // Incoming message from the TCP Socket
 
-        LL_DEBUGS("Plugin") << "Received from parent: " << message << LL_ENDL;
+        LL_DEBUGS("PluginChild") << "Received from parent: " << message << LL_ENDL;
 
         // Decode this message
         LLPluginMessage parsed;
@@ -365,7 +365,7 @@ void LLPluginProcessChild::receiveMessageRaw(const std::string &message)
                                 if(iter != mSharedMemoryRegions.end())
                                 {
                                         // Need to remove the old region first
-                                        LL_WARNS("Plugin") << "Adding a duplicate shared memory segment!" << LL_ENDL;
+                                        LL_WARNS("PluginChild") << "Adding a duplicate shared memory segment!" << LL_ENDL;
                                 }
                                 else
                                 {
@@ -392,7 +392,7 @@ void LLPluginProcessChild::receiveMessageRaw(const std::string &message)
                                         }
                                         else
                                         {
-                                                LL_WARNS("Plugin") << "Couldn't create a shared memory segment!" << LL_ENDL;
+                                                LL_WARNS("PluginChild") << "Couldn't create a shared memory segment!" << LL_ENDL;
                                                 delete region;
                                         }
                                 }
@@ -411,7 +411,7 @@ void LLPluginProcessChild::receiveMessageRaw(const std::string &message)
                                 }
                                 else
                                 {
-                                        LL_WARNS("Plugin") << "shm_remove for unknown memory segment!" << LL_ENDL;
+                                        LL_WARNS("PluginChild") << "shm_remove for unknown memory segment!" << LL_ENDL;
                                 }
                         }
                         else if(message_name == "sleep_time")
@@ -421,12 +421,12 @@ void LLPluginProcessChild::receiveMessageRaw(const std::string &message)
                         else if(message_name == "crash")
                         {
                                 // Crash the plugin
-                                LL_ERRS("Plugin") << "Plugin crash requested." << LL_ENDL;
+                                LL_ERRS("PluginChild") << "Plugin crash requested." << LL_ENDL;
                         }
                         else if(message_name == "hang")
                         {
                                 // Hang the plugin
-                                LL_WARNS("Plugin") << "Plugin hang requested." << LL_ENDL;
+                                LL_WARNS("PluginChild") << "Plugin hang requested." << LL_ENDL;
                                 while(1)
                                 {
                                         // wheeeeeeeee......
@@ -434,7 +434,7 @@ void LLPluginProcessChild::receiveMessageRaw(const std::string &message)
                         }
                         else
                         {
-                                LL_WARNS("Plugin") << "Unknown internal message from parent: " << message_name << LL_ENDL;
+                                LL_WARNS("PluginChild") << "Unknown internal message from parent: " << message_name << LL_ENDL;
                         }
                 }
         }
@@ -449,17 +449,17 @@ void LLPluginProcessChild::receiveMessageRaw(const std::string &message)
         }
 }
 
-/* virtual */ 
+/* virtual */
 void LLPluginProcessChild::receivePluginMessage(const std::string &message)
 {
-        LL_DEBUGS("Plugin") << "Received from plugin: " << message << LL_ENDL;
-        
+        LL_DEBUGS("PluginChild") << "Received from plugin: " << message << LL_ENDL;
+
         if(mBlockingRequest)
         {
-                // 
-                LL_ERRS("Plugin") << "Can't send a message while already waiting on a blocking request -- aborting!" << LL_ENDL;
+                //
+                LL_ERRS("PluginChild") << "Can't send a message while already waiting on a blocking request -- aborting!" << LL_ENDL;
         }
-        
+
         // Incoming message from the plugin instance
         bool passMessage = true;
 
@@ -523,18 +523,18 @@ void LLPluginProcessChild::receivePluginMessage(const std::string &message)
                                 }
                                 else
                                 {
-                                        LL_WARNS("Plugin") << "shm_remove_response for unknown memory segment!" << LL_ENDL;
+                                        LL_WARNS("PluginChild") << "shm_remove_response for unknown memory segment!" << LL_ENDL;
                                 }
                         }
                 }
         }
-        
+
         if(passMessage)
         {
-                LL_DEBUGS("Plugin") << "Passing through to parent: " << message << LL_ENDL;
+                LL_DEBUGS("PluginChild") << "Passing through to parent: " << message << LL_ENDL;
                 writeMessageRaw(message);
         }
-        
+
         while(mBlockingRequest)
         {
                 // The plugin wants to block and wait for a response to this message.
@@ -552,8 +552,8 @@ void LLPluginProcessChild::receivePluginMessage(const std::string &message)
 
 void LLPluginProcessChild::setState(EState state)
 {
-        LL_DEBUGS("Plugin") << "setting state to " << state << LL_ENDL;
-        mState = state; 
+        LL_DEBUGS("PluginChild") << "setting state to " << state << LL_ENDL;
+        mState = state;
 };
 
 void LLPluginProcessChild::deliverQueuedMessages()