A whole bunch of fucking crap that didn't work while trying to restore the Pretend Inventory folder, fix for (temporary) not showing up near temp uploads. Temporary uploads still broken a bit -- Always show up at the very bottom of the texture folder, but goddamnit they work shut up. >:||

This commit is contained in:
CharleyLevenque
2010-08-25 07:47:26 -04:00
parent a901796893
commit ac3d4c2c32
4 changed files with 33 additions and 3 deletions

View File

@@ -776,6 +776,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)