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

merging

meow-7.2.2
Gilbert Gonzales 2013-01-23 09:52:00 -08:00
parent d0204ab367 e6000d5930
commit 5733f70904
4 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
indra/newview/llfloaterconversationpreview.cpp
View File

@ -152,7 +152,13 @@ void LLFloaterConversationPreview::showHistory()
chat.mSourceType = LLFloaterIMNearbyChat::isWordsName(from) ? CHAT_SOURCE_UNKNOWN : CHAT_SOURCE_OBJECT;
}
mChatHistory->appendMessage(chat);
LLSD chat_args;
chat_args["use_plain_text_chat_history"] =
gSavedSettings.getBOOL("PlainTextChatHistory");
chat_args["show_time"] = gSavedSettings.getBOOL("IMShowTime");
chat_args["show_names_for_p2p_conv"] = gSavedSettings.getBOOL("IMShowNamesForP2PConv");
mChatHistory->appendMessage(chat,chat_args);
}
}

4
indra/newview/llfloaterimcontainer.cpp
View File

@ -431,7 +431,9 @@ bool LLFloaterIMContainer::onConversationModelEvent(const LLSD& event)
return false;
}
LLConversationViewParticipant* participant_view = session_view->findParticipant(participant_id);
LLFloaterIMSessionTab *conversation_floater = (session_id.isNull() ? (LLFloaterIMSessionTab*)(LLFloaterReg::findTypedInstance<LLFloaterIMNearbyChat>("nearby_chat")) : (LLFloaterIMSessionTab*)(LLFloaterIMSession::findInstance(session_id)));
LLFloaterIMSessionTab *conversation_floater = (session_id.isNull() ?
(LLFloaterIMSessionTab*)(LLFloaterReg::findTypedInstance<LLFloaterIMNearbyChat>("nearby_chat"))
: (LLFloaterIMSessionTab*)(LLFloaterIMSession::findInstance(session_id)));
if (type == "remove_participant")
{

11
indra/newview/llfloaterimsessiontab.cpp
View File

@ -60,6 +60,7 @@ LLFloaterIMSessionTab::LLFloaterIMSessionTab(const LLSD& session_id)
, mInputEditorTopPad(0)
, mRefreshTimer(new LLTimer())
, mIsHostAttached(false)
, mHasVisibleBeenInitialized(false)
{
setAutoFocus(FALSE);
mSession = LLIMModel::getInstance()->findIMSession(mSessionID);
@ -120,12 +121,14 @@ LLFloaterIMSessionTab* LLFloaterIMSessionTab::getConversation(const LLUUID& uuid
void LLFloaterIMSessionTab::setVisible(BOOL visible)
{
LLTransientDockableFloater::setVisible(visible);
if(visible)
if(visible && !mHasVisibleBeenInitialized)
{
LLFloaterIMSessionTab::addToHost(mSessionID);
mHasVisibleBeenInitialized = true;
LLFloaterReg::getTypedInstance<LLFloaterIMContainer>("im_container")->setVisible(true);
LLFloaterIMSessionTab::addToHost(mSessionID);
}
LLTransientDockableFloater::setVisible(visible);
}
/*virtual*/

1
indra/newview/llfloaterimsessiontab.h
View File

@ -182,6 +182,7 @@ private:
bool checkIfTornOff();
bool mIsHostAttached;
bool mHasVisibleBeenInitialized;
LLTimer* mRefreshTimer; ///< Defines the rate at which refresh() is called.
};