diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-12-24 09:07:06 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-12-24 09:07:06 -0500 |
| commit | ef1c3aac889d118530994e878d83426d4fc2ca7c (patch) | |
| tree | dd3d1240a8f5e9b7f1a60d7447b9aa3d624ada88 /indra/newview/llsearchcombobox.cpp | |
| parent | f421e8701b3ef5b0230b06602fc5e937382ccc68 (diff) | |
| parent | 14d830ca43a7114140ebeb16a76829db4d21a95b (diff) | |
merge fix for storm-784
Diffstat (limited to 'indra/newview/llsearchcombobox.cpp')
| -rw-r--r-- | indra/newview/llsearchcombobox.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llsearchcombobox.cpp b/indra/newview/llsearchcombobox.cpp index db531b5695..6558c9a7fa 100644 --- a/indra/newview/llsearchcombobox.cpp +++ b/indra/newview/llsearchcombobox.cpp @@ -131,6 +131,9 @@ void LLSearchComboBox::focusTextEntry() if (mTextEntry) { gFocusMgr.setKeyboardFocus(mTextEntry); + + // Let the editor handle editing hotkeys (STORM-431). + LLEditMenuHandler::gEditMenuHandler = mTextEntry; } } |