diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-04-12 00:12:30 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-12 00:12:30 +0300 |
| commit | dfbbad813f3a1b9a151db7b25d3657590324ca4c (patch) | |
| tree | e31cee85f651a874c4b6edc7491efa0cb2ec93d5 /indra/newview/llconversationmodel.cpp | |
| parent | 17e1f3692c5c1e9cbc6ba6895b312a8baae9aec2 (diff) | |
| parent | d0102af56d3b1d5b1d9bf3c8eb9aeea77028b70e (diff) | |
Merge pull request #1204 from Ansariel/DRTVWR-600-maint-A
Merge main into maint-A
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 fe5428d7f5..e4ae60b49e 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; |