summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorSteven Bennetts <steve@lindenlab.com>2009-06-21 17:51:35 +0000
committerSteven Bennetts <steve@lindenlab.com>2009-06-21 17:51:35 +0000
commit33dbf1107689cdca796ad708177063010726160a (patch)
tree0d12103b49b3efa1818beb38d90a116b527bb1fb /indra
parentade6bbb06c6a842f39a3fe32decf7c66682df092 (diff)
Fixed a shutdown crash.
Diffstat (limited to 'indra')
-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()