Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Issue 1419: Moving a link to an inventory folder moves the pointed folder and not the link

Browse Source
This commit is contained in:
Inusaito Sayori
2014-03-25 19:56:41 -04:00
parent ff201ce3f9
commit 361b8852df
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llinventorybridge.cpp
View File

@@ -3542,6 +3542,7 @@ BOOL LLFolderBridge::dragOrDrop(MASK mask, BOOL drop,
// DAD_LINK type might mean one of two asset types: AT_LINK or AT_LINK_FOLDER. // DAD_LINK type might mean one of two asset types: AT_LINK or AT_LINK_FOLDER.
// If we have an item of AT_LINK_FOLDER type we should process the linked // If we have an item of AT_LINK_FOLDER type we should process the linked
// category being dragged or dropped into folder. // category being dragged or dropped into folder.
/* <Singu> Note: No, we shouldn't, this behavior is misleading, just copy the link as usual.
if (inv_item && LLAssetType::AT_LINK_FOLDER == inv_item->getActualType()) if (inv_item && LLAssetType::AT_LINK_FOLDER == inv_item->getActualType())
{ {
LLInventoryCategory* linked_category = gInventory.getCategory(inv_item->getLinkedUUID()); LLInventoryCategory* linked_category = gInventory.getCategory(inv_item->getLinkedUUID());
@@ -3551,6 +3552,7 @@ BOOL LLFolderBridge::dragOrDrop(MASK mask, BOOL drop,
} }
} }
else else
</Singu> */
{ {
accept = dragItemIntoFolder(inv_item, drop); accept = dragItemIntoFolder(inv_item, drop);
} }