2 files changed, 9 insertions, 1 deletions
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();