Fixed pretend inventory drag and drop, and random additions that might

keep us from crashing.
This commit is contained in:
phr0z3nt04st
2010-05-23 20:06:26 -05:00
parent 3d47ba81e5
commit 22469f2222
6 changed files with 205 additions and 73 deletions

View File

@@ -738,7 +738,12 @@ BOOL LLFolderViewItem::handleHover( S32 x, S32 y, MASK mask )
{
src = LLToolDragAndDrop::SOURCE_LIBRARY;
}
// <edit>
else if(mListener && gInventory.isObjectDescendentOf(mListener->getUUID(), gLocalInventoryRoot))
{ // Note: this is only ok if all future pretend folders are subcategories of Pretend Inventory
src = LLToolDragAndDrop::SOURCE_LIBRARY;
}
// </edit>
can_drag = root->startDrag(src);
if (can_drag)
{
@@ -779,7 +784,10 @@ BOOL LLFolderViewItem::handleHover( S32 x, S32 y, MASK mask )
BOOL LLFolderViewItem::handleDoubleClick( S32 x, S32 y, MASK mask )
{
preview();
// <edit>
//preview();
openItem();
// </edit>
return TRUE;
}