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

Merge branch 'release/2024.06-atlasaurus' of https://github.com/secondlife/viewer 

# Conflicts:
#	autobuild.xml
#	indra/newview/llfloaterimsessiontab.cpp
master
Ansariel 2024-07-18 21:56:49 +02:00
parent cf5bc75d44 3e4b23539c
commit e65ec7d145
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llfloaterimsessiontab.cpp
View File

@ -690,7 +690,7 @@ void LLFloaterIMSessionTab::removeConversationViewParticipant(const LLUUID& part
{
// 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
@ -699,7 +699,7 @@ void LLFloaterIMSessionTab::removeConversationViewParticipant(const LLUUID& part
// See "add_participant".
//
// Todo: If it keeps causing issues turn participants
// into LLPointers in the session
// into LLPointers in the session
LLParticipantList* session = getParticipantList();
if (session)
{