summaryrefslogtreecommitdiff
path: root/indra/newview/llnearbychatbar.cpp
diff options
context:
space:
mode:
authorMonty Brandenberg <monty@lindenlab.com>2012-08-03 14:49:49 -0400
committerMonty Brandenberg <monty@lindenlab.com>2012-08-03 14:49:49 -0400
commit0664cb1512481b9cd9f5ef4bc398c88416b246a9 (patch)
tree552a1d8207942c08ae379dfa916b2e5afcd3912e /indra/newview/llnearbychatbar.cpp
parentbf004be1023347bcabaae6baa1624b2ed78d69fd (diff)
parent7d98d1afb036ce4b221e101e6de153a3d978ba9f (diff)
Automated merge with ssh://hg.lindenlab.com/monty/viewer-drano-http
Diffstat (limited to 'indra/newview/llnearbychatbar.cpp')
-rw-r--r--indra/newview/llnearbychatbar.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llnearbychatbar.cpp b/indra/newview/llnearbychatbar.cpp
index 00ff81724c..f8f0f7d243 100644
--- a/indra/newview/llnearbychatbar.cpp
+++ b/indra/newview/llnearbychatbar.cpp
@@ -52,6 +52,7 @@
#include "lltranslate.h"
#include "llresizehandle.h"
+#include "llautoreplace.h"
S32 LLNearbyChatBar::sLastSpecialChatChannel = 0;
@@ -89,6 +90,7 @@ BOOL LLNearbyChatBar::postBuild()
{
mChatBox = getChild<LLLineEditor>("chat_box");
+ mChatBox->setAutoreplaceCallback(boost::bind(&LLAutoReplace::autoreplaceCallback, LLAutoReplace::getInstance(), _1, _2));
mChatBox->setCommitCallback(boost::bind(&LLNearbyChatBar::onChatBoxCommit, this));
mChatBox->setKeystrokeCallback(&onChatBoxKeystroke, this);
mChatBox->setFocusLostCallback(boost::bind(&onChatBoxFocusLost, _1, this));