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/Region/CoreModules/Avatar | |
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 'OpenSim/Region/CoreModules/Avatar')
3 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs index edb2c56..246cf55 100644 --- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | |||
@@ -819,7 +819,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends | |||
819 | item.AssetType = (int)AssetType.CallingCard; | 819 | item.AssetType = (int)AssetType.CallingCard; |
820 | item.BasePermissions = (uint)PermissionMask.Copy; | 820 | item.BasePermissions = (uint)PermissionMask.Copy; |
821 | item.CreationDate = Util.UnixTimeSinceEpoch(); | 821 | item.CreationDate = Util.UnixTimeSinceEpoch(); |
822 | item.Creator = creator; | 822 | item.CreatorId = creator.ToString(); |
823 | item.CurrentPermissions = item.BasePermissions; | 823 | item.CurrentPermissions = item.BasePermissions; |
824 | item.Description = ""; | 824 | item.Description = ""; |
825 | item.EveryOnePermissions = (uint)PermissionMask.None; | 825 | item.EveryOnePermissions = (uint)PermissionMask.None; |
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs index 8dec2c4..8732e2e 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs | |||
@@ -97,7 +97,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
97 | item.InvType = Convert.ToInt32(reader.ReadString()); | 97 | item.InvType = Convert.ToInt32(reader.ReadString()); |
98 | reader.ReadEndElement(); | 98 | reader.ReadEndElement(); |
99 | reader.ReadStartElement("CreatorUUID"); | 99 | reader.ReadStartElement("CreatorUUID"); |
100 | item.Creator = UUID.Parse(reader.ReadString()); | 100 | item.CreatorId = reader.ReadString(); |
101 | reader.ReadEndElement(); | 101 | reader.ReadEndElement(); |
102 | reader.ReadStartElement("CreationDate"); | 102 | reader.ReadStartElement("CreationDate"); |
103 | item.CreationDate = Convert.ToInt32(reader.ReadString()); | 103 | item.CreationDate = Convert.ToInt32(reader.ReadString()); |
@@ -329,7 +329,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
329 | // Don't use the item ID that's in the file | 329 | // Don't use the item ID that's in the file |
330 | item.ID = UUID.Random(); | 330 | item.ID = UUID.Random(); |
331 | 331 | ||
332 | item.Creator = m_userInfo.UserProfile.ID; | 332 | item.CreatorId = m_userInfo.UserProfile.ID.ToString(); |
333 | item.Owner = m_userInfo.UserProfile.ID; | 333 | item.Owner = m_userInfo.UserProfile.ID; |
334 | 334 | ||
335 | // Reset folder ID to the one in which we want to load it | 335 | // Reset folder ID to the one in which we want to load it |
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs index 90a51c3..f302696 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs | |||
@@ -140,7 +140,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
140 | writer.WriteString(inventoryItem.InvType.ToString()); | 140 | writer.WriteString(inventoryItem.InvType.ToString()); |
141 | writer.WriteEndElement(); | 141 | writer.WriteEndElement(); |
142 | writer.WriteStartElement("CreatorUUID"); | 142 | writer.WriteStartElement("CreatorUUID"); |
143 | writer.WriteString(inventoryItem.Creator.ToString()); | 143 | writer.WriteString(inventoryItem.CreatorId); |
144 | writer.WriteEndElement(); | 144 | writer.WriteEndElement(); |
145 | writer.WriteStartElement("CreationDate"); | 145 | writer.WriteStartElement("CreationDate"); |
146 | writer.WriteString(inventoryItem.CreationDate.ToString()); | 146 | writer.WriteString(inventoryItem.CreationDate.ToString()); |
@@ -189,7 +189,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
189 | 189 | ||
190 | m_archive.WriteFile(filename, sw.ToString()); | 190 | m_archive.WriteFile(filename, sw.ToString()); |
191 | 191 | ||
192 | UUID creatorId = inventoryItem.Creator; | 192 | UUID creatorId = inventoryItem.CreatorIdAsUuid; |
193 | 193 | ||
194 | // Record the creator of this item | 194 | // Record the creator of this item |
195 | m_userUuids[creatorId] = 1; | 195 | m_userUuids[creatorId] = 1; |