diff options
author | Diva Canto | 2015-09-11 09:48:51 -0700 |
---|---|---|
committer | Diva Canto | 2015-09-11 09:48:51 -0700 |
commit | 29aaf5564f52c0c532910764e4218eb6891184ef (patch) | |
tree | 6afb14242bcc0478269ff12909991686af7b10dd /OpenSim/Services | |
parent | Typos in comments (diff) | |
download | opensim-SC_OLD-29aaf5564f52c0c532910764e4218eb6891184ef.zip opensim-SC_OLD-29aaf5564f52c0c532910764e4218eb6891184ef.tar.gz opensim-SC_OLD-29aaf5564f52c0c532910764e4218eb6891184ef.tar.bz2 opensim-SC_OLD-29aaf5564f52c0c532910764e4218eb6891184ef.tar.xz |
Mantis #7720: AssetXferUploader was setting AssetID to UUID.Zero. Before that wouldn't matter (item would be a terminal object) but with the introduction of the item cache, it matters, because the object in the cache was being modified to have AssetID=UUID.Zero. Also keeping the item cache consistent when item properties change.
Diffstat (limited to 'OpenSim/Services')
-rw-r--r-- | OpenSim/Services/Connectors/Inventory/XInventoryServicesConnector.cs | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/OpenSim/Services/Connectors/Inventory/XInventoryServicesConnector.cs b/OpenSim/Services/Connectors/Inventory/XInventoryServicesConnector.cs index f235446..7cecd93 100644 --- a/OpenSim/Services/Connectors/Inventory/XInventoryServicesConnector.cs +++ b/OpenSim/Services/Connectors/Inventory/XInventoryServicesConnector.cs | |||
@@ -474,7 +474,13 @@ namespace OpenSim.Services.Connectors | |||
474 | { "CreationDate", item.CreationDate.ToString() } | 474 | { "CreationDate", item.CreationDate.ToString() } |
475 | }); | 475 | }); |
476 | 476 | ||
477 | return CheckReturn(ret); | 477 | bool result = CheckReturn(ret); |
478 | if (result) | ||
479 | { | ||
480 | m_ItemCache.AddOrUpdate(item.ID, item, CACHE_EXPIRATION_SECONDS); | ||
481 | } | ||
482 | |||
483 | return result; | ||
478 | } | 484 | } |
479 | 485 | ||
480 | public bool MoveItems(UUID principalID, List<InventoryItemBase> items) | 486 | public bool MoveItems(UUID principalID, List<InventoryItemBase> items) |
@@ -518,7 +524,9 @@ namespace OpenSim.Services.Connectors | |||
518 | { | 524 | { |
519 | InventoryItemBase retrieved = null; | 525 | InventoryItemBase retrieved = null; |
520 | if (m_ItemCache.TryGetValue(item.ID, out retrieved)) | 526 | if (m_ItemCache.TryGetValue(item.ID, out retrieved)) |
527 | { | ||
521 | return retrieved; | 528 | return retrieved; |
529 | } | ||
522 | 530 | ||
523 | try | 531 | try |
524 | { | 532 | { |