diff options
| author | Seth ProductEngine <slitovchuk@productengine.com> | 2012-06-13 19:26:17 +0300 |
|---|---|---|
| committer | Seth ProductEngine <slitovchuk@productengine.com> | 2012-06-13 19:26:17 +0300 |
| commit | b50349ab8490c9b48e9cf89b8de186b528d90e60 (patch) | |
| tree | 692fe78ab1379332539698710bb2852b19d58eba /indra/newview/llimfloater.cpp | |
| parent | 9993fa550ab3716e583a6d5699f27974c3a95eb9 (diff) | |
CHUI-120 WIP Fix for crash after closing the chat floater.
Diffstat (limited to 'indra/newview/llimfloater.cpp')
| -rw-r--r-- | indra/newview/llimfloater.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llimfloater.cpp b/indra/newview/llimfloater.cpp index dcd19b5856..3458e740e7 100644 --- a/indra/newview/llimfloater.cpp +++ b/indra/newview/llimfloater.cpp @@ -487,6 +487,10 @@ void LLIMFloater::onAvatarNameCache(const LLUUID& agent_id, // virtual BOOL LLIMFloater::tick() { + // This check is needed until LLFloaterReg::removeInstance() is synchronized with deleting the floater + // via LLMortician::updateClass(), to avoid calling dead instances. See LLFloater::destroy(). + if (isDead()) return false; + BOOL parents_retcode = LLIMConversation::tick(); if ( mMeTyping ) |