summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--indra/newview/llbottomtray.cpp5
1 files changed, 4 insertions, 1 deletions
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()