summaryrefslogtreecommitdiff
path: root/indra/llui/lllineeditor.cpp
diff options
context:
space:
mode:
authorRichard Nelson <richard@lindenlab.com>2011-10-03 13:23:50 -0700
committerRichard Nelson <richard@lindenlab.com>2011-10-03 13:23:50 -0700
commit0ecc5c0878adf93e96b99e3db4c65cdb757b99fb (patch)
tree25741079cb8edf161b07741decffb43ffa04b144 /indra/llui/lllineeditor.cpp
parent6eb09ab2ae9c90b23c8af1929e7d0a2088a6e76e (diff)
parentfa3b55e68a00359f8b37b1225337e615b3f6da4d (diff)
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
Diffstat (limited to 'indra/llui/lllineeditor.cpp')
-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();
}