#3795 Crash at getVolatileAPRPool()

3 files changed, 20 insertions, 2 deletions

diff --git a/indra/llui/llcommandmanager.cpp b/indra/llui/llcommandmanager.cpp
index 03717da80b..b10ec51f18 100644
--- a/indra/llui/llcommandmanager.cpp
+++ b/indra/llui/llcommandmanager.cpp
@@ -170,12 +170,14 @@ bool LLCommandManager::load()
 
     if (!parser.readXUI(commands_file, commandsParams))
     {
+        LLError::LLUserWarningMsg::showMissingFiles();
         LL_ERRS() << "Unable to load xml file: " << commands_file << LL_ENDL;
         return false;
     }
 
     if (!commandsParams.validateBlock())
     {
+        LLError::LLUserWarningMsg::showMissingFiles();
         LL_ERRS() << "Invalid commands file: " << commands_file << LL_ENDL;
         return false;
     }
diff --git a/indra/llui/llnotifications.cpp b/indra/llui/llnotifications.cpp
index 634d8f71a2..a05feab1d9 100644
--- a/indra/llui/llnotifications.cpp
+++ b/indra/llui/llnotifications.cpp
@@ -1256,10 +1256,26 @@ LLNotifications::LLNotifications()
     LLInstanceTracker<LLNotificationChannel, std::string>::instanceCount();
 }
 
+
+LLNotifications::~LLNotifications()
+{
+    // Clear explicitly, something in ~LLNotifications() crashes so narrowing down suspects
+    pHistoryChannel = nullptr;
+    pExpirationChannel = nullptr;
+    mGlobalStrings.clear();
+    mTemplates.clear();
+    mVisibilityRules.clear();
+    mUniqueNotifications.clear();
+    mListener = nullptr;
+}
+
 void LLNotifications::clear()
 {
     mDefaultChannels.clear();
-    mTemplates.clear();
+    // At this point mTemplates still gets used by lingering notifications
+    // to do responses (ex: group notice will call forceResponse()), but
+    // since network should be down and everything save, it's questionable
+    // whether it should stay that way
 }
 
 // The expiration channel gets all notifications that are cancelled
diff --git a/indra/llui/llnotifications.h b/indra/llui/llnotifications.h
index 46286457cf..138f1969d5 100644
--- a/indra/llui/llnotifications.h
+++ b/indra/llui/llnotifications.h
@@ -887,7 +887,7 @@ class LLNotifications :
 {
     LLSINGLETON(LLNotifications);
     LOG_CLASS(LLNotifications);
-    virtual ~LLNotifications() {}
+    virtual ~LLNotifications();
 
 public: