diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-12-13 14:27:43 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-12-13 14:27:43 -0800 |
| commit | f556f58579e4030607127fd4141aeec06e984f05 (patch) | |
| tree | 3b98234afca447ae52fc954f38c61cc101e0b72f /indra/newview | |
| parent | 7ce570e2c58d71a73bb28d6c63178a6d69c920d9 (diff) | |
| parent | a42b6acd6ae677a4347771baa49d75dc560269a3 (diff) | |
STORM-431 : pull into viewer-development
Diffstat (limited to 'indra/newview')
| -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; } } |