From a5f3ac2a8dc9aee2c04f24c3b3304c1b24808acb Mon Sep 17 00:00:00 2001
From: Josh Bell <josh@lindenlab.com>
Date: Thu, 13 Sep 2007 17:48:39 +0000
Subject: [PATCH] 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.
---
indra/newview/llfolderview.cpp | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp
index 20f00e297d8..f0d6d2d0b1c 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;
}
--
GitLab