diff options
| author | AlexanderP ProductEngine <apaschenko@productengine.com> | 2012-08-10 17:39:46 +0300 |
|---|---|---|
| committer | AlexanderP ProductEngine <apaschenko@productengine.com> | 2012-08-10 17:39:46 +0300 |
| commit | f4c4df4cdd3dae7ce90efb8fbea8af1ba66410ff (patch) | |
| tree | 39c47a6136fac569993c9847825db87188ed3aba | |
| parent | a06256838cfc59c59d50bca0d75ad1b121bdd096 (diff) | |
fix incorrect merge
| -rw-r--r-- | indra/newview/llimfloatercontainer.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
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); |