From ee7c476bf3405fc77078642e67d326469c013f9a Mon Sep 17 00:00:00 2001
From: Tank_Master <none@none>
Date: Mon, 17 Sep 2012 00:56:43 -0700
Subject: [PATCH] make autoreplace, aka autocorrect, work in chat again

---
 indra/newview/llnearbychatbar.cpp     | 2 --
 indra/newview/llnearbychatcontrol.cpp | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/indra/newview/llnearbychatbar.cpp b/indra/newview/llnearbychatbar.cpp
index f7094e9a99..9dba386362 100644
--- a/indra/newview/llnearbychatbar.cpp
+++ b/indra/newview/llnearbychatbar.cpp
@@ -1,6 +1,4 @@
 /*
-#include "llautoreplace.h"
-	mChatBox->setAutoreplaceCallback(boost::bind(&LLAutoReplace::autoreplaceCallback, LLAutoReplace::getInstance(), _1, _2));
 
 This file is not used by Firestorm. It's being kept in place to track merges.
 
diff --git a/indra/newview/llnearbychatcontrol.cpp b/indra/newview/llnearbychatcontrol.cpp
index b5fc558687..cf79b0ca32 100644
--- a/indra/newview/llnearbychatcontrol.cpp
+++ b/indra/newview/llnearbychatcontrol.cpp
@@ -75,6 +75,7 @@
 #include "llkeyboard.h"
 #include "llgesturemgr.h"
 #include "llmultigesture.h"
+#include "llautoreplace.h"
 
 // #include "llconsole.h"
 // #include "fscontactsfloater.h"
@@ -100,6 +101,7 @@ static LLChatTypeTrigger sChatTypeTriggers[] = {
 LLNearbyChatControl::LLNearbyChatControl(const LLNearbyChatControl::Params& p) :
 	LLLineEditor(p)
 {
+	setAutoreplaceCallback(boost::bind(&LLAutoReplace::autoreplaceCallback, LLAutoReplace::getInstance(), _1, _2));
 	setKeystrokeCallback(onKeystroke,this);
 	LLNearbyChat::instance().registerChatBar(this);