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/llui/llmenugl.cpp | |
| parent | 0c0ff35d19969cc762dce510a4d5ee4649d96a24 (diff) | |
use lazy deletion of views via die() method to avoid some potential crashes
Diffstat (limited to 'indra/llui/llmenugl.cpp')
| -rw-r--r-- | indra/llui/llmenugl.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp index cb237fca7c..95ecbb1c94 100644 --- a/indra/llui/llmenugl.cpp +++ b/indra/llui/llmenugl.cpp @@ -947,9 +947,14 @@ LLMenuItemBranchGL::LLMenuItemBranchGL(const LLMenuItemBranchGL::Params& p) LLMenuItemBranchGL::~LLMenuItemBranchGL() { - delete mBranchHandle.get(); + if (mBranchHandle.get()) + { + mBranchHandle.get()->die(); + } } + + // virtual LLView* LLMenuItemBranchGL::getChildView(const std::string& name, BOOL recurse) const { |