diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-22 11:09:45 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-22 11:09:45 +0100 |
| commit | d1910d93eb1f1e07362e99f68a0f69a664867e0d (patch) | |
| tree | f24229d8ef073a1a427f2273f644cefa84380cbd /indra/newview/llinventorybridge.cpp | |
| parent | bf8bcfe4f76f1805a908af0368e334261b764591 (diff) | |
| parent | ce8451a2578e09c00ef53b768a5dbb3e87999d0c (diff) | |
merge from viewer-trunk
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 9762897491..9a83d9d3b1 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -2532,6 +2532,7 @@ void LLFolderBridge::pasteLinkFromClipboard() item->getLinkedUUID(), parent_id, item->getName(), + item->getDescription(), LLAssetType::AT_LINK, LLPointer<LLInventoryCallback>(NULL)); } @@ -3179,6 +3180,7 @@ BOOL LLFolderBridge::dragItemIntoFolder(LLInventoryItem* inv_item, inv_item->getLinkedUUID(), mUUID, inv_item->getName(), + inv_item->getDescription(), LLAssetType::AT_LINK, cb); } |