diff options
| author | Josh Bell <josh@lindenlab.com> | 2007-09-13 17:48:39 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2007-09-13 17:48:39 +0000 |
| commit | a5f3ac2a8dc9aee2c04f24c3b3304c1b24808acb (patch) | |
| tree | fa08eb3671de7d3c5387f8aad058e1402d784d10 /indra/newview/llfolderview.cpp | |
| parent | 8f530bb156978f20987cde976c0d7185fd793cf7 (diff) | |
svn merge -c 68578 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-3-Viewer --> release
Re-apply reversion from RC branch. This was un-reverted by the dpo-4 merge.
Diffstat (limited to 'indra/newview/llfolderview.cpp')
| -rw-r--r-- | indra/newview/llfolderview.cpp | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp index 20f00e297d..f0d6d2d0b1 100644 --- a/indra/newview/llfolderview.cpp +++ b/indra/newview/llfolderview.cpp @@ -699,15 +699,7 @@ BOOL LLFolderViewItem::handleHover( S32 x, S32 y, MASK mask ) BOOL LLFolderViewItem::handleDoubleClick( S32 x, S32 y, MASK mask ) { - if (mListener->getInventoryType() == LLInventoryType::IT_LANDMARK) - { - gFocusMgr.setKeyboardFocus(NULL, NULL); // release focus to main window so user can move with arrow keys - mListener->performAction(NULL, &gInventory, "teleport"); - } - else - { - preview(); - } + preview(); return TRUE; } |