diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-01-09 09:05:14 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-01-09 09:05:14 -0500 |
| commit | 03290257345c22f909cf1cfac3981e7e07820d21 (patch) | |
| tree | 4b4be7538fb1768f32d6b3c2e7cd060b48d2faca /indra/newview/llfolderview.cpp | |
| parent | 889d4d292b2318a2be4988a700d5f56a193a377a (diff) | |
| parent | 41ceee848bbbaec892471b6396bd2d2383d10aa3 (diff) | |
merge up to latest viewer-development
Diffstat (limited to 'indra/newview/llfolderview.cpp')
| -rw-r--r-- | indra/newview/llfolderview.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp index 6ec2598e44..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(); @@ -1058,7 +1058,7 @@ void LLFolderView::onItemsRemovalConfirmation(const LLSD& notification, const LL for (item_it = mSelectedItems.begin(); item_it != mSelectedItems.end(); ++item_it) { item = *item_it; - if(item->isRemovable()) + if (item && item->isRemovable()) { items.push_back(item); } @@ -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; |