diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2009-11-13 16:48:53 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2009-11-13 16:48:53 -0500 |
| commit | 2c05c3dab31ee0887d58382cecab903707ae0ee4 (patch) | |
| tree | 6c201970dce16090383be76bbe046da8ee684f8f /indra/newview | |
| parent | 581fccecc805d27b8d9dfacb76cefebe26f9e0b9 (diff) | |
For DEV-41820: Allow dragging links to Looks and Current Look: copy the link, wear if Current Look
--HG--
branch : avatar-pipeline
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 62ae6f501e..bfd30df085 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -2337,7 +2337,7 @@ void LLFolderBridge::pasteLinkFromClipboard() {
link_inventory_item(
gAgent.getID(),
- item->getUUID(),
+ item->getLinkedUUID(),
parent_id,
item->getName(),
LLAssetType::AT_LINK,
@@ -2960,9 +2960,9 @@ BOOL LLFolderBridge::dragItemIntoFolder(LLInventoryItem* inv_item, LLPointer<LLInventoryCallback> cb = NULL;
link_inventory_item(
gAgent.getID(),
- inv_item->getUUID(),
+ inv_item->getLinkedUUID(),
mUUID,
- std::string(),
+ inv_item->getName(),
LLAssetType::AT_LINK,
cb);
}
|