diff options
author | Melanie | 2010-11-22 00:46:37 +0000 |
---|---|---|
committer | Melanie | 2010-11-22 00:46:37 +0000 |
commit | 8466ada8e05c69d9fcd6f8191803d5c40659b641 (patch) | |
tree | 1ad6665b23863060d4ba1c1a91cae4f33f017a38 /OpenSim/Server | |
parent | Fox the buglets in Freeswitch. Grid mode works now and there is no reason why... (diff) | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC-8466ada8e05c69d9fcd6f8191803d5c40659b641.zip opensim-SC-8466ada8e05c69d9fcd6f8191803d5c40659b641.tar.gz opensim-SC-8466ada8e05c69d9fcd6f8191803d5c40659b641.tar.bz2 opensim-SC-8466ada8e05c69d9fcd6f8191803d5c40659b641.tar.xz |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs b/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs index ac6a3ab..23ae5b4 100644 --- a/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs +++ b/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs | |||
@@ -601,6 +601,7 @@ namespace OpenSim.Server.Handlers.Asset | |||
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 | ret["CreatorId"] = item.CreatorId.ToString(); |
604 | ret["CreatorData"] = item.CreatorData.ToString(); | ||
604 | ret["CurrentPermissions"] = item.CurrentPermissions.ToString(); | 605 | ret["CurrentPermissions"] = item.CurrentPermissions.ToString(); |
605 | ret["Description"] = item.Description.ToString(); | 606 | ret["Description"] = item.Description.ToString(); |
606 | ret["EveryOnePermissions"] = item.EveryOnePermissions.ToString(); | 607 | ret["EveryOnePermissions"] = item.EveryOnePermissions.ToString(); |
@@ -646,6 +647,7 @@ namespace OpenSim.Server.Handlers.Asset | |||
646 | item.InvType = int.Parse(data["InvType"].ToString()); | 647 | item.InvType = int.Parse(data["InvType"].ToString()); |
647 | item.Folder = new UUID(data["Folder"].ToString()); | 648 | item.Folder = new UUID(data["Folder"].ToString()); |
648 | item.CreatorId = data["CreatorId"].ToString(); | 649 | item.CreatorId = data["CreatorId"].ToString(); |
650 | item.CreatorData = data["CreatorData"].ToString(); | ||
649 | item.Description = data["Description"].ToString(); | 651 | item.Description = data["Description"].ToString(); |
650 | item.NextPermissions = uint.Parse(data["NextPermissions"].ToString()); | 652 | item.NextPermissions = uint.Parse(data["NextPermissions"].ToString()); |
651 | item.CurrentPermissions = uint.Parse(data["CurrentPermissions"].ToString()); | 653 | item.CurrentPermissions = uint.Parse(data["CurrentPermissions"].ToString()); |