diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-04-20 14:08:23 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-04-20 14:08:23 +0800 |
| commit | 23a35d763bca645ce628d80ebd939c979590724c (patch) | |
| tree | 434e8413c209d8a29fe93ed17ea2717817660a7e /indra/newview/llconversationmodel.cpp | |
| parent | 1a4517e5af8f43433fc2547658615dce4073d9a3 (diff) | |
| parent | 78174fc8658caeddfd8306ec19eb0e1c2975368e (diff) | |
Merge tag '7.1.5-release'
source for viewer 7.1.5.8443591509
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; |