diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-14 14:44:43 -0800 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-14 14:44:43 -0800 |
| commit | 1a8008ea150d1eb9a8f4036988ef971fb1901cb3 (patch) | |
| tree | a09d45e10d3b03c94256424ecd8f881e75551aae /indra/llui/lltexteditor.cpp | |
| parent | 04fe0399443cf4a5852e94cd3950ba1fd2d50562 (diff) | |
Backed out changeset f34a69c2af56
(this backs-out my backout, now that I'm happy the original merge works okay :))
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; } //////////////////////////////////////////////////////////// |