From e2544fabe5f63201ca11102aa9b4266cb62211bd Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Mon, 18 May 2015 13:10:26 -0400
Subject: MAINT-5222 WIP - checks for app shutting down a couple of places.

---
 indra/newview/llappearancemgr.cpp  | 5 ++++-
 indra/newview/llattachmentsmgr.cpp | 5 +++++
 2 files changed, 9 insertions(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index dabb3df7af..c13edb9915 100755
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -528,7 +528,10 @@ LLUpdateAppearanceAndEditWearableOnDestroy::LLUpdateAppearanceAndEditWearableOnD
 LLRequestServerAppearanceUpdateOnDestroy::~LLRequestServerAppearanceUpdateOnDestroy()
 {
 	LL_DEBUGS("Avatar") << "ATT requesting server appearance update" << LL_ENDL;
-	LLAppearanceMgr::instance().requestServerAppearanceUpdate();
+    if (!LLApp::isExiting())
+    {
+        LLAppearanceMgr::instance().requestServerAppearanceUpdate();
+    }
 }
 
 void edit_wearable_and_customize_avatar(LLUUID item_id)
diff --git a/indra/newview/llattachmentsmgr.cpp b/indra/newview/llattachmentsmgr.cpp
index 799a25ddc9..2a137cc39b 100755
--- a/indra/newview/llattachmentsmgr.cpp
+++ b/indra/newview/llattachmentsmgr.cpp
@@ -99,6 +99,11 @@ void LLAttachmentsMgr::onIdle()
 		return;
 	}
 
+    if (LLApp::isExiting())
+    {
+        return;
+    }
+
 	requestPendingAttachments();
 
     linkRecentlyArrivedAttachments();
-- 
cgit v1.2.3