Skip to content
Snippets Groups Projects
Commit 335b3709 authored by callum_linden's avatar callum_linden
Browse files

merge with head

parents 5ffdeb4e cedc571e
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
indra/newview/llfloaterconversationpreview.cpp
+ 4
− 1
View file @ 335b3709
...@@ -126,7 +126,10 @@ void LLFloaterConversationPreview::draw() ...@@ -126,7 +126,10 @@ void LLFloaterConversationPreview::draw()
void LLFloaterConversationPreview::onOpen(const LLSD& key) void LLFloaterConversationPreview::onOpen(const LLSD& key)
{ {
showHistory(); if(mChatHistoryLoaded)
{
showHistory();
}
} }
void LLFloaterConversationPreview::showHistory() void LLFloaterConversationPreview::showHistory()
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment