diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-06-21 17:50:41 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-06-21 17:50:41 -0400 |
| commit | 4397516ca5b8fdb95acb425c55e90cf1cd5a9595 (patch) | |
| tree | aeff419b803e6560ccd6d2b0a4fd1cb4c46ddc4b /indra/newview/llnearbychatbar.cpp | |
| parent | f64a79d9d14fe52dc9ac599bc9e4faf8009254ce (diff) | |
| parent | b10df0b6c41c0044cb05dedba12db7923868b1ae (diff) | |
merge changes for DRTVWR-168
Diffstat (limited to 'indra/newview/llnearbychatbar.cpp')
| -rw-r--r-- | indra/newview/llnearbychatbar.cpp | 2 |
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)); |