diff options
author | Oz Linden <oz@lindenlab.com> | 2012-07-31 14:55:15 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2012-07-31 14:55:15 -0400 |
commit | df93749819c503a66bc0ad34aeb1c7bed3746df2 (patch) | |
tree | 9bc6ae94c08fd881b8a73bfc0bc4ea79169ebf9e /indra/newview/llimfloater.cpp | |
parent | 764d1e3cafa3e86f1f44a4c2bec0705879b9da38 (diff) | |
parent | b8bac66a0f8c392a221ad2c64611e2a55de82339 (diff) |
merge up to latest viewer-development
Diffstat (limited to 'indra/newview/llimfloater.cpp')
-rw-r--r-- | indra/newview/llimfloater.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llimfloater.cpp b/indra/newview/llimfloater.cpp index f67464078b..63eedcdfea 100644 --- a/indra/newview/llimfloater.cpp +++ b/indra/newview/llimfloater.cpp @@ -56,7 +56,7 @@ #include "llrootview.h" #include "llspeakers.h" #include "llviewerchat.h" - +#include "llautoreplace.h" LLIMFloater::LLIMFloater(const LLUUID& session_id) : LLTransientDockableFloater(NULL, true, session_id), @@ -255,6 +255,8 @@ BOOL LLIMFloater::postBuild() mInputEditor->setMaxTextLength(1023); // enable line history support for instant message bar mInputEditor->setEnableLineHistory(TRUE); + // *TODO Establish LineEditor with autoreplace callback + mInputEditor->setAutoreplaceCallback(boost::bind(&LLAutoReplace::autoreplaceCallback, LLAutoReplace::getInstance(), _1, _2)); LLFontGL* font = LLViewerChat::getChatFont(); mInputEditor->setFont(font); |