diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-04-23 13:24:09 -0700 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-04-23 13:24:09 -0700 |
| commit | a42dcc3f5e8dbddbc83500371bcb3d0ca8d91a3b (patch) | |
| tree | 3eafe790e4b51122d6d56c025856a8eb3ca36880 /indra/newview/llinventorybridge.cpp | |
| parent | e1b3919a4fec68f57be6d6de2839dc31b654609f (diff) | |
| parent | e82ed4e8761be902cf3a4d80c337e0cd44d41b17 (diff) | |
automated merge
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 b85bf0d518..b4a1bf2758 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -2520,6 +2520,7 @@ void LLFolderBridge::pasteLinkFromClipboard() item->getLinkedUUID(), parent_id, item->getName(), + item->getDescription(), LLAssetType::AT_LINK, LLPointer<LLInventoryCallback>(NULL)); } @@ -3166,6 +3167,7 @@ BOOL LLFolderBridge::dragItemIntoFolder(LLInventoryItem* inv_item, inv_item->getLinkedUUID(), mUUID, inv_item->getName(), + inv_item->getDescription(), LLAssetType::AT_LINK, cb); } |