diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-01-04 16:46:09 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-01-04 16:46:09 -0500 |
| commit | e2f197b6f77592c84d0c2967cc0e8110c79f2f49 (patch) | |
| tree | c405316265ca4248802817b8a99697063c58469d /indra/newview/llsearchcombobox.cpp | |
| parent | 2d9c970babf6bab8d402482315af6be0ffb198dd (diff) | |
| parent | 78895f9e0c628dc33268578faf135e967cf30142 (diff) | |
merge changes for storm-398
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; } } |