aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs6
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs6
2 files changed, 3 insertions, 9 deletions
diff --git a/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs b/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs
index cf9a240..99c0f61 100644
--- a/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs
+++ b/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs
@@ -325,16 +325,13 @@ namespace OpenSim.Region.CoreModules.Agent.TextureSender
325 325
326 } 326 }
327 327
328
329 // Cache Decoded layers 328 // Cache Decoded layers
330 lock (m_cacheddecode) 329 lock (m_cacheddecode)
331 { 330 {
332 if (!m_cacheddecode.ContainsKey(AssetId)) 331 if (!m_cacheddecode.ContainsKey(AssetId))
333 m_cacheddecode.Add(AssetId, layers); 332 m_cacheddecode.Add(AssetId, layers);
334 333
335 } 334 }
336
337
338 335
339 // Notify Interested Parties 336 // Notify Interested Parties
340 lock (m_notifyList) 337 lock (m_notifyList)
@@ -371,7 +368,6 @@ namespace OpenSim.Region.CoreModules.Agent.TextureSender
371 { 368 {
372 Createj2KCacheFolder(pFolder); 369 Createj2KCacheFolder(pFolder);
373 } 370 }
374
375 } 371 }
376 372
377 /// <summary> 373 /// <summary>
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
index 833b64a..9c45fd2 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
@@ -126,11 +126,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
126 string filename = string.Format("{0}{1}_{2}.xml", path, inventoryItem.Name, inventoryItem.ID); 126 string filename = string.Format("{0}{1}_{2}.xml", path, inventoryItem.Name, inventoryItem.ID);
127 string serialization = UserInventoryItemSerializer.Serialize(inventoryItem); 127 string serialization = UserInventoryItemSerializer.Serialize(inventoryItem);
128 m_archive.WriteFile(filename, serialization); 128 m_archive.WriteFile(filename, serialization);
129
130 UUID creatorId = inventoryItem.CreatorIdAsUuid;
131 129
132 // Record the creator of this item 130 // Record the creator of this item for user record purposes (which might go away soon)
133 m_userUuids[creatorId] = 1; 131 m_userUuids[inventoryItem.CreatorIdAsUuid] = 1;
134 132
135 m_assetGatherer.GatherAssetUuids(inventoryItem.AssetID, (AssetType)inventoryItem.AssetType, m_assetUuids); 133 m_assetGatherer.GatherAssetUuids(inventoryItem.AssetID, (AssetType)inventoryItem.AssetType, m_assetUuids);
136 } 134 }