diff options
author | Jonathan Freedman | 2010-11-23 22:27:54 -0800 |
---|---|---|
committer | Jonathan Freedman | 2010-11-23 22:27:54 -0800 |
commit | bc51dfc45eb73e34d91fd72d0a537ffc907a9da6 (patch) | |
tree | 084062cd82e16edbff08a5e3b705458d915caf86 /OpenSim/Services/Connectors/Inventory/XInventoryConnector.cs | |
parent | Merge branch 'master-core' into mantis5110 (diff) | |
parent | Merge branch 'master' of /var/git/opensim/ (diff) | |
download | opensim-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/Services/Connectors/Inventory/XInventoryConnector.cs')
-rw-r--r-- | OpenSim/Services/Connectors/Inventory/XInventoryConnector.cs | 9 |
1 files changed, 8 insertions, 1 deletions
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()); |