diff options
| author | Don Kjer <don@lindenlab.com> | 2007-12-06 20:32:46 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2007-12-06 20:32:46 +0000 |
| commit | 0a7265b1cc8832887702855c5cfc846564d7756b (patch) | |
| tree | 8f0ff047221a8f71d28119c6878817d3f42cfec4 /indra/llmessage | |
| parent | 9754d265eb70a0e137cce1562df8d59dd74093af (diff) | |
svn merge -r 75234:75235 svn+ssh://svn/svn/linden/branches/maintenance-5 into release
Fix for simulator crash (null pointer dereference during lldebugs)
Diffstat (limited to 'indra/llmessage')
| -rw-r--r-- | indra/llmessage/llpumpio.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llmessage/llpumpio.cpp b/indra/llmessage/llpumpio.cpp index 7644738cfd..b87b66822c 100644 --- a/indra/llmessage/llpumpio.cpp +++ b/indra/llmessage/llpumpio.cpp @@ -305,7 +305,7 @@ bool LLPumpIO::setConditional(LLIOPipe* pipe, const apr_pollfd_t* poll) if(!pipe) return false; ll_debug_poll_fd("Set conditional", poll); - lldebugs << "Setting conditionals (" << events_2_string(poll->reqevents) + lldebugs << "Setting conditionals (" << (poll ? events_2_string(poll->reqevents) :"null") << ") " #if LL_DEBUG_PIPE_TYPE_IN_PUMP << "on pipe " << typeid(*pipe).name() |