aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llplugin/llpluginmessagepipe.cpp
diff options
context:
space:
mode:
authorMcCabe Maxsted2011-02-10 11:33:32 -0700
committerMcCabe Maxsted2011-02-10 11:33:32 -0700
commit77d16777c448cc4e09e0ddb1408260044f925c0b (patch)
tree74d6ab3e3a07b673698b760916c9212d69deaff6 /linden/indra/llplugin/llpluginmessagepipe.cpp
parentUse gstreamer plugin for windows audio mime types (diff)
downloadmeta-impy-77d16777c448cc4e09e0ddb1408260044f925c0b.zip
meta-impy-77d16777c448cc4e09e0ddb1408260044f925c0b.tar.gz
meta-impy-77d16777c448cc4e09e0ddb1408260044f925c0b.tar.bz2
meta-impy-77d16777c448cc4e09e0ddb1408260044f925c0b.tar.xz
Patch by Armin to split apart the 'Plugin' logcontrol.xml entry to avoid spam when debugging plugins
Diffstat (limited to 'linden/indra/llplugin/llpluginmessagepipe.cpp')
-rwxr-xr-xlinden/indra/llplugin/llpluginmessagepipe.cpp26
1 files changed, 13 insertions, 13 deletions
diff --git a/linden/indra/llplugin/llpluginmessagepipe.cpp b/linden/indra/llplugin/llpluginmessagepipe.cpp
index 8168b32..26cc9c0 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
@@ -179,18 +179,18 @@ bool LLPluginMessagePipe::pumpOutput()
179 { 179 {
180 // write any outgoing messages 180 // write any outgoing messages
181 size = (apr_size_t)mOutput.size(); 181 size = (apr_size_t)mOutput.size();
182 182
183 setSocketTimeout(0); 183 setSocketTimeout(0);
184 184
185// LL_INFOS("Plugin") << "before apr_socket_send, size = " << size << LL_ENDL; 185// LL_INFOS("PluginPipe") << "before apr_socket_send, size = " << size << LL_ENDL;
186 186
187 status = apr_socket_send( 187 status = apr_socket_send(
188 mSocket->getSocket(), 188 mSocket->getSocket(),
189 (const char*)mOutput.data(), 189 (const char*)mOutput.data(),
190 &size); 190 &size);
191 191
192// LL_INFOS("Plugin") << "after apr_socket_send, size = " << size << LL_ENDL; 192// LL_INFOS("PluginPipe") << "after apr_socket_send, size = " << size << LL_ENDL;
193 193
194 if(status == APR_SUCCESS) 194 if(status == APR_SUCCESS)
195 { 195 {
196 // success 196 // success
@@ -277,15 +277,15 @@ bool LLPluginMessagePipe::pumpInput(F64 timeout)
277 { 277 {
278 size = request_size; 278 size = request_size;
279 279
280// LL_INFOS("Plugin") << "before apr_socket_recv, size = " << size << LL_ENDL; 280// LL_INFOS("PluginPipe") << "before apr_socket_recv, size = " << size << LL_ENDL;
281 281
282 status = apr_socket_recv( 282 status = apr_socket_recv(
283 mSocket->getSocket(), 283 mSocket->getSocket(),
284 input_buf, 284 input_buf,
285 &size); 285 &size);
286 286
287// LL_INFOS("Plugin") << "after apr_socket_recv, size = " << size << LL_ENDL; 287// LL_INFOS("PluginPipe") << "after apr_socket_recv, size = " << size << LL_ENDL;
288 288
289 if(size > 0) 289 if(size > 0)
290 { 290 {
291 LLMutexLock lock(&mInputMutex); 291 LLMutexLock lock(&mInputMutex);
@@ -379,7 +379,7 @@ void LLPluginMessagePipe::processInput(void)
379 } 379 }
380 else 380 else
381 { 381 {
382 LL_WARNS("Plugin") << "!mOwner" << LL_ENDL; 382 LL_WARNS("PluginPipe") << "!mOwner" << LL_ENDL;
383 } 383 }
384 } 384 }
385 mInputMutex.unlock(); 385 mInputMutex.unlock();