diff options
author | Ychebotarev ProductEngine <ychebotarev@productengine.com> | 2010-01-15 18:56:25 +0200 |
---|---|---|
committer | Ychebotarev ProductEngine <ychebotarev@productengine.com> | 2010-01-15 18:56:25 +0200 |
commit | 91e8b4bc64ef296893b6a72cc57a3ae8a5d49d03 (patch) | |
tree | c7a5dfbcfa87ac6b6578a057e4e4746bdd58c555 /indra/llui/lltexteditor.cpp | |
parent | 17a72e5e51cae48c7cd6f7f3dda06c895dd482c8 (diff) | |
parent | b21fca13e6bea9420f80a35163d25a33b929bbd1 (diff) |
merge
--HG--
branch : product-engine
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; } //////////////////////////////////////////////////////////// |