diff options
| author | Richard Linden <none@none> | 2012-01-03 09:41:49 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-01-03 09:41:49 -0800 |
| commit | 9f929043430632ef629a97977da7430685dd30e1 (patch) | |
| tree | c6fd8c22a81a9ebe49768639ad9caa37694305d9 /indra/newview/llfolderview.cpp | |
| parent | ed431700ed7ddd57a3629a3cd6bfb9c39b6105e0 (diff) | |
| parent | 3861249a749c99c2a7b05d15ef82f8ff21453d05 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
Diffstat (limited to 'indra/newview/llfolderview.cpp')
| -rw-r--r-- | indra/newview/llfolderview.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp index 637ffd4d2c..ecd4c2c3de 100644 --- a/indra/newview/llfolderview.cpp +++ b/indra/newview/llfolderview.cpp @@ -299,7 +299,7 @@ LLFolderView::~LLFolderView( void ) mAutoOpenItems.removeAllNodes(); gIdleCallbacks.deleteFunction(idle, this); - delete mPopupMenuHandle.get(); + if (mPopupMenuHandle.get()) mPopupMenuHandle.get()->die(); mAutoOpenItems.removeAllNodes(); clearSelection(); @@ -1969,7 +1969,7 @@ BOOL LLFolderView::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, void LLFolderView::deleteAllChildren() { closeRenamer(); - delete mPopupMenuHandle.get(); + if (mPopupMenuHandle.get()) mPopupMenuHandle.get()->die(); mPopupMenuHandle = LLHandle<LLView>(); mScrollContainer = NULL; mRenameItem = NULL; |