1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llui/llfolderviewmodel.cpp b/indra/llui/llfolderviewmodel.cpp
index a028a32704..a2ac9ffaa0 100644
--- a/indra/llui/llfolderviewmodel.cpp
+++ b/indra/llui/llfolderviewmodel.cpp
@@ -52,11 +52,13 @@ LLFolderViewModelItemCommon::~LLFolderViewModelItemCommon()
 {
     // Children don't belong to model, but to LLFolderViewItem, just mark them as having no parent
     std::for_each(mChildren.begin(), mChildren.end(), [](LLFolderViewModelItem* c) {c->setParent(NULL); });
+    mChildren.clear();
 
     // Don't leave dead pointer in parent
     if (mParent)
     {
         mParent->removeChild(this);
+        mParent = NULL;
     }
 }