From bde862084d76eb4b9d773e10fdde6bfd3df57f7a Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Tue, 13 Dec 2016 17:21:01 +0200
Subject: [PATCH] MAINT-7002 Crash in
LLConversationViewSession::handleMouseUp()
---
indra/newview/llconversationview.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/indra/newview/llconversationview.cpp b/indra/newview/llconversationview.cpp
index d147d214a34..15a8aacd373 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);
}
--
GitLab