From 26817149c4646bf0d1c51e30b2eb29e1d52164b6 Mon Sep 17 00:00:00 2001 From: brad kittenbrink Date: Thu, 30 Jul 2009 16:59:45 -0700 Subject: partial work on DEV-35406:crash on shutdown. this doesn't actually fix anything yet though. --- indra/newview/llappviewer.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'indra/newview') diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 17984b8eae..1c3c79db3d 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -1162,7 +1162,9 @@ bool LLAppViewer::cleanup() apr_status_t rv = apr_dso_sym((apr_dso_handle_sym_t*)&ll_plugin_stop_func, *i, "ll_plugin_stop"); ll_plugin_stop_func(); - rv = apr_dso_unload(*i); + // *NOTE - disabled unloading as partial solution to DEV-35406 crash on shutdown + //rv = apr_dso_unload(*i); + (void)rv; } mPlugins.clear(); -- cgit v1.2.3 From 8d35bf28a0ddb0992bf2d87f45494f0724b7df64 Mon Sep 17 00:00:00 2001 From: brad kittenbrink Date: Thu, 30 Jul 2009 19:05:04 -0700 Subject: DEV-36893 make missing eventhost module a non-fatal error. We now print a warning and fail gracefully. --- indra/newview/llappviewer.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'indra/newview') diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 1c3c79db3d..5a1ccb2047 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -4125,6 +4125,12 @@ void LLAppViewer::loadEventHostModule(S32 listen_port) gDirUtilp->getAppRODataDir(), gDirUtilp->getExecutableDir()); + if(dso_path == "") + { + llwarns << "QAModeEventHost requested but module \"" << dso_name << "\" not found!" << llendl; + return; + } + apr_dso_handle_t * eventhost_dso_handle = NULL; apr_pool_t * eventhost_dso_memory_pool = NULL; -- cgit v1.2.3