From fb0c1d4a93abef65a340deb5c1d0b047d038bc5c Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Tue, 18 Mar 2014 19:10:29 +0100
Subject: [PATCH] Transplant changes from LLChatHistory to FSChatHistory

---
 indra/newview/fschathistory.cpp                                | 3 ++-
 indra/newview/skins/default/xui/en/widgets/fs_chat_history.xml | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/indra/newview/fschathistory.cpp b/indra/newview/fschathistory.cpp
index a6517b2667..f2e1be5f00 100644
--- a/indra/newview/fschathistory.cpp
+++ b/indra/newview/fschathistory.cpp
@@ -645,6 +645,7 @@ protected:
 				menu->setItemEnabled("Request Teleport",false);
 				menu->setItemEnabled("Teleport to",false);
 				menu->setItemEnabled("Voice Call", false);
+				menu->setItemEnabled("Chat History", false);
 				menu->setItemEnabled("Add Contact Set", false);
 				menu->setItemEnabled("Invite Group", false);
 				menu->setItemEnabled("Zoom In", false);
@@ -668,9 +669,9 @@ protected:
 				menu->setItemEnabled("track", FSCommon::checkIsActionEnabled(mAvatarID, FS_RGSTR_ACT_TRACK_AVATAR));
 				menu->setItemEnabled("Block Unblock", LLAvatarActions::canBlock(mAvatarID));
 				menu->setItemEnabled("Mute Text", LLAvatarActions::canBlock(mAvatarID));
+				menu->setItemEnabled("Chat History", LLLogChat::isTranscriptExist(mAvatarID));
 			}
 
-			menu->setItemEnabled("Chat History", LLLogChat::isTranscriptExist(mAvatarID));
 			menu->setItemEnabled("Map", (LLAvatarTracker::instance().isBuddyOnline(mAvatarID) && is_agent_mappable(mAvatarID)) || gAgent.isGodlike() );
 			menu->buildDrawLabels();
 			menu->updateParent(LLMenuGL::sMenuContainer);
diff --git a/indra/newview/skins/default/xui/en/widgets/fs_chat_history.xml b/indra/newview/skins/default/xui/en/widgets/fs_chat_history.xml
index c9703f9b79..44446fac4c 100644
--- a/indra/newview/skins/default/xui/en/widgets/fs_chat_history.xml
+++ b/indra/newview/skins/default/xui/en/widgets/fs_chat_history.xml
@@ -15,7 +15,8 @@
 	name="chat_history"
 	type="string"
 	word_wrap="true"
-  line_spacing.multiple="1.0" 
+  line_spacing.multiple="1.0"
+  trusted_content="false"
   font="SansSerif"
   bg_visible="true"
   bg_readonly_color="FSChatHistoryBackground">