aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Capabilities
diff options
context:
space:
mode:
authorJonathan Freedman2010-11-23 22:27:54 -0800
committerJonathan Freedman2010-11-23 22:27:54 -0800
commitbc51dfc45eb73e34d91fd72d0a537ffc907a9da6 (patch)
tree084062cd82e16edbff08a5e3b705458d915caf86 /OpenSim/Framework/Capabilities
parentMerge branch 'master-core' into mantis5110 (diff)
parentMerge branch 'master' of /var/git/opensim/ (diff)
downloadopensim-SC_OLD-bc51dfc45eb73e34d91fd72d0a537ffc907a9da6.zip
opensim-SC_OLD-bc51dfc45eb73e34d91fd72d0a537ffc907a9da6.tar.gz
opensim-SC_OLD-bc51dfc45eb73e34d91fd72d0a537ffc907a9da6.tar.bz2
opensim-SC_OLD-bc51dfc45eb73e34d91fd72d0a537ffc907a9da6.tar.xz
Merge branch 'master-core' into mantis5110
Diffstat (limited to 'OpenSim/Framework/Capabilities')
-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;