From 6198219d9da6e069804d57ca9a3e711341a4c2e0 Mon Sep 17 00:00:00 2001
From: dmitrykproductengine <none@none>
Date: Mon, 9 Sep 2013 21:19:44 +0300
Subject: MAINT-3117 FIXED crash in LLFloaterConversationPreview::showHistory()

---
 indra/newview/llfloaterconversationpreview.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llfloaterconversationpreview.cpp b/indra/newview/llfloaterconversationpreview.cpp
index b570de14aa..7cb313af33 100755
--- a/indra/newview/llfloaterconversationpreview.cpp
+++ b/indra/newview/llfloaterconversationpreview.cpp
@@ -126,7 +126,10 @@ void LLFloaterConversationPreview::draw()
 
 void LLFloaterConversationPreview::onOpen(const LLSD& key)
 {
-	showHistory();
+	if(mChatHistoryLoaded)
+	{
+		showHistory();
+	}
 }
 
 void LLFloaterConversationPreview::showHistory()
-- 
cgit v1.2.3