aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llinventoryview.cpp
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llinventoryview.cpp19
1 files changed, 15 insertions, 4 deletions
diff --git a/linden/indra/newview/llinventoryview.cpp b/linden/indra/newview/llinventoryview.cpp
index 2f61bc1..c6c8548 100644
--- a/linden/indra/newview/llinventoryview.cpp
+++ b/linden/indra/newview/llinventoryview.cpp
@@ -12,12 +12,12 @@
12 * ("GPL"), unless you have obtained a separate licensing agreement 12 * ("GPL"), unless you have obtained a separate licensing agreement
13 * ("Other License"), formally executed by you and Linden Lab. Terms of 13 * ("Other License"), formally executed by you and Linden Lab. Terms of
14 * the GPL can be found in doc/GPL-license.txt in this distribution, or 14 * the GPL can be found in doc/GPL-license.txt in this distribution, or
15 * online at http://secondlife.com/developers/opensource/gplv2 15 * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
16 * 16 *
17 * There are special exceptions to the terms and conditions of the GPL as 17 * There are special exceptions to the terms and conditions of the GPL as
18 * it is applied to this Source Code. View the full text of the exception 18 * it is applied to this Source Code. View the full text of the exception
19 * in the file doc/FLOSS-exception.txt in this software distribution, or 19 * in the file doc/FLOSS-exception.txt in this software distribution, or
20 * online at http://secondlife.com/developers/opensource/flossexception 20 * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
21 * 21 *
22 * By copying, modifying or distributing this software, you acknowledge 22 * By copying, modifying or distributing this software, you acknowledge
23 * that you have read and understood your obligations described above, 23 * that you have read and understood your obligations described above,
@@ -1720,10 +1720,21 @@ void LLInventoryPanel::createNewItem(const char* name,
1720 LLAssetType::generateDescriptionFor(asset_type, desc); 1720 LLAssetType::generateDescriptionFor(asset_type, desc);
1721 next_owner_perm = (next_owner_perm) ? next_owner_perm : PERM_MOVE | PERM_TRANSFER; 1721 next_owner_perm = (next_owner_perm) ? next_owner_perm : PERM_MOVE | PERM_TRANSFER;
1722 1722
1723 LLPointer<LLInventoryCallback> cb = NULL; 1723
1724 create_inventory_item(gAgent.getID(), gAgent.getSessionID(), 1724 if (inv_type == LLInventoryType::IT_GESTURE)
1725 {
1726 LLPointer<LLInventoryCallback> cb = new CreateGestureCallback();
1727 create_inventory_item(gAgent.getID(), gAgent.getSessionID(),
1728 parent_id, LLTransactionID::tnull, name, desc, asset_type, inv_type,
1729 NOT_WEARABLE, next_owner_perm, cb);
1730 }
1731 else
1732 {
1733 LLPointer<LLInventoryCallback> cb = NULL;
1734 create_inventory_item(gAgent.getID(), gAgent.getSessionID(),
1725 parent_id, LLTransactionID::tnull, name, desc, asset_type, inv_type, 1735 parent_id, LLTransactionID::tnull, name, desc, asset_type, inv_type,
1726 NOT_WEARABLE, next_owner_perm, cb); 1736 NOT_WEARABLE, next_owner_perm, cb);
1737 }
1727 1738
1728} 1739}
1729 1740