From 13526097f24b7a8ad63b1d482c44b44397fa055f Mon Sep 17 00:00:00 2001
From: Adam Frisby
Date: Thu, 1 May 2008 16:35:00 +0000
Subject: * Spring cleaning on Region.Environment. * Converted a large number
 of read-only fields to be actually, readonly. * Reformatted code sections. *
 Removed redundant code.

---
 .../AssetTransaction/AgentAssetsTransactions.cs      | 20 ++++++++++----------
 .../Agent/AssetTransaction/AssetTransactionModule.cs | 13 ++++---------
 2 files changed, 14 insertions(+), 19 deletions(-)

(limited to 'OpenSim/Region/Environment/Modules/Agent/AssetTransaction')

diff --git a/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetsTransactions.cs b/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetsTransactions.cs
index 555d5f4..008daa2 100644
--- a/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetsTransactions.cs
+++ b/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetsTransactions.cs
@@ -44,7 +44,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction
         //   = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
 
         // Fields
-        private bool m_dumpAssetsToFile;
+        private readonly bool m_dumpAssetsToFile;
         public AgentAssetTransactionsManager Manager;
         public LLUUID UserID;
         public Dictionary<LLUUID, AssetXferUploader> XferUploaders = new Dictionary<LLUUID, AssetXferUploader>();
@@ -141,23 +141,23 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction
         public class AssetXferUploader
         {
             // Fields
+            private readonly bool m_dumpAssetToFile;
+            private readonly AgentAssetTransactions m_userTransactions;
             public bool AddToInventory;
             public AssetBase Asset;
             public LLUUID InventFolder = LLUUID.Zero;
-            private sbyte invType = 0;
-            private bool m_createItem = false;
+            private sbyte invType;
+            private bool m_createItem;
             private string m_description = String.Empty;
-            private bool m_dumpAssetToFile;
-            private bool m_finished = false;
+            private bool m_finished;
             private string m_name = String.Empty;
             private bool m_storeLocal;
-            private AgentAssetTransactions m_userTransactions;
-            private uint nextPerm = 0;
+            private uint nextPerm;
             private IClientAPI ourClient;
             public LLUUID TransactionID = LLUUID.Zero;
-            private sbyte type = 0;
+            private sbyte type;
             public bool UploadComplete;
-            private byte wearableType = 0;
+            private byte wearableType;
             public ulong XferID;
 
             public AssetXferUploader(AgentAssetTransactions transactions, bool dumpAssetToFile)
@@ -390,7 +390,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction
                     item.BasePermissions = 2147483647;
                     item.CurrentPermissions = 2147483647;
                     item.NextPermissions = nextPerm;
-                    item.Flags = (uint) wearableType;
+                    item.Flags = wearableType;
 
                     userInfo.AddItem(ourClient.AgentId, item);
                     ourClient.SendInventoryItemCreateUpdate(item);
diff --git a/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetTransactionModule.cs b/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetTransactionModule.cs
index fcd0e0c..d7f5804 100644
--- a/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetTransactionModule.cs
+++ b/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetTransactionModule.cs
@@ -40,16 +40,11 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction
     public class AssetTransactionModule : IRegionModule, IAgentAssetTransactions
     {
         private readonly Dictionary<LLUUID, Scene> RegisteredScenes = new Dictionary<LLUUID, Scene>();
-        private bool m_dumpAssetsToFile = false;
-        private Scene m_scene = null;
+        private bool m_dumpAssetsToFile;
+        private Scene m_scene;
 
         private AgentAssetTransactionsManager m_transactionManager;
 
-        public AssetTransactionModule()
-        {
-            // System.Console.WriteLine("creating AgentAssetTransactionModule");
-        }
-
         #region IAgentAssetTransactions Members
 
         public void HandleItemCreationFromTransaction(IClientAPI remoteClient, LLUUID transactionID, LLUUID folderID,
@@ -145,13 +140,13 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction
         /// <summary>
         /// Each agent has its own singleton collection of transactions
         /// </summary>
-        private Dictionary<LLUUID, AgentAssetTransactions> AgentTransactions =
+        private readonly Dictionary<LLUUID, AgentAssetTransactions> AgentTransactions =
             new Dictionary<LLUUID, AgentAssetTransactions>();
 
         /// <summary>
         /// Should we dump uploaded assets to the filesystem?
         /// </summary>
-        private bool m_dumpAssetsToFile;
+        private readonly bool m_dumpAssetsToFile;
 
         public Scene MyScene;
 
-- 
cgit v1.1