diff options
author | Sean Dague | 2009-06-29 15:05:12 +0000 |
---|---|---|
committer | Sean Dague | 2009-06-29 15:05:12 +0000 |
commit | 3dc2010da6412941bfbcdb29007b12a8f37b7bef (patch) | |
tree | f9fa0ad53b712d91d8fcc21aa6513c8a94dd4bf4 /OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |
parent | Thank you kindly, Godfrey, for a patch that: (diff) | |
download | opensim-SC-3dc2010da6412941bfbcdb29007b12a8f37b7bef.zip opensim-SC-3dc2010da6412941bfbcdb29007b12a8f37b7bef.tar.gz opensim-SC-3dc2010da6412941bfbcdb29007b12a8f37b7bef.tar.bz2 opensim-SC-3dc2010da6412941bfbcdb29007b12a8f37b7bef.tar.xz |
From: Chris Yeoh <yeohc@au1.ibm.com>
Attached is a patch that changes the oar file saving of creation date/time to an integer
instead of a string. I did this after justincc emailed me saying there is a problem
with internationalisation doing it the old way and I said I'd fix it. Its been
tested with MySQL and I've made the changes for MSSQL but that hasn't been well tested.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.Inventory.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index 2fc3791..f65f834 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
@@ -448,6 +448,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
448 | // Retrieve the item from the sender | 448 | // Retrieve the item from the sender |
449 | CachedUserInfo senderUserInfo = CommsManager.UserProfileCacheService.GetUserDetails(senderId); | 449 | CachedUserInfo senderUserInfo = CommsManager.UserProfileCacheService.GetUserDetails(senderId); |
450 | 450 | ||
451 | Console.WriteLine("Scene.Inventory.cs: GiveInventoryItem"); | ||
452 | |||
451 | if (senderUserInfo == null) | 453 | if (senderUserInfo == null) |
452 | { | 454 | { |
453 | m_log.ErrorFormat( | 455 | m_log.ErrorFormat( |
@@ -1064,6 +1066,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1064 | 1066 | ||
1065 | private InventoryItemBase CreateAgentInventoryItemFromTask(UUID destAgent, SceneObjectPart part, UUID itemId) | 1067 | private InventoryItemBase CreateAgentInventoryItemFromTask(UUID destAgent, SceneObjectPart part, UUID itemId) |
1066 | { | 1068 | { |
1069 | Console.WriteLine("CreateAgentInventoryItemFromTask"); | ||
1067 | TaskInventoryItem taskItem = part.Inventory.GetInventoryItem(itemId); | 1070 | TaskInventoryItem taskItem = part.Inventory.GetInventoryItem(itemId); |
1068 | 1071 | ||
1069 | if (null == taskItem) | 1072 | if (null == taskItem) |
@@ -1133,6 +1136,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1133 | /// <param name="itemID"></param> | 1136 | /// <param name="itemID"></param> |
1134 | public InventoryItemBase MoveTaskInventoryItem(IClientAPI remoteClient, UUID folderId, SceneObjectPart part, UUID itemId) | 1137 | public InventoryItemBase MoveTaskInventoryItem(IClientAPI remoteClient, UUID folderId, SceneObjectPart part, UUID itemId) |
1135 | { | 1138 | { |
1139 | m_log.Info("Adding task inventory"); | ||
1136 | InventoryItemBase agentItem = CreateAgentInventoryItemFromTask(remoteClient.AgentId, part, itemId); | 1140 | InventoryItemBase agentItem = CreateAgentInventoryItemFromTask(remoteClient.AgentId, part, itemId); |
1137 | 1141 | ||
1138 | if (agentItem == null) | 1142 | if (agentItem == null) |