From 712eeb7faaa02bed5456709bbd8a308552131a55 Mon Sep 17 00:00:00 2001
From: Cinders <cinder.roxley@phoenixviewer.com>
Date: Fri, 5 Jul 2013 07:17:54 -0600
Subject: [PATCH] Hook up isWordsName() in FSFloaterNearbyChat, add some
 settings that got missed in the merge

---
 indra/newview/app_settings/settings.xml       | 22 +++++++++++++++++++
 indra/newview/fsfloaternearbychat.cpp         |  3 ++-
 indra/newview/fsfloaternearbychat.h           |  1 +
 .../newview/llfloaterconversationpreview.cpp  |  4 +++-
 4 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 695a7d5e99..2f90b97d49 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -1577,6 +1577,28 @@
       <string>http://search.metaverseink.com/opensim/results.jsp?query=[QUERY]&amp;submit=[CATEGORY]</string>
     </map>
 
+    <key>IMShowTime</key>
+    <map>
+      <key>Comment</key>
+      <string>Enable(disable) timestamp showing in the chat.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
+    <key>IMShowNamesForP2PConv</key>
+    <map>
+      <key>Comment</key>
+      <string>Enable(disable) showing of a names in the chat.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
     <key>CrashHostUrl</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/fsfloaternearbychat.cpp b/indra/newview/fsfloaternearbychat.cpp
index 3c5cec643f..ea3605c88e 100644
--- a/indra/newview/fsfloaternearbychat.cpp
+++ b/indra/newview/fsfloaternearbychat.cpp
@@ -493,7 +493,8 @@ void FSFloaterNearbyChat::processChatHistoryStyleUpdate(const LLSD& newvalue)
 		nearby_chat->updateChatHistoryStyle();
 }
 
-bool isWordsName(const std::string& name)
+//static
+bool FSFloaterNearbyChat::isWordsName(const std::string& name)
 {
 	// checking to see if it's display name plus username in parentheses 
 	S32 open_paren = name.find(" (", 0);
diff --git a/indra/newview/fsfloaternearbychat.h b/indra/newview/fsfloaternearbychat.h
index 3e0fa60fc3..4dd89d62e8 100644
--- a/indra/newview/fsfloaternearbychat.h
+++ b/indra/newview/fsfloaternearbychat.h
@@ -96,6 +96,7 @@ public:
 	BOOL focusFirstItem(BOOL prefer_text_fields = FALSE, BOOL focus_flash = TRUE );
 
 	void updateFSUseNearbyChatConsole(const LLSD &data);
+	static bool isWordsName(const std::string& name);
 
 private:
 	void	getAllowedRect		(LLRect& rect);
diff --git a/indra/newview/llfloaterconversationpreview.cpp b/indra/newview/llfloaterconversationpreview.cpp
index fb4b4c9dc5..1e60ff71c2 100644
--- a/indra/newview/llfloaterconversationpreview.cpp
+++ b/indra/newview/llfloaterconversationpreview.cpp
@@ -167,8 +167,10 @@ void LLFloaterConversationPreview::showHistory()
 		}
 		else if (from_id.isNull())
 		{
-			// FIXME: Hook this up to our nearby chat <FS:CR>
+			// <FS:CR> [Firestorm Communications UI ]
 			//chat.mSourceType = LLFloaterIMNearbyChat::isWordsName(from) ? CHAT_SOURCE_UNKNOWN : CHAT_SOURCE_OBJECT;
+			chat.mSourceType = FSFloaterNearbyChat::isWordsName(from) ? CHAT_SOURCE_UNKNOWN : CHAT_SOURCE_OBJECT;
+			// </FS:CR>
 		}
 
 		LLSD chat_args;