From deff7b452b635daf02cfb499bc356c60519da5ee Mon Sep 17 00:00:00 2001 From: Cinders Date: Fri, 28 Jun 2013 20:34:18 -0600 Subject: [PATCH] Two more CHUI updates to fsfloaterim.cpp --- indra/newview/fsfloaterim.cpp | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/indra/newview/fsfloaterim.cpp b/indra/newview/fsfloaterim.cpp index 051a62531a..af44720d67 100644 --- a/indra/newview/fsfloaterim.cpp +++ b/indra/newview/fsfloaterim.cpp @@ -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 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()) {