#4184 clearAndDeparentModels crash

To resolve dual ownership switched children to LLPointer

1 files changed, 2 insertions, 43 deletions

diff --git a/indra/newview/llfloaterimsessiontab.cpp b/indra/newview/llfloaterimsessiontab.cpp
index 7c3d2b511b..e03422780a 100644
--- a/indra/newview/llfloaterimsessiontab.cpp
+++ b/indra/newview/llfloaterimsessiontab.cpp
@@ -107,26 +107,6 @@ LLFloaterIMSessionTab::~LLFloaterIMSessionTab()
     delete mRefreshTimer;
     LLIMMgr::instance().removeSessionObserver(this);
     mEmojiCloseConn.disconnect();
-
-    LLFloaterIMContainer* im_container = LLFloaterIMContainer::findInstance();
-    if (im_container)
-    {
-        LLParticipantList* session = dynamic_cast<LLParticipantList*>(im_container->getSessionModel(mSessionID));
-        if (session)
-        {
-            for (const conversations_widgets_map::value_type& widget_pair : mConversationsWidgets)
-            {
-                LLFolderViewItem* widget = widget_pair.second;
-                LLFolderViewModelItem* item_vmi = widget->getViewModelItem();
-                if (item_vmi && item_vmi->getNumRefs() == 1)
-                {
-                    // This is the last pointer, remove participant from session
-                    // before participant gets deleted on destroyView.
-                    session->removeChild(item_vmi);
-                }
-            }
-        }
-    }
 }
 
 // static
@@ -730,7 +710,7 @@ void LLFloaterIMSessionTab::buildConversationViewParticipant()
     LLFolderViewModelItemCommon::child_list_t::const_iterator end_participant_model = item->getChildrenEnd();
     while (current_participant_model != end_participant_model)
     {
-        LLConversationItem* participant_model = dynamic_cast<LLConversationItem*>(*current_participant_model);
+        LLConversationItem* participant_model = dynamic_cast<LLConversationItem*>((*current_participant_model).get());
         if (participant_model)
         {
             addConversationViewParticipant(participant_model);
@@ -774,27 +754,6 @@ void LLFloaterIMSessionTab::removeConversationViewParticipant(const LLUUID& part
     LLFolderViewItem* widget = get_ptr_in_map(mConversationsWidgets,participant_id);
     if (widget)
     {
-        LLFolderViewModelItem* item_vmi = widget->getViewModelItem();
-        if (item_vmi && item_vmi->getNumRefs() == 1)
-        {
-            // This is the last pointer, remove participant from session
-            // before participant gets deleted on destroyView.
-            //
-            // Floater (widget) and participant's view can simultaneously
-            // co-own the model, in which case view is responsible for
-            // the deletion and floater is free to clear and recreate
-            // the list, yet there are cases where only widget owns
-            // the pointer so it should do the cleanup.
-            // See "add_participant".
-            //
-            // Todo: If it keeps causing issues turn participants
-            // into LLPointers in the session
-            LLParticipantList* session = getParticipantList();
-            if (session)
-            {
-                session->removeChild(item_vmi);
-            }
-        }
         widget->destroyView();
     }
     mConversationsWidgets.erase(participant_id);
@@ -860,7 +819,7 @@ void LLFloaterIMSessionTab::refreshConversation()
             LLIMSpeakerMgr *speaker_mgr = LLIMModel::getInstance()->getSpeakerManager(mSessionID);
             while (current_participant_model != end_participant_model)
             {
-                LLConversationItemParticipant* participant_model = dynamic_cast<LLConversationItemParticipant*>(*current_participant_model);
+                LLConversationItemParticipant* participant_model = dynamic_cast<LLConversationItemParticipant*>((*current_participant_model).get());
                 if (speaker_mgr && participant_model)
                 {
                     LLSpeaker *participant_speaker = speaker_mgr->findSpeaker(participant_model->getUUID());