diff options
| author | Mnikolenko Productengine <mnikolenko@productengine.com> | 2016-12-13 17:21:01 +0200 |
|---|---|---|
| committer | Mnikolenko Productengine <mnikolenko@productengine.com> | 2016-12-13 17:21:01 +0200 |
| commit | bde862084d76eb4b9d773e10fdde6bfd3df57f7a (patch) | |
| tree | e49fed4110073a6ee890ca77f20eae6eb5b1c279 /indra/newview | |
| parent | 26511f5b87dac96f6f06f36c13806707b332153d (diff) | |
MAINT-7002 Crash in LLConversationViewSession::handleMouseUp()
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llconversationview.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llconversationview.cpp b/indra/newview/llconversationview.cpp index d147d214a3..15a8aacd37 100644 --- a/indra/newview/llconversationview.cpp +++ b/indra/newview/llconversationview.cpp @@ -303,7 +303,7 @@ BOOL LLConversationViewSession::handleMouseUp( S32 x, S32 y, MASK mask ) LLConversationItem* item = dynamic_cast<LLConversationItem *>(getViewModelItem()); LLUUID session_id = item? item->getUUID() : LLUUID(); LLFloaterIMSessionTab* session_floater = LLFloaterIMSessionTab::findConversation(session_id); - if(!session_floater->hasFocus()) + if(session_floater && !session_floater->hasFocus()) { session_floater->setFocus(true); } |