diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-12-16 11:12:15 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-12-16 11:12:15 -0500 |
| commit | ee0055f5af672bef8402679fe8cc41717b0b9678 (patch) | |
| tree | d2c025aa4d9469d98a0c8544e1634eedfbad0c84 /indra/newview/llsearchcombobox.cpp | |
| parent | ad625861e120cae967d6bc60a9c1f4d86f4c2ed1 (diff) | |
| parent | 73962e2134035855def0177db171d8eddaa193cb (diff) | |
Automated merge up from viewer-development
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; } } |