summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorVadim ProductEngine <vsavchuk@productengine.com>2010-12-10 16:30:45 +0200
committerVadim ProductEngine <vsavchuk@productengine.com>2010-12-10 16:30:45 +0200
commita42b6acd6ae677a4347771baa49d75dc560269a3 (patch)
treea98fdf534c42800982c6a02fc206a93d1a4254b6 /indra/newview
parent426744df2c9a6c04bab594fefbd8b35970d0948d (diff)
STORM-431 FIXED Hot keys did't work with autocompletion in search field.
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llsearchcombobox.cpp3
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;
}
}