summaryrefslogtreecommitdiff
path: root/indra/llcommon
diff options
context:
space:
mode:
authorAndrew A. de Laix <alain@lindenlab.com>2010-07-02 09:41:47 -0700
committerAndrew A. de Laix <alain@lindenlab.com>2010-07-02 09:41:47 -0700
commit0ad0eaa78f39790e65a2568bce096ca7d150e132 (patch)
treede5f69a0238b60dac4faac42afe85f43226e95a7 /indra/llcommon
parent695671d51e1bb7c1039fffa057d0477210aca308 (diff)
parentbb3114af874ecdc628c2f49ff73b7b60feb2de5e (diff)
Automated merge with ssh://hg.lindenlab.com/q/viewer-release
Diffstat (limited to 'indra/llcommon')
-rw-r--r--indra/llcommon/llapp.cpp10
1 files changed, 10 insertions, 0 deletions
diff --git a/indra/llcommon/llapp.cpp b/indra/llcommon/llapp.cpp
index 0447ca93f5..be3b18d9c8 100644
--- a/indra/llcommon/llapp.cpp
+++ b/indra/llcommon/llapp.cpp
@@ -863,7 +863,13 @@ bool unix_post_minidump_callback(const char *dump_dir,
llinfos << "generated minidump: " << LLApp::instance()->getMiniDumpFilename() << llendl;
LLApp::runErrorHandler();
+
+#ifndef LL_RELEASE_FOR_DOWNLOAD
+ clear_signals();
+ return false;
+#else
return true;
+#endif
}
#endif // !WINDOWS
@@ -920,6 +926,10 @@ bool windows_post_minidump_callback(const wchar_t* dump_path,
ms_sleep(10);
}
+#ifndef LL_RELEASE_FOR_DOWNLOAD
+ return false;
+#else
return true;
+#endif
}
#endif