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.master
parent
8f530bb156
commit
a5f3ac2a8d
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue