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

fix incorrect merge

meow-7.2.2
AlexanderP ProductEngine 2012-08-10 17:39:46 +03:00
parent a06256838c
commit f4c4df4cdd
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/llimfloatercontainer.cpp
View File

@ -73,6 +73,11 @@ LLIMFloaterContainer::~LLIMFloaterContainer()
}
}
void LLIMFloaterContainer::sessionAdded(const LLUUID& session_id, const std::string& name, const LLUUID& other_participant_id)
{
addConversationListItem(session_id);
}
void LLIMFloaterContainer::sessionVoiceOrIMStarted(const LLUUID& session_id)
{
LLIMFloater::show(session_id);