From 0a7265b1cc8832887702855c5cfc846564d7756b Mon Sep 17 00:00:00 2001 From: Don Kjer Date: Thu, 6 Dec 2007 20:32:46 +0000 Subject: svn merge -r 75234:75235 svn+ssh://svn/svn/linden/branches/maintenance-5 into release Fix for simulator crash (null pointer dereference during lldebugs) --- indra/llmessage/llpumpio.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra') 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() -- cgit v1.2.3