1 files changed, 13 insertions, 15 deletions

diff --git a/linden/indra/llplugin/llpluginmessagepipe.cpp b/linden/indra/llplugin/llpluginmessagepipe.cpp
index 8168b32..ac3a902 100755
--- a/linden/indra/llplugin/llpluginmessagepipe.cpp
+++ b/linden/indra/llplugin/llpluginmessagepipe.cpp
@@ -82,10 +82,10 @@ bool LLPluginMessagePipeOwner::writeMessageRaw(const std::string &message)
         }
         else
         {
-                LL_WARNS("Plugin") << "dropping message: " << message << LL_ENDL;
+                LL_WARNS("PluginPipe") << "dropping message: " << message << LL_ENDL;
                 result = false;
         }
-        
+
         return result;
 }
 
@@ -99,8 +99,6 @@ void LLPluginMessagePipeOwner::killMessagePipe(void)
 }
 
 LLPluginMessagePipe::LLPluginMessagePipe(LLPluginMessagePipeOwner *owner, LLSocket::ptr_t socket):
-        mInputMutex(gAPRPoolp),
-        mOutputMutex(gAPRPoolp),
         mOwner(owner),
         mSocket(socket)
 {
@@ -179,18 +177,18 @@ bool LLPluginMessagePipe::pumpOutput()
                 {
                         // write any outgoing messages
                         size = (apr_size_t)mOutput.size();
-                        
+
                         setSocketTimeout(0);
-                        
-//                      LL_INFOS("Plugin") << "before apr_socket_send, size = " << size << LL_ENDL;
+
+//                      LL_INFOS("PluginPipe") << "before apr_socket_send, size = " << size << LL_ENDL;
 
                         status = apr_socket_send(
                                         mSocket->getSocket(),
                                         (const char*)mOutput.data(),
                                         &size);
 
-//                      LL_INFOS("Plugin") << "after apr_socket_send, size = " << size << LL_ENDL;
-                        
+//                      LL_INFOS("PluginPipe") << "after apr_socket_send, size = " << size << LL_ENDL;
+
                         if(status == APR_SUCCESS)
                         {
                                 // success
@@ -277,15 +275,15 @@ bool LLPluginMessagePipe::pumpInput(F64 timeout)
                         {
                                 size = request_size;
 
-//                              LL_INFOS("Plugin") << "before apr_socket_recv, size = " << size << LL_ENDL;
+//                              LL_INFOS("PluginPipe") << "before apr_socket_recv, size = " << size << LL_ENDL;
 
                                 status = apr_socket_recv(
-                                                mSocket->getSocket(), 
-                                                input_buf, 
+                                                mSocket->getSocket(),
+                                                input_buf,
                                                 &size);
 
-//                              LL_INFOS("Plugin") << "after apr_socket_recv, size = " << size << LL_ENDL;
-                                
+//                              LL_INFOS("PluginPipe") << "after apr_socket_recv, size = " << size << LL_ENDL;
+
                                 if(size > 0)
                                 {
                                         LLMutexLock lock(&mInputMutex);
@@ -379,7 +377,7 @@ void LLPluginMessagePipe::processInput(void)
                 }
                 else
                 {
-                        LL_WARNS("Plugin") << "!mOwner" << LL_ENDL;
+                        LL_WARNS("PluginPipe") << "!mOwner" << LL_ENDL;
                 }
         }
         mInputMutex.unlock();