diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-02-24 18:28:19 -0800 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-02-24 18:28:19 -0800 |
| commit | a9867b6437efd07ef9b18315d61155bd10860e13 (patch) | |
| tree | d059f1d6a6809acbedd5ba2ea72c4f88acee2b1b /indra/llui/lltexteditor.cpp | |
| parent | 6bb43e1369d957a041c796120e87a89ff3fa10ee (diff) | |
| parent | 8a2404fa3341db0bd7a60459e008b8a3c6afad03 (diff) | |
Automated merge
Diffstat (limited to 'indra/llui/lltexteditor.cpp')
| -rw-r--r-- | indra/llui/lltexteditor.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llui/lltexteditor.cpp b/indra/llui/lltexteditor.cpp index e8fc9475a5..f2c3879a6c 100644 --- a/indra/llui/lltexteditor.cpp +++ b/indra/llui/lltexteditor.cpp @@ -308,7 +308,8 @@ LLTextEditor::~LLTextEditor() // Scrollbar is deleted by LLView std::for_each(mUndoStack.begin(), mUndoStack.end(), DeletePointer()); - delete mContextMenu; + // context menu is owned by menu holder, not us + //delete mContextMenu; } //////////////////////////////////////////////////////////// |