From 55cf9f4351183cec3d32db2efe46be20b7f1ff81 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Mon, 15 Jun 2015 11:20:24 +0200
Subject: [PATCH] Removed some old CHUI merge check tags

---
 indra/newview/llviewerkeyboard.cpp | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/indra/newview/llviewerkeyboard.cpp b/indra/newview/llviewerkeyboard.cpp
index c36d893673..23d091c6ba 100755
--- a/indra/newview/llviewerkeyboard.cpp
+++ b/indra/newview/llviewerkeyboard.cpp
@@ -622,16 +622,14 @@ void start_chat( EKeystate s )
 
 void start_gesture( EKeystate s )
 {
-	// Ansariel: If avatar is pointing at something, don't start
-	//           gesture. This works around the bug with Shared
-	//           Media prims.
+	// <FS:Ansariel> If avatar is pointing at something, don't start gesture.
+	//               This works around the bug with Shared Media prims.
 	if (gAgentCamera.mPointAtObject)
 	{
 		return;
 	}
 
-	// Ansariel: FIRE-4167: Don't start gesture if a floater with
-	//           web content has focus
+	// <FS:Ansariel> FIRE-4167: Don't start gesture if a floater with web content has focus
 	LLFloater* focused_floater = gFloaterView->getFocusedFloater();
 	if (focused_floater && dynamic_cast<LLFloaterWebContent*>(focused_floater))
 	{
@@ -642,20 +640,20 @@ void start_gesture( EKeystate s )
 	if (KEYSTATE_UP == s &&
 		! (focus_ctrlp && focus_ctrlp->acceptsTextInput()))
 	{
-		// <FS:Ansariel> Changed for new chatbar
- 		// ((LLFloaterReg::getTypedInstance<LLFloaterIMNearbyChat>("nearby_chat"))->getCurrentChat().empty()) <FS:TM> CHUI Merge new
+		// <FS:Ansariel> [FS Communication UI]
+ 		//if ((LLFloaterReg::getTypedInstance<LLFloaterIMNearbyChat>("nearby_chat"))->getCurrentChat().empty())
  		//{
  		//	// No existing chat in chat editor, insert '/'
- 		//	LLFloaterIMNearbyChat::startChat("/"); <FS:TM> CHUI Merge new
+ 		//	LLFloaterIMNearbyChat::startChat("/");
  		//}
  		//else
  		//{
  		//	// Don't overwrite existing text in chat editor
- 		//	LLFloaterIMNearbyChat::startChat(NULL); <FS:TM> CHUI Merge new
+ 		//	LLFloaterIMNearbyChat::startChat(NULL);
  		//}
 
-		FSNearbyChat::instance().showDefaultChatBar(TRUE,"/"); // <FS:TM> CHUI Merge Check this
- 		// </FS:Ansariel>
+		FSNearbyChat::instance().showDefaultChatBar(TRUE, "/");
+ 		// </FS:Ansariel> [FS Communication UI]
 	}
 }