From 33dbf1107689cdca796ad708177063010726160a Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Sun, 21 Jun 2009 17:51:35 +0000
Subject: Fixed a shutdown crash.

---
 indra/newview/llbottomtray.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llbottomtray.cpp b/indra/newview/llbottomtray.cpp
index f33dd2a32a..616cbb1fdb 100644
--- a/indra/newview/llbottomtray.cpp
+++ b/indra/newview/llbottomtray.cpp
@@ -59,7 +59,10 @@ LLBottomTray::LLBottomTray()
 
 LLBottomTray::~LLBottomTray()
 {
-	LLIMMgr::getInstance()->removeSessionObserver(this);
+	if (!LLSingleton<LLIMMgr>::destroyed())
+	{
+		LLIMMgr::getInstance()->removeSessionObserver(this);
+	}
 }
 
 LLLineEditor* LLBottomTray::getChatBox()
-- 
cgit v1.2.3