diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-10-24 13:18:41 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-10-24 13:18:41 -0700 |
| commit | 68815045a629eeb0e4ab33c05d3773d272eafb50 (patch) | |
| tree | e05ce287a9883c626cd02add7b015ec3aeb6ec3a /indra/newview/llimfloater.cpp | |
| parent | 3f020d0be92859e1d9261261ccc9c377df700118 (diff) | |
CHUI-441 : WIP : Initial refactor part 2. Works but the list doesn't update in the torn off dialog.
Diffstat (limited to 'indra/newview/llimfloater.cpp')
| -rw-r--r-- | indra/newview/llimfloater.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/indra/newview/llimfloater.cpp b/indra/newview/llimfloater.cpp index 29e84e1332..9f7b3cd50b 100644 --- a/indra/newview/llimfloater.cpp +++ b/indra/newview/llimfloater.cpp @@ -582,10 +582,11 @@ void LLIMFloater::onParticipantsListChanged(LLUICtrl* ctrl) } } -void LLIMFloater::addToHost(const LLUUID& session_id, LLConversationItemSession* session_root_model, const bool force) +void LLIMFloater::addToHost(const LLUUID& session_id, const bool force) { if (!LLIMConversation::isChatMultiTab() || !gIMMgr->hasSession(session_id)) { + llinfos << "Merov debug : addToHost, not added! multitab = " << LLIMConversation::isChatMultiTab() << ", has session = " << gIMMgr->hasSession(session_id) << llendl; return; } @@ -593,12 +594,14 @@ void LLIMFloater::addToHost(const LLUUID& session_id, LLConversationItemSession* bool exist = findInstance(session_id); // Get the floater: this will create the instance if it didn't exist - LLIMFloater* floater = getInstance(session_id, session_root_model); + LLIMFloater* floater = getInstance(session_id); if (floater) { LLIMFloaterContainer* floater_container = LLIMFloaterContainer::getInstance(); + llinfos << "Merov debug : addToHost, done! exist = " << exist << llendl; + // Do not add again existing floaters if (!exist) { @@ -672,12 +675,11 @@ LLIMFloater* LLIMFloater::findInstance(const LLUUID& session_id) return conversation; } -LLIMFloater* LLIMFloater::getInstance(const LLUUID& session_id, LLConversationItemSession* session_root_model) +LLIMFloater* LLIMFloater::getInstance(const LLUUID& session_id) { LLIMFloater* conversation = LLFloaterReg::getTypedInstance<LLIMFloater>("impanel", session_id); - conversation->setSessionRoot(session_root_model); return conversation; } |