merge changes for storm-1600

2011-09-30 10:08:32 -04:00 · 2011-09-30 10:08:32 -04:00 · 2b42a6f0dc
parent 544333ac6b 8b7f4d4ea3
commit 2b42a6f0dc
1 changed files with 1 additions and 0 deletions
--- a/indra/llui/lllineeditor.cpp
+++ b/indra/llui/lllineeditor.cpp
@ -198,6 +198,7 @@ LLLineEditor::~LLLineEditor()

 void LLLineEditor::onFocusReceived()
 {
+	gEditMenuHandler = this;
 	LLUICtrl::onFocusReceived();
 	updateAllowingLanguageInput();
 }