diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-03-13 19:09:00 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-03-13 19:09:00 -0400 |
| commit | bf95c1cae7a84d1a97dacd8ea7f1b6af8be067a9 (patch) | |
| tree | 85a0f5fef2af8276cf99388a46193624838dfb6b /indra/llui/lllineeditor.cpp | |
| parent | d348deb7049cbaef7c228000525c7ee5a265464c (diff) | |
| parent | 04e78ce4fdd3bbc0e4daa1daabbff2de1c425601 (diff) | |
merge changes for 3.5.0-beta3
Diffstat (limited to 'indra/llui/lllineeditor.cpp')
| -rw-r--r-- | indra/llui/lllineeditor.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/llui/lllineeditor.cpp b/indra/llui/lllineeditor.cpp index 2e64be89fa..6976b06a92 100644 --- a/indra/llui/lllineeditor.cpp +++ b/indra/llui/lllineeditor.cpp @@ -202,6 +202,14 @@ LLLineEditor::LLLineEditor(const LLLineEditor::Params& p) LLLineEditor::~LLLineEditor() { mCommitOnFocusLost = FALSE; + + // Make sure no context menu linger around once the widget is deleted + LLContextMenu* menu = static_cast<LLContextMenu*>(mContextMenuHandle.get()); + if (menu) + { + menu->hide(); + } + setContextMenu(NULL); // calls onCommit() while LLLineEditor still valid gFocusMgr.releaseFocusIfNeeded( this ); |