diff options
| author | Dessie Linden <dessie@lindenlab.com> | 2010-12-16 14:35:08 -0800 |
|---|---|---|
| committer | Dessie Linden <dessie@lindenlab.com> | 2010-12-16 14:35:08 -0800 |
| commit | 8a6cb0399230953dda23b47edec07e5082e5dafd (patch) | |
| tree | cf775805e18cff0ac6ba01160e15de126eb95e6c /indra/newview/llsearchcombobox.cpp | |
| parent | aa212430857e59e317d65b61748365a2fc4eb0ba (diff) | |
| parent | 73962e2134035855def0177db171d8eddaa193cb (diff) | |
Merge
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; } } |