summaryrefslogtreecommitdiff
path: root/indra/llui
diff options
context:
space:
mode:
authorRichard Nelson <richard@lindenlab.com>2011-10-05 13:01:57 -0700
committerRichard Nelson <richard@lindenlab.com>2011-10-05 13:01:57 -0700
commit7ffa6ba854392d5c37de8631c7f35edeed375a58 (patch)
tree8ca3d2ff39b8ec870ebdf264bf7a26a67f7df624 /indra/llui
parentba60e0906549840b8632d72f17b3f9bcda65e882 (diff)
parente61da057397f95e0dcf8bf964e2836d3d4a80c20 (diff)
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-fui
Diffstat (limited to 'indra/llui')
-rw-r--r--indra/llui/lllineeditor.cpp1
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();
}