diff options
| author | callum_linden <callum@lindenlab.com> | 2013-09-04 10:45:01 -0700 |
|---|---|---|
| committer | callum_linden <callum@lindenlab.com> | 2013-09-04 10:45:01 -0700 |
| commit | 335b37093fa7e5fd6010d69a48e327192ea20627 (patch) | |
| tree | dd3cdd8199112b946090fd75b1b84ef54eeb904e /indra | |
| parent | 5ffdeb4e0c560bbc3469cf9119509f71c3cf1231 (diff) | |
| parent | cedc571e4b4f887af352e2561e5c4d31ea6982f6 (diff) | |
merge with head
Diffstat (limited to 'indra')
| -rwxr-xr-x | indra/newview/llfloaterconversationpreview.cpp | 5 |
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() |