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/CoreModules/Avatar/Inventory/Transfer | |
parent | Thank you kindly, Godfrey, for a patch that: (diff) | |
download | opensim-SC_OLD-3dc2010da6412941bfbcdb29007b12a8f37b7bef.zip opensim-SC_OLD-3dc2010da6412941bfbcdb29007b12a8f37b7bef.tar.gz opensim-SC_OLD-3dc2010da6412941bfbcdb29007b12a8f37b7bef.tar.bz2 opensim-SC_OLD-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/CoreModules/Avatar/Inventory/Transfer')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs index d862c06..811d4cc 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs | |||
@@ -128,11 +128,14 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer | |||
128 | 128 | ||
129 | private void OnInstantMessage(IClientAPI client, GridInstantMessage im) | 129 | private void OnInstantMessage(IClientAPI client, GridInstantMessage im) |
130 | { | 130 | { |
131 | m_log.InfoFormat("OnInstantMessage {0}", im.dialog); | ||
131 | Scene scene = FindClientScene(client.AgentId); | 132 | Scene scene = FindClientScene(client.AgentId); |
132 | 133 | ||
133 | if (scene == null) // Something seriously wrong here. | 134 | if (scene == null) // Something seriously wrong here. |
134 | return; | 135 | return; |
135 | 136 | ||
137 | |||
138 | |||
136 | if (im.dialog == (byte) InstantMessageDialog.InventoryOffered) | 139 | if (im.dialog == (byte) InstantMessageDialog.InventoryOffered) |
137 | { | 140 | { |
138 | //m_log.DebugFormat("Asset type {0}", ((AssetType)im.binaryBucket[0])); | 141 | //m_log.DebugFormat("Asset type {0}", ((AssetType)im.binaryBucket[0])); |
@@ -177,6 +180,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer | |||
177 | { | 180 | { |
178 | // First byte of the array is probably the item type | 181 | // First byte of the array is probably the item type |
179 | // Next 16 bytes are the UUID | 182 | // Next 16 bytes are the UUID |
183 | m_log.Info("OnInstantMessage - giving item"); | ||
180 | 184 | ||
181 | UUID itemID = new UUID(im.binaryBucket, 1); | 185 | UUID itemID = new UUID(im.binaryBucket, 1); |
182 | 186 | ||
@@ -382,6 +386,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer | |||
382 | { | 386 | { |
383 | // Check if this is ours to handle | 387 | // Check if this is ours to handle |
384 | // | 388 | // |
389 | m_log.Info("OnFridInstantMessage"); | ||
385 | if (msg.dialog != (byte) InstantMessageDialog.InventoryOffered) | 390 | if (msg.dialog != (byte) InstantMessageDialog.InventoryOffered) |
386 | return; | 391 | return; |
387 | 392 | ||