aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Framework/Capabilities/Caps.cs1
-rw-r--r--OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs6
-rw-r--r--OpenSim/Services/Connectors/Inventory/XInventoryConnector.cs9
3 files changed, 13 insertions, 3 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;
diff --git a/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs b/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs
index 23ae5b4..22a718a 100644
--- a/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs
+++ b/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs
@@ -600,8 +600,10 @@ namespace OpenSim.Server.Handlers.Asset
600 ret["AssetType"] = item.AssetType.ToString(); 600 ret["AssetType"] = item.AssetType.ToString();
601 ret["BasePermissions"] = item.BasePermissions.ToString(); 601 ret["BasePermissions"] = item.BasePermissions.ToString();
602 ret["CreationDate"] = item.CreationDate.ToString(); 602 ret["CreationDate"] = item.CreationDate.ToString();
603 ret["CreatorId"] = item.CreatorId.ToString(); 603 if (item.CreatorId != null)
604 ret["CreatorData"] = item.CreatorData.ToString(); 604 ret["CreatorId"] = item.CreatorId.ToString();
605 else
606 ret["CreatorId"] = String.Empty;
605 ret["CurrentPermissions"] = item.CurrentPermissions.ToString(); 607 ret["CurrentPermissions"] = item.CurrentPermissions.ToString();
606 ret["Description"] = item.Description.ToString(); 608 ret["Description"] = item.Description.ToString();
607 ret["EveryOnePermissions"] = item.EveryOnePermissions.ToString(); 609 ret["EveryOnePermissions"] = item.EveryOnePermissions.ToString();
diff --git a/OpenSim/Services/Connectors/Inventory/XInventoryConnector.cs b/OpenSim/Services/Connectors/Inventory/XInventoryConnector.cs
index 88fbda3..b3bfcc2 100644
--- a/OpenSim/Services/Connectors/Inventory/XInventoryConnector.cs
+++ b/OpenSim/Services/Connectors/Inventory/XInventoryConnector.cs
@@ -302,6 +302,8 @@ namespace OpenSim.Services.Connectors
302 302
303 public bool AddItem(InventoryItemBase item) 303 public bool AddItem(InventoryItemBase item)
304 { 304 {
305 if (item.CreatorData == null)
306 item.CreatorData = String.Empty;
305 Dictionary<string,object> ret = MakeRequest("ADDITEM", 307 Dictionary<string,object> ret = MakeRequest("ADDITEM",
306 new Dictionary<string,object> { 308 new Dictionary<string,object> {
307 { "AssetID", item.AssetID.ToString() }, 309 { "AssetID", item.AssetID.ToString() },
@@ -335,6 +337,8 @@ namespace OpenSim.Services.Connectors
335 337
336 public bool UpdateItem(InventoryItemBase item) 338 public bool UpdateItem(InventoryItemBase item)
337 { 339 {
340 if (item.CreatorData == null)
341 item.CreatorData = String.Empty;
338 Dictionary<string,object> ret = MakeRequest("UPDATEITEM", 342 Dictionary<string,object> ret = MakeRequest("UPDATEITEM",
339 new Dictionary<string,object> { 343 new Dictionary<string,object> {
340 { "AssetID", item.AssetID.ToString() }, 344 { "AssetID", item.AssetID.ToString() },
@@ -558,7 +562,10 @@ namespace OpenSim.Services.Connectors
558 item.InvType = int.Parse(data["InvType"].ToString()); 562 item.InvType = int.Parse(data["InvType"].ToString());
559 item.Folder = new UUID(data["Folder"].ToString()); 563 item.Folder = new UUID(data["Folder"].ToString());
560 item.CreatorId = data["CreatorId"].ToString(); 564 item.CreatorId = data["CreatorId"].ToString();
561 item.CreatorData = data["CreatorData"].ToString(); 565 if (data.ContainsKey("CreatorData"))
566 item.CreatorData = data["CreatorData"].ToString();
567 else
568 item.CreatorData = String.Empty;
562 item.Description = data["Description"].ToString(); 569 item.Description = data["Description"].ToString();
563 item.NextPermissions = uint.Parse(data["NextPermissions"].ToString()); 570 item.NextPermissions = uint.Parse(data["NextPermissions"].ToString());
564 item.CurrentPermissions = uint.Parse(data["CurrentPermissions"].ToString()); 571 item.CurrentPermissions = uint.Parse(data["CurrentPermissions"].ToString());