diff options
| author | Todd Stinson <stinson@lindenlab.com> | 2012-07-27 14:28:31 -0700 |
|---|---|---|
| committer | Todd Stinson <stinson@lindenlab.com> | 2012-07-27 14:28:31 -0700 |
| commit | 0479e8d4ad1212b0028805cd4e39b6fe593b86c7 (patch) | |
| tree | 33fa0c507ee08446f49159bf57ca9533495e91bf /indra/newview | |
| parent | 3e038cd71b3f3bc74d206267e451773fb963d258 (diff) | |
Updating comments for merge conflicts after reviewing with Richard.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llimfloater.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llimfloater.cpp b/indra/newview/llimfloater.cpp index 5e0e0973fc..260957011e 100644 --- a/indra/newview/llimfloater.cpp +++ b/indra/newview/llimfloater.cpp @@ -316,7 +316,7 @@ BOOL LLIMFloater::postBuild() mInputEditor = getChild<LLChatEntry>("chat_editor"); mInputEditor->setMaxTextLength(1023); // enable line history support for instant message bar - // XXX stinson TODO : resolve merge conflict + // XXX stinson TODO : resolve merge by adding autoreplace to text editors #if 0 // *TODO Establish LineEditor with autoreplace callback mInputEditor->setAutoreplaceCallback(boost::bind(&LLAutoReplace::autoreplaceCallback, LLAutoReplace::getInstance(), _1, _2)); |