From f4c4df4cdd3dae7ce90efb8fbea8af1ba66410ff Mon Sep 17 00:00:00 2001 From: AlexanderP ProductEngine Date: Fri, 10 Aug 2012 17:39:46 +0300 Subject: fix incorrect merge --- indra/newview/llimfloatercontainer.cpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'indra/newview') diff --git a/indra/newview/llimfloatercontainer.cpp b/indra/newview/llimfloatercontainer.cpp index 1896ed65f3..ad3b0279e5 100644 --- a/indra/newview/llimfloatercontainer.cpp +++ b/indra/newview/llimfloatercontainer.cpp @@ -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); -- cgit v1.2.3