diff options
| author | richard <none@none> | 2010-01-07 19:05:40 -0800 |
|---|---|---|
| committer | richard <none@none> | 2010-01-07 19:05:40 -0800 |
| commit | 96898f35e8b65beb704ed13e5fb8ef4f43497675 (patch) | |
| tree | 0815d61932ea63879b6c5257294b07a72749ec63 /indra/newview/llfolderview.cpp | |
| parent | 26d2a5fea1d87ef531a5b66a8eed712f96096f51 (diff) | |
| parent | 3a0b948bb355ab11f03173f3db06e63504ef0ac8 (diff) | |
merge
Diffstat (limited to 'indra/newview/llfolderview.cpp')
| -rw-r--r-- | indra/newview/llfolderview.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp index 112b23d2df..41f4d1a663 100644 --- a/indra/newview/llfolderview.cpp +++ b/indra/newview/llfolderview.cpp @@ -569,6 +569,8 @@ LLFolderViewItem* LLFolderView::getCurSelectedItem( void ) BOOL LLFolderView::setSelection(LLFolderViewItem* selection, BOOL openitem, BOOL take_keyboard_focus) { + mSignalSelectCallback = take_keyboard_focus ? SIGNAL_KEYBOARD_FOCUS : SIGNAL_NO_KEYBOARD_FOCUS; + if( selection == this ) { return FALSE; @@ -596,8 +598,6 @@ BOOL LLFolderView::setSelection(LLFolderViewItem* selection, BOOL openitem, llassert(mSelectedItems.size() <= 1); - mSignalSelectCallback = take_keyboard_focus ? SIGNAL_KEYBOARD_FOCUS : SIGNAL_NO_KEYBOARD_FOCUS; - return rv; } |