diff options
| author | Richard Linden <none@none> | 2012-01-03 09:41:16 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-01-03 09:41:16 -0800 |
| commit | 3861249a749c99c2a7b05d15ef82f8ff21453d05 (patch) | |
| tree | dcc087fe66d15634fde03e7a4bfaf5b8c7c0dab6 /indra/newview/llfavoritesbar.cpp | |
| parent | 0c0ff35d19969cc762dce510a4d5ee4649d96a24 (diff) | |
use lazy deletion of views via die() method to avoid some potential crashes
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, |