From e5dce89705461ab9bec174a8b0ddc749f5b2bdfe Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Thu, 25 Jul 2013 09:22:01 +0200
Subject: [PATCH] Use internal conversation log preview floater for nearby chat
 as well

---
 indra/newview/fsfloaternearbychat.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/indra/newview/fsfloaternearbychat.cpp b/indra/newview/fsfloaternearbychat.cpp
index 5fa05c26ce..8322027918 100644
--- a/indra/newview/fsfloaternearbychat.cpp
+++ b/indra/newview/fsfloaternearbychat.cpp
@@ -298,7 +298,14 @@ void FSFloaterNearbyChat::onNearbySpeakers()
 // static
 void FSFloaterNearbyChat::onHistoryButtonClicked(LLUICtrl* ctrl, void* userdata)
 {
-	gViewerWindow->getWindow()->openFile(LLLogChat::makeLogFileName("chat"));
+	if (gSavedSettings.getBOOL("FSUseBuiltInHistory"))
+	{
+		LLFloaterReg::showInstance("preview_conversation", LLSD(LLUUID::null), true);
+	}
+	else
+	{
+		gViewerWindow->getWindow()->openFile(LLLogChat::makeLogFileName("chat"));
+	}
 }
 
 void FSFloaterNearbyChat::onNearbyChatContextMenuItemClicked(const LLSD& userdata)