From c5adb01ed952df2b0ea47f5ca9700bf49ee6e9e3 Mon Sep 17 00:00:00 2001
From: Siana Gearz <siana.sg@live.de>
Date: Tue, 10 Dec 2013 23:11:07 +0100
Subject: [PATCH] Stop occasional crash during shutdown

---
 indra/llcommon/llapp.cpp           | 2 +-
 indra/newview/llmeshrepository.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/indra/llcommon/llapp.cpp b/indra/llcommon/llapp.cpp
index 40ae4a0a8..c1f925428 100644
--- a/indra/llcommon/llapp.cpp
+++ b/indra/llcommon/llapp.cpp
@@ -554,7 +554,7 @@ bool LLApp::isQuitting()
 // static
 bool LLApp::isExiting()
 {
-	return isQuitting() || isError();
+	return isQuitting() || isError() || isStopped();
 }
 
 void LLApp::disableCrashlogger()
diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp
index d7bac5e12..fb558b3da 100644
--- a/indra/newview/llmeshrepository.cpp
+++ b/indra/newview/llmeshrepository.cpp
@@ -266,7 +266,7 @@ public:
 
 	~LLMeshLODResponder()
 	{
-		if (!LLApp::isQuitting())
+		if (!LLApp::isExiting())
 		{
 			if (!mProcessed)
 			{