livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Two more CHUI updates to fsfloaterim.cpp

master
Cinders 2013-06-28 20:34:18 -06:00
parent 214906e2e4
commit deff7b452b
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
indra/newview/fsfloaterim.cpp
View File

@ -770,7 +770,7 @@ BOOL FSFloaterIM::postBuild()
// 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));
mInputEditor->setAutoreplaceCallback(boost::bind(&LLAutoReplace::autoreplaceCallback, LLAutoReplace::getInstance(), _1, _2, _3, _4, _5));
LLFontGL* font = LLViewerChat::getChatFont();
mInputEditor->setFont(font);
@ -1215,14 +1215,7 @@ void FSFloaterIM::updateMessages()
std::list<LLSD> messages;
// we shouldn't reset unread message counters if IM floater doesn't have focus
if (hasFocus())
{
LLIMModel::instance().getMessages(mSessionID, messages, mLastMessageIndex+1);
}
else
{
LLIMModel::instance().getMessagesSilently(mSessionID, messages, mLastMessageIndex+1);
}
LLIMModel::instance().getMessages(mSessionID, messages, mLastMessageIndex + 1, hasFocus());
if (messages.size())
{