summaryrefslogtreecommitdiff
path: root/indra/llui
diff options
context:
space:
mode:
authorVadim ProductEngine <vsavchuk@productengine.com>2011-09-16 19:09:37 +0300
committerVadim ProductEngine <vsavchuk@productengine.com>2011-09-16 19:09:37 +0300
commit8b7f4d4ea38175ad1ee6cd0fe7d478d1802876c1 (patch)
treebde876ea79e691ff25680d45b446df47a2da3302 /indra/llui
parent2fba01d160716b886a7dfc0c86abda767a25d23f (diff)
STORM-1600 FIXED Folder view stole "Delete" key presses from the line editor when renaming a newly created inventory item.
Reason: LLFocusMgr::setKeyboardFocus() which is called from LLLineEditor::setFocus() makes the folder view the edit menu handler, thus it receives the Delete key presses instead of the line editor. Fix: Make sure the line editor becomes the edit menu handler whenever it's focused, no matter is it a child of a folder view or not.
Diffstat (limited to 'indra/llui')
-rw-r--r--indra/llui/lllineeditor.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llui/lllineeditor.cpp b/indra/llui/lllineeditor.cpp
index ebdd47ae80..06dfc90d83 100644
--- a/indra/llui/lllineeditor.cpp
+++ b/indra/llui/lllineeditor.cpp
@@ -198,6 +198,7 @@ LLLineEditor::~LLLineEditor()
void LLLineEditor::onFocusReceived()
{
+ gEditMenuHandler = this;
LLUICtrl::onFocusReceived();
updateAllowingLanguageInput();
}