diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-04-10 10:30:37 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-10 10:30:37 +0300 |
| commit | 5af93ff0d53606db3dca727a8cd1b73d7c37d70b (patch) | |
| tree | 2deaa98bcd99fd2860da758a92816c3bdb838acd /indra/newview/llconversationmodel.cpp | |
| parent | a902138de15067a86a6aeb02fdabd094873da0b2 (diff) | |
| parent | 0acee937f55e6d1a198be2549d5cb55a0403dd4d (diff) | |
Merge pull request #1177 from secondlife/marchcat/c-merge
Release (Maint W) -> Maint C merge
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; |