diff options
| author | Brad Linden <brad@lindenlab.com> | 2024-04-09 14:17:34 -0700 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2024-04-09 14:17:34 -0700 |
| commit | 5a47a3cb2366b9da9a595d37c88703497e111005 (patch) | |
| tree | 1e255fecfda9bf1582d8d76a48e950a561a811a1 /indra/newview/llconversationmodel.cpp | |
| parent | 03c75201605067b0e97aba0333f8ea6d45d10804 (diff) | |
| parent | da9a1dcb55548a249ff7a1255f3e518696b81245 (diff) | |
Merge remote-tracking branch 'origin/main' into release/materials_featurette
Diffstat (limited to 'indra/newview/llconversationmodel.cpp')
| -rw-r--r-- | indra/newview/llconversationmodel.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/llconversationmodel.cpp b/indra/newview/llconversationmodel.cpp index 9ec4fb085b..9e043dbac0 100644 --- a/indra/newview/llconversationmodel.cpp +++ b/indra/newview/llconversationmodel.cpp @@ -90,6 +90,8 @@ LLConversationItem::~LLConversationItem() { mAvatarNameCacheConnection.disconnect(); } + + clearChildren(); } //virtual @@ -254,6 +256,11 @@ LLConversationItemSession::LLConversationItemSession(const LLUUID& uuid, LLFolde mConvType = CONV_SESSION_UNKNOWN; } +LLConversationItemSession::~LLConversationItemSession() +{ + clearAndDeparentModels(); +} + bool LLConversationItemSession::hasChildren() const { return getChildrenCount() > 0; |