diff options
Diffstat (limited to 'linden/indra/llplugin/llpluginmessagepipe.cpp')
-rwxr-xr-x | linden/indra/llplugin/llpluginmessagepipe.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/linden/indra/llplugin/llpluginmessagepipe.cpp b/linden/indra/llplugin/llpluginmessagepipe.cpp index ebac3c5..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) | |||
82 | } | 82 | } |
83 | else | 83 | else |
84 | { | 84 | { |
85 | LL_WARNS("Plugin") << "dropping message: " << message << LL_ENDL; | 85 | LL_WARNS("PluginPipe") << "dropping message: " << message << LL_ENDL; |
86 | result = false; | 86 | result = false; |
87 | } | 87 | } |
88 | 88 | ||
89 | return result; | 89 | return result; |
90 | } | 90 | } |
91 | 91 | ||
@@ -177,18 +177,18 @@ bool LLPluginMessagePipe::pumpOutput() | |||
177 | { | 177 | { |
178 | // write any outgoing messages | 178 | // write any outgoing messages |
179 | size = (apr_size_t)mOutput.size(); | 179 | size = (apr_size_t)mOutput.size(); |
180 | 180 | ||
181 | setSocketTimeout(0); | 181 | setSocketTimeout(0); |
182 | 182 | ||
183 | // LL_INFOS("Plugin") << "before apr_socket_send, size = " << size << LL_ENDL; | 183 | // LL_INFOS("PluginPipe") << "before apr_socket_send, size = " << size << LL_ENDL; |
184 | 184 | ||
185 | status = apr_socket_send( | 185 | status = apr_socket_send( |
186 | mSocket->getSocket(), | 186 | mSocket->getSocket(), |
187 | (const char*)mOutput.data(), | 187 | (const char*)mOutput.data(), |
188 | &size); | 188 | &size); |
189 | 189 | ||
190 | // LL_INFOS("Plugin") << "after apr_socket_send, size = " << size << LL_ENDL; | 190 | // LL_INFOS("PluginPipe") << "after apr_socket_send, size = " << size << LL_ENDL; |
191 | 191 | ||
192 | if(status == APR_SUCCESS) | 192 | if(status == APR_SUCCESS) |
193 | { | 193 | { |
194 | // success | 194 | // success |
@@ -275,15 +275,15 @@ bool LLPluginMessagePipe::pumpInput(F64 timeout) | |||
275 | { | 275 | { |
276 | size = request_size; | 276 | size = request_size; |
277 | 277 | ||
278 | // LL_INFOS("Plugin") << "before apr_socket_recv, size = " << size << LL_ENDL; | 278 | // LL_INFOS("PluginPipe") << "before apr_socket_recv, size = " << size << LL_ENDL; |
279 | 279 | ||
280 | status = apr_socket_recv( | 280 | status = apr_socket_recv( |
281 | mSocket->getSocket(), | 281 | mSocket->getSocket(), |
282 | input_buf, | 282 | input_buf, |
283 | &size); | 283 | &size); |
284 | 284 | ||
285 | // LL_INFOS("Plugin") << "after apr_socket_recv, size = " << size << LL_ENDL; | 285 | // LL_INFOS("PluginPipe") << "after apr_socket_recv, size = " << size << LL_ENDL; |
286 | 286 | ||
287 | if(size > 0) | 287 | if(size > 0) |
288 | { | 288 | { |
289 | LLMutexLock lock(&mInputMutex); | 289 | LLMutexLock lock(&mInputMutex); |
@@ -377,7 +377,7 @@ void LLPluginMessagePipe::processInput(void) | |||
377 | } | 377 | } |
378 | else | 378 | else |
379 | { | 379 | { |
380 | LL_WARNS("Plugin") << "!mOwner" << LL_ENDL; | 380 | LL_WARNS("PluginPipe") << "!mOwner" << LL_ENDL; |
381 | } | 381 | } |
382 | } | 382 | } |
383 | mInputMutex.unlock(); | 383 | mInputMutex.unlock(); |