diff options
| author | mberezhnoy <mberezhnoy@productengine.com> | 2013-03-07 22:13:15 +0200 |
|---|---|---|
| committer | mberezhnoy <mberezhnoy@productengine.com> | 2013-03-07 22:13:15 +0200 |
| commit | 5957f1da916173d0e6463ebd3d74ff06a6df0c59 (patch) | |
| tree | 8a618987a7e67ff183d6ec2a0ca515d5a8bf7935 /indra/llui/lllineeditor.cpp | |
| parent | 8e924c850569b8aa2d2765c6514d742f51f3392b (diff) | |
| parent | 11199f2bef65f67f3ddd798944cb4ad62affa8ed (diff) | |
merge
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 ); |