aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authoropensim mirror account2010-11-23 07:20:16 -0800
committeropensim mirror account2010-11-23 07:20:16 -0800
commitcb2b1257e9add5155d372bb5c0e347e2a14fc10a (patch)
treee425b306aa311c639115904df9a68241078b1689 /OpenSim/Framework
parentMerge branch 'master' of /var/git/opensim/ (diff)
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC_OLD-cb2b1257e9add5155d372bb5c0e347e2a14fc10a.zip
opensim-SC_OLD-cb2b1257e9add5155d372bb5c0e347e2a14fc10a.tar.gz
opensim-SC_OLD-cb2b1257e9add5155d372bb5c0e347e2a14fc10a.tar.bz2
opensim-SC_OLD-cb2b1257e9add5155d372bb5c0e347e2a14fc10a.tar.xz
Merge branch 'master' of /var/git/opensim/
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Capabilities/Caps.cs1
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Framework/Capabilities/Caps.cs b/OpenSim/Framework/Capabilities/Caps.cs
index 7b0e053..e7f2e13 100644
--- a/OpenSim/Framework/Capabilities/Caps.cs
+++ b/OpenSim/Framework/Capabilities/Caps.cs
@@ -967,6 +967,7 @@ namespace OpenSim.Framework.Capabilities
967 InventoryItemBase item = new InventoryItemBase(); 967 InventoryItemBase item = new InventoryItemBase();
968 item.Owner = m_agentID; 968 item.Owner = m_agentID;
969 item.CreatorId = m_agentID.ToString(); 969 item.CreatorId = m_agentID.ToString();
970 item.CreatorData = String.Empty;
970 item.ID = inventoryItem; 971 item.ID = inventoryItem;
971 item.AssetID = asset.FullID; 972 item.AssetID = asset.FullID;
972 item.Description = assetDescription; 973 item.Description = assetDescription;