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

IM: got rid of old im floater dependency in LLIMMgr::addMessage(...) 

--HG--
branch : product-engine
meow-7.2.2
Igor Borovkov 2009-10-26 18:05:00 +02:00
parent 5892411348
commit e874fbc8f0
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
indra/newview/llimview.cpp
View File

@ -1258,7 +1258,8 @@ void LLIMMgr::addMessage(
fixed_session_name = session_name;
}
if (!LLIMModel::getInstance()->findIMSession(new_session_id))
bool new_session = !hasSession(session_id);
if (new_session)
{
LLIMModel::getInstance()->newSession(session_id, fixed_session_name, dialog, other_participant_id);
}
@ -1277,15 +1278,16 @@ void LLIMMgr::addMessage(
// create IM window as necessary
if(!floater)
{
floater = createFloater(
new_session_id,
other_participant_id,
fixed_session_name,
dialog,
FALSE);
}
if (new_session)
{
// When we get a new IM, and if you are a god, display a bit
// of information about the source. This is to help liaisons
// when answering questions.
@ -1295,7 +1297,7 @@ void LLIMMgr::addMessage(
std::ostringstream bonus_info;
bonus_info << LLTrans::getString("***")+ " "+ LLTrans::getString("IMParentEstate") + ":" + " "
<< parent_estate_id
<< ((parent_estate_id == 1) ? "," + LLTrans::getString("IMMainland") : "")
<< ((parent_estate_id == 1) ? "," + LLTrans::getString("IMMainland") : "")
<< ((parent_estate_id == 5) ? "," + LLTrans::getString ("IMTeen") : "");
// once we have web-services (or something) which returns