From 509ec2637bd178c270106725297da7f6a1180096 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Mon, 4 May 2009 15:02:14 +0000
Subject: * Refactor: Simplify InventoryFolderImpl.  No functional change.

---
 OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs  | 6 +-----
 .../Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs       | 6 ++----
 2 files changed, 3 insertions(+), 9 deletions(-)

(limited to 'OpenSim/Region')

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
                
             }
 
-
             // Cache Decoded layers
             lock (m_cacheddecode)
             {
                 if (!m_cacheddecode.ContainsKey(AssetId))
                     m_cacheddecode.Add(AssetId, layers);
 
-            }
-
-            
+            }            
 
             // Notify Interested Parties
             lock (m_notifyList)
@@ -371,7 +368,6 @@ namespace OpenSim.Region.CoreModules.Agent.TextureSender
             {
                 Createj2KCacheFolder(pFolder);
             }
-
         }
 
         /// <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
             string filename = string.Format("{0}{1}_{2}.xml", path, inventoryItem.Name, inventoryItem.ID);            
             string serialization = UserInventoryItemSerializer.Serialize(inventoryItem);
             m_archive.WriteFile(filename, serialization);
-
-            UUID creatorId = inventoryItem.CreatorIdAsUuid;
             
-            // Record the creator of this item
-            m_userUuids[creatorId] = 1;
+            // Record the creator of this item for user record purposes (which might go away soon)
+            m_userUuids[inventoryItem.CreatorIdAsUuid] = 1;
 
             m_assetGatherer.GatherAssetUuids(inventoryItem.AssetID, (AssetType)inventoryItem.AssetType, m_assetUuids);
         }
-- 
cgit v1.1