diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2012-01-04 14:06:36 -0800 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2012-01-04 14:06:36 -0800 |
| commit | 1c4474f8945316118870d7d8389d6bfb619ad239 (patch) | |
| tree | 0b9aa54bd789f94c9270600199738e7432366472 /indra/newview/llfavoritesbar.cpp | |
| parent | 912833bafa9a59734432787158e36b66ee9586aa (diff) | |
| parent | 377a9ab9ac3b098492cbd010f3091c713ac6dc83 (diff) | |
Merge from viewer-experience
Diffstat (limited to 'indra/newview/llfavoritesbar.cpp')
| -rw-r--r-- | indra/newview/llfavoritesbar.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfavoritesbar.cpp b/indra/newview/llfavoritesbar.cpp index 4f2fd47488..f4b6dc2c81 100644 --- a/indra/newview/llfavoritesbar.cpp +++ b/indra/newview/llfavoritesbar.cpp @@ -405,8 +405,8 @@ LLFavoritesBarCtrl::~LLFavoritesBarCtrl() { gInventory.removeObserver(this); - delete mOverflowMenuHandle.get(); - delete mContextMenuHandle.get(); + if (mOverflowMenuHandle.get()) mOverflowMenuHandle.get()->die(); + if (mContextMenuHandle.get()) mContextMenuHandle.get()->die(); } BOOL LLFavoritesBarCtrl::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, |