diff options
author | Oz Linden <oz@lindenlab.com> | 2011-09-30 10:08:32 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-09-30 10:08:32 -0400 |
commit | 2b42a6f0dc1b0881868e46e1cf99c399b58bee8a (patch) | |
tree | 1762d9d4a21d54f81d4ca11438f2214ebe77e29d | |
parent | 544333ac6b9ce639be552fb8a953a57fe92db258 (diff) | |
parent | 8b7f4d4ea38175ad1ee6cd0fe7d478d1802876c1 (diff) |
merge changes for storm-1600
-rw-r--r-- | indra/llui/lllineeditor.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llui/lllineeditor.cpp b/indra/llui/lllineeditor.cpp index ebdd47ae80..06dfc90d83 100644 --- a/indra/llui/lllineeditor.cpp +++ b/indra/llui/lllineeditor.cpp @@ -198,6 +198,7 @@ LLLineEditor::~LLLineEditor() void LLLineEditor::onFocusReceived() { + gEditMenuHandler = this; LLUICtrl::onFocusReceived(); updateAllowingLanguageInput(); } |