diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-12-14 14:46:21 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-12-14 14:46:21 -0500 |
| commit | 7c0c86774f601cab3e0ca1598ea786b803c5bc71 (patch) | |
| tree | f8b6b447a40f5ccc69032b581443e2cf2e17c6dc /indra/newview/llsearchcombobox.cpp | |
| parent | d3eccbcd8b9bc51b1a940325509b9508c3697391 (diff) | |
| parent | 0b6c4d0f668c1fc95bac1807a9fd5f5568c7c278 (diff) | |
merge fix for storm-229
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; } } |