diff options
Diffstat (limited to 'OpenSim/Framework/Communications')
-rw-r--r-- | OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs | 4 | ||||
-rw-r--r-- | OpenSim/Framework/Communications/Capabilities/Caps.cs | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs index 93f126f..ec62ed2 100644 --- a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs +++ b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs | |||
@@ -72,7 +72,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
72 | { | 72 | { |
73 | InventoryItemBase item = new InventoryItemBase(); | 73 | InventoryItemBase item = new InventoryItemBase(); |
74 | item.Owner = libOwner; | 74 | item.Owner = libOwner; |
75 | item.Creator = libOwner; | 75 | item.CreatorId = libOwner.ToString(); |
76 | item.ID = inventoryID; | 76 | item.ID = inventoryID; |
77 | item.AssetID = assetID; | 77 | item.AssetID = assetID; |
78 | item.Description = description; | 78 | item.Description = description; |
@@ -159,7 +159,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
159 | { | 159 | { |
160 | InventoryItemBase item = new InventoryItemBase(); | 160 | InventoryItemBase item = new InventoryItemBase(); |
161 | item.Owner = libOwner; | 161 | item.Owner = libOwner; |
162 | item.Creator = libOwner; | 162 | item.CreatorId = libOwner.ToString(); |
163 | item.ID = new UUID(config.GetString("inventoryID", ID.ToString())); | 163 | item.ID = new UUID(config.GetString("inventoryID", ID.ToString())); |
164 | item.AssetID = new UUID(config.GetString("assetID", item.ID.ToString())); | 164 | item.AssetID = new UUID(config.GetString("assetID", item.ID.ToString())); |
165 | item.Folder = new UUID(config.GetString("folderID", ID.ToString())); | 165 | item.Folder = new UUID(config.GetString("folderID", ID.ToString())); |
diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs index 1423e3a..a2e8042 100644 --- a/OpenSim/Framework/Communications/Capabilities/Caps.cs +++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs | |||
@@ -440,7 +440,7 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
440 | llsdItem.type = Enum.GetName(typeof(AssetType), invItem.AssetType).ToLower(); | 440 | llsdItem.type = Enum.GetName(typeof(AssetType), invItem.AssetType).ToLower(); |
441 | llsdItem.inv_type = Enum.GetName(typeof(InventoryType), invItem.InvType).ToLower(); | 441 | llsdItem.inv_type = Enum.GetName(typeof(InventoryType), invItem.InvType).ToLower(); |
442 | llsdItem.permissions = new LLSDPermissions(); | 442 | llsdItem.permissions = new LLSDPermissions(); |
443 | llsdItem.permissions.creator_id = invItem.Creator; | 443 | llsdItem.permissions.creator_id = invItem.CreatorIdAsUuid; |
444 | llsdItem.permissions.base_mask = (int)invItem.CurrentPermissions; | 444 | llsdItem.permissions.base_mask = (int)invItem.CurrentPermissions; |
445 | llsdItem.permissions.everyone_mask = (int)invItem.EveryOnePermissions; | 445 | llsdItem.permissions.everyone_mask = (int)invItem.EveryOnePermissions; |
446 | llsdItem.permissions.group_id = UUID.Zero; | 446 | llsdItem.permissions.group_id = UUID.Zero; |
@@ -789,7 +789,7 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
789 | 789 | ||
790 | InventoryItemBase item = new InventoryItemBase(); | 790 | InventoryItemBase item = new InventoryItemBase(); |
791 | item.Owner = m_agentID; | 791 | item.Owner = m_agentID; |
792 | item.Creator = m_agentID; | 792 | item.CreatorId = m_agentID.ToString(); |
793 | item.ID = inventoryItem; | 793 | item.ID = inventoryItem; |
794 | item.AssetID = asset.FullID; | 794 | item.AssetID = asset.FullID; |
795 | item.Description = assetDescription; | 795 | item.Description = assetDescription; |