From d60f16540dba5616cd8260046b44ebc2a1047065 Mon Sep 17 00:00:00 2001 From: Josh Bell Date: Thu, 4 Jan 2007 02:04:29 +0000 Subject: svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@56429 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance@56431 This turned up the following "lost" changes: llapp.cpp (from maintenance r55371) - SIGPIPE fix, possibly llfontgl.cpp (from maintenance r50207) - whitespace only inventorybridge.cpp (property - non-executable) skins/xui/*/* (from maintenance r55380) - XML processing instruction went AWOL --- indra/llcommon/llapp.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/llcommon/llapp.cpp') diff --git a/indra/llcommon/llapp.cpp b/indra/llcommon/llapp.cpp index fda6d89a72..87e7016f39 100644 --- a/indra/llcommon/llapp.cpp +++ b/indra/llcommon/llapp.cpp @@ -499,6 +499,7 @@ void default_unix_signal_handler(int signum, siginfo_t *info, void *) switch (signum) { case SIGALRM: + case SIGPIPE: case SIGUSR2: // We don't care about these signals, ignore them if (LLApp::sLogInSignal) @@ -548,7 +549,6 @@ void default_unix_signal_handler(int signum, siginfo_t *info, void *) // Change the signal that we reraise to SIGABRT, so we generate a core dump. signum = SIGABRT; - case SIGPIPE: case SIGBUS: case SIGSEGV: case SIGQUIT: -- cgit v1.2.3