diff options
author | Justin Clarke Casey | 2009-04-08 17:50:57 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2009-04-08 17:50:57 +0000 |
commit | f3c7298fc5bdb35e8a293c9aee4134c8e8fe2856 (patch) | |
tree | cdcef4e023e1adf8bb4a83e5ebe81448dbf33c6b /OpenSim/Framework/Communications/Capabilities/Caps.cs | |
parent | * Fix the remainder of the packets that require sessionId checks. (diff) | |
download | opensim-SC_OLD-f3c7298fc5bdb35e8a293c9aee4134c8e8fe2856.zip opensim-SC_OLD-f3c7298fc5bdb35e8a293c9aee4134c8e8fe2856.tar.gz opensim-SC_OLD-f3c7298fc5bdb35e8a293c9aee4134c8e8fe2856.tar.bz2 opensim-SC_OLD-f3c7298fc5bdb35e8a293c9aee4134c8e8fe2856.tar.xz |
* Make it possible to store creator strings in user inventory items as well as UUIDs
* All existing functionality should be unaffected.
* Database schemas have not been changed.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/Communications/Capabilities/Caps.cs | 4 |
1 files changed, 2 insertions, 2 deletions
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; |