diff options
| author | Aaron Brashears <aaronb@lindenlab.com> | 2007-09-13 00:51:23 +0000 |
|---|---|---|
| committer | Aaron Brashears <aaronb@lindenlab.com> | 2007-09-13 00:51:23 +0000 |
| commit | 3d58b54f0e5aeb86efad2450cc4698662e3f4347 (patch) | |
| tree | 0f3530a886725a9deeebd0a73bdfa39a08994515 /indra/newview/llfolderview.cpp | |
| parent | 55e52f363195ca7428a2b3773d8488d09e62b04d (diff) | |
Result of svn merge -r64890:69433 svn+ssh://svn/svn/linden/branches/dpo-4 into release. had to blow away the libraries directory to clear up svn evil.
Diffstat (limited to 'indra/newview/llfolderview.cpp')
| -rw-r--r-- | indra/newview/llfolderview.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp index f0d6d2d0b1..20f00e297d 100644 --- a/indra/newview/llfolderview.cpp +++ b/indra/newview/llfolderview.cpp @@ -699,7 +699,15 @@ BOOL LLFolderViewItem::handleHover( S32 x, S32 y, MASK mask ) BOOL LLFolderViewItem::handleDoubleClick( S32 x, S32 y, MASK mask ) { - preview(); + 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(); + } return TRUE; } |