diff options
author | McCabe Maxsted | 2009-01-14 07:56:23 -0700 |
---|---|---|
committer | McCabe Maxsted | 2009-01-14 07:56:23 -0700 |
commit | c25939480d6134c200a14ecab23eee60b175596f (patch) | |
tree | 0ed050b7005f87062e11fe1044c3a1c838ecc412 /linden/indra/llmessage/llpumpio.cpp | |
parent | Added the 'Return to World' inventory option (diff) | |
download | meta-impy-c25939480d6134c200a14ecab23eee60b175596f.zip meta-impy-c25939480d6134c200a14ecab23eee60b175596f.tar.gz meta-impy-c25939480d6134c200a14ecab23eee60b175596f.tar.bz2 meta-impy-c25939480d6134c200a14ecab23eee60b175596f.tar.xz |
Updated llmessage
Diffstat (limited to '')
-rw-r--r-- | linden/indra/llmessage/llpumpio.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/linden/indra/llmessage/llpumpio.cpp b/linden/indra/llmessage/llpumpio.cpp index 6adf9c2..9ce0bab 100644 --- a/linden/indra/llmessage/llpumpio.cpp +++ b/linden/indra/llmessage/llpumpio.cpp | |||
@@ -41,6 +41,7 @@ | |||
41 | #include "llapr.h" | 41 | #include "llapr.h" |
42 | #include "llmemtype.h" | 42 | #include "llmemtype.h" |
43 | #include "llstl.h" | 43 | #include "llstl.h" |
44 | #include "llstat.h" | ||
44 | 45 | ||
45 | // These should not be enabled in production, but they can be | 46 | // These should not be enabled in production, but they can be |
46 | // intensely useful during development for finding certain kinds of | 47 | // intensely useful during development for finding certain kinds of |
@@ -521,7 +522,10 @@ void LLPumpIO::pump(const S32& poll_timeout) | |||
521 | //llinfos << "polling" << llendl; | 522 | //llinfos << "polling" << llendl; |
522 | S32 count = 0; | 523 | S32 count = 0; |
523 | S32 client_id = 0; | 524 | S32 client_id = 0; |
524 | apr_pollset_poll(mPollset, poll_timeout, &count, &poll_fd); | 525 | { |
526 | LLPerfBlock polltime("pump_poll"); | ||
527 | apr_pollset_poll(mPollset, poll_timeout, &count, &poll_fd); | ||
528 | } | ||
525 | PUMP_DEBUG; | 529 | PUMP_DEBUG; |
526 | for(S32 ii = 0; ii < count; ++ii) | 530 | for(S32 ii = 0; ii < count; ++ii) |
527 | { | 531 | { |