diff --git a/indra/newview/llfloaterconversationpreview.cpp b/indra/newview/llfloaterconversationpreview.cpp
index 2b537727d4..5282a07e80 100755
--- a/indra/newview/llfloaterconversationpreview.cpp
+++ b/indra/newview/llfloaterconversationpreview.cpp
@@ -38,6 +38,8 @@
//
#include "llviewercontrol.h"
#include "llavataractions.h"
+#include "llviewerwindow.h"
+#include "llwindow.h"
//
const std::string LL_FCP_COMPLETE_NAME("complete_name");
@@ -203,5 +205,12 @@ void LLFloaterConversationPreview::onMoreHistoryBtnClick()
// Open chat history externally
void (LLFloaterConversationPreview::onBtnOpenExternal())
{
- LLAvatarActions::viewChatHistoryExternally(mSessionID);
+ if (mSessionID.notNull())
+ {
+ LLAvatarActions::viewChatHistoryExternally(mSessionID);
+ }
+ else
+ {
+ gViewerWindow->getWindow()->openFile(LLLogChat::makeLogFileName("chat"));
+ }
}