summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authordmitrykproductengine <none@none>2013-09-09 21:19:44 +0300
committerdmitrykproductengine <none@none>2013-09-09 21:19:44 +0300
commit6198219d9da6e069804d57ca9a3e711341a4c2e0 (patch)
tree577ee82319a0a1e995738bdb53b4c7a9e2edf961 /indra
parent6dd7e0c9ef587c6c05726d407bef8b51018a7a4b (diff)
MAINT-3117 FIXED crash in LLFloaterConversationPreview::showHistory()
Diffstat (limited to 'indra')
-rwxr-xr-xindra/newview/llfloaterconversationpreview.cpp5
1 files changed, 4 insertions, 1 deletions
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()