From e318032a65fda50534b7f58b6d64f0837ecb57fa Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Sun, 11 Aug 2013 11:51:26 +0200
Subject: [PATCH] Remove duplicated LLChatCommandHandler class from
 fsfloaternearbychat.cpp

---
 indra/newview/fsfloaternearbychat.cpp | 37 ---------------------------
 indra/newview/fsnearbychathub.cpp     |  8 +++---
 2 files changed, 4 insertions(+), 41 deletions(-)

diff --git a/indra/newview/fsfloaternearbychat.cpp b/indra/newview/fsfloaternearbychat.cpp
index dfc6d4debe..b9c941929b 100644
--- a/indra/newview/fsfloaternearbychat.cpp
+++ b/indra/newview/fsfloaternearbychat.cpp
@@ -1353,40 +1353,3 @@ void really_send_chat_from_nearby_floater(std::string utf8_out_text, EChatType t
 	gAgent.sendReliableMessage();
 }
 //</FS:TS> FIRE-787
-
-class LLChatCommandHandler : public LLCommandHandler
-{
-public:
-	// not allowed from outside the app
-	LLChatCommandHandler() : LLCommandHandler("chat", UNTRUSTED_BLOCK) { }
-	
-    // Your code here
-	bool handle(const LLSD& tokens, const LLSD& query_map,
-				LLMediaCtrl* web)
-	{
-		bool retval = false;
-		// Need at least 2 tokens to have a valid message.
-		if (tokens.size() < 2)
-		{
-			retval = false;
-		}
-		else
-		{
-			S32 channel = tokens[0].asInteger();
-			// VWR-19499 Restrict function to chat channels greater than 0.
-			if ((channel > 0) && (channel < CHAT_CHANNEL_DEBUG))
-			{
-				retval = true;
-				// Send unescaped message, see EXT-6353.
-				std::string unescaped_mesg (LLURI::unescape(tokens[1].asString()));
-				send_chat_from_nearby_floater(unescaped_mesg, CHAT_TYPE_NORMAL, channel);
-			}
-			else
-			{
-				retval = false;
-				// Tell us this is an unsupported SLurl.
-			}
-		}
-		return retval;
-	}
-};
diff --git a/indra/newview/fsnearbychathub.cpp b/indra/newview/fsnearbychathub.cpp
index ce0f6b07a4..8474356690 100644
--- a/indra/newview/fsnearbychathub.cpp
+++ b/indra/newview/fsnearbychathub.cpp
@@ -581,14 +581,14 @@ public:
 		}
 		else
 		{
-		S32 channel = tokens[0].asInteger();
+			S32 channel = tokens[0].asInteger();
 			// VWR-19499 Restrict function to chat channels greater than 0.
 			if ((channel > 0) && (channel < CHAT_CHANNEL_DEBUG))
 			{
 				retval = true;
-		// Send unescaped message, see EXT-6353.
-		std::string unescaped_mesg (LLURI::unescape(tokens[1].asString()));
-		send_chat_from_viewer(unescaped_mesg, CHAT_TYPE_NORMAL, channel);
+				// Send unescaped message, see EXT-6353.
+				std::string unescaped_mesg (LLURI::unescape(tokens[1].asString()));
+				send_chat_from_viewer(unescaped_mesg, CHAT_TYPE_NORMAL, channel);
 			}
 			else
 			{