diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-03-13 15:49:24 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-03-13 15:49:24 -0400 |
| commit | e7639b614d5cce196f82c8bb2fb801b31471f28c (patch) | |
| tree | 94b564c66c192efb85004e68409a91747d0bc572 /indra/llui/lllineeditor.cpp | |
| parent | 55b2383f51ffabf7e95595df5d576f383d458ee1 (diff) | |
| parent | 680bea66dc2e7b08b71038be2261f9aad91f5658 (diff) | |
merge changes for DRTVWR-302
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 ); |