diff options
author | Homer Horwitz | 2008-10-18 15:26:41 +0000 |
---|---|---|
committer | Homer Horwitz | 2008-10-18 15:26:41 +0000 |
commit | 3a75a54da1d973d0a8044a680c97bc2a54995548 (patch) | |
tree | 6ab775de65c290ac55b0310c828e0ade7e808403 /OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetXferUploader.cs | |
parent | Guard against a null ref that can prevent objects from being persisted (diff) | |
download | opensim-SC-3a75a54da1d973d0a8044a680c97bc2a54995548.zip opensim-SC-3a75a54da1d973d0a8044a680c97bc2a54995548.tar.gz opensim-SC-3a75a54da1d973d0a8044a680c97bc2a54995548.tar.bz2 opensim-SC-3a75a54da1d973d0a8044a680c97bc2a54995548.tar.xz |
- Fix Util.UnixTimeSinceEpoch:
* Unix epoch starts at midnight, not at 8:00am
* All date/time handling should be done in UTC in the server, not in
the local timezone.
* Refactor out repeated computation of a constant value
- Added setting of CreationTime to some places where inventoryitems
are created
This fixes Mantis#2390.
Diffstat (limited to 'OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetXferUploader.cs')
-rw-r--r-- | OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetXferUploader.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetXferUploader.cs b/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetXferUploader.cs index 2763831..2bac3c7 100644 --- a/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetXferUploader.cs +++ b/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetXferUploader.cs | |||
@@ -278,7 +278,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction | |||
278 | CachedUserInfo userInfo = | 278 | CachedUserInfo userInfo = |
279 | m_userTransactions.Manager.MyScene.CommsManager.UserProfileCacheService.GetUserDetails( | 279 | m_userTransactions.Manager.MyScene.CommsManager.UserProfileCacheService.GetUserDetails( |
280 | ourClient.AgentId); | 280 | ourClient.AgentId); |
281 | 281 | ||
282 | if (userInfo != null) | 282 | if (userInfo != null) |
283 | { | 283 | { |
284 | InventoryItemBase item = new InventoryItemBase(); | 284 | InventoryItemBase item = new InventoryItemBase(); |
@@ -296,6 +296,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction | |||
296 | item.EveryOnePermissions=0; | 296 | item.EveryOnePermissions=0; |
297 | item.NextPermissions = nextPerm; | 297 | item.NextPermissions = nextPerm; |
298 | item.Flags = (uint) wearableType; | 298 | item.Flags = (uint) wearableType; |
299 | item.CreationDate = Util.UnixTimeSinceEpoch(); | ||
299 | 300 | ||
300 | userInfo.AddItem(item); | 301 | userInfo.AddItem(item); |
301 | ourClient.SendInventoryItemCreateUpdate(item); | 302 | ourClient.SendInventoryItemCreateUpdate(item); |