FS Communication UI: More fixing

indra/newview/llviewerkeyboard.cpp

@@ -32,7 +32,11 @@
 #include "llmath.h"
 #include "llagent.h"
 #include "llagentcamera.h"
-#include "llfloaterimnearbychat.h"
+// <FS:Ansariel> [FS Communication UI]
+// #include "llfloaterimnearbychat.h"
+#include "fsnearbychathub.h"
+#include "lllineeditor.h"
+// </FS:Ansariel> [FS Communication UI]
 #include "llviewercontrol.h"
 #include "llfocusmgr.h"
 #include "llmorphview.h"
@@ -571,7 +575,10 @@ void stop_moving( EKeystate s )
 void start_chat( EKeystate s )
 {
 	// start chat
-	LLFloaterIMNearbyChat::startChat(NULL);
+	// <FS:Ansariel> [FS Communication UI]
+	//LLFloaterIMNearbyChat::startChat(NULL);
+	FSNearbyChat::instance().showDefaultChatBar(TRUE);
+	// </FS:Ansariel> [FS Communication UI]
 }
 
 void start_gesture( EKeystate s )

indra/newview/llviewermessage.cpp

@@ -2829,6 +2829,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 					from_id,
 					LLStringUtil::null, // Pass null value so no name gets prepended
 					LLTrans::getString("IM_autoresponse_sent"),
+					false,
 					name,
 					IM_NOTHING_SPECIAL,
 					parent_estate_id,