From 20a9bf08f51351e1e0a9de94f184ff56cd572665 Mon Sep 17 00:00:00 2001 From: Adam Frisby Date: Thu, 1 May 2008 18:04:42 +0000 Subject: * Rolled back a few changes. --- .../Agent/AssetDownload/AssetDownloadModule.cs | 21 ++++++++++++--------- .../AssetTransaction/AgentAssetsTransactions.cs | 20 ++++++++++---------- .../AssetTransaction/AssetTransactionModule.cs | 13 +++++++++---- .../Agent/TextureDownload/TextureDownloadModule.cs | 9 ++++++--- .../Agent/TextureDownload/TextureNotFoundSender.cs | 6 +++--- .../Modules/Agent/TextureSender/TextureSender.cs | 19 +++++++++---------- .../Environment/Modules/Agent/Xfer/XferModule.cs | 12 ++++++++---- 7 files changed, 57 insertions(+), 43 deletions(-) (limited to 'OpenSim/Region/Environment/Modules/Agent') diff --git a/OpenSim/Region/Environment/Modules/Agent/AssetDownload/AssetDownloadModule.cs b/OpenSim/Region/Environment/Modules/Agent/AssetDownload/AssetDownloadModule.cs index 550b673..48db51b 100644 --- a/OpenSim/Region/Environment/Modules/Agent/AssetDownload/AssetDownloadModule.cs +++ b/OpenSim/Region/Environment/Modules/Agent/AssetDownload/AssetDownloadModule.cs @@ -40,16 +40,15 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetDownload /// /// Asset requests with data which are ready to be sent back to requesters. This includes textures. /// - private readonly List AssetRequests; + private List AssetRequests; - private readonly Dictionary RegisteredScenes = new Dictionary(); + private Scene m_scene; + private Dictionary RegisteredScenes = new Dictionary(); /// /// Assets requests (for each user) which are waiting for asset server data. This includes texture requests /// - private readonly Dictionary> RequestedAssets; - - private Scene m_scene; + private Dictionary> RequestedAssets; public AssetDownloadModule() { @@ -206,18 +205,22 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetDownload { public AssetBase AssetInf; public byte AssetRequestSource = 2; - public long DataPointer; + public long DataPointer = 0; public int DiscardLevel = -1; public AssetBase ImageInfo; public bool IsTextureRequest; - public int NumPackets; - public int PacketCounter; - public byte[] Params; + public int NumPackets = 0; + public int PacketCounter = 0; + public byte[] Params = null; public LLUUID RequestAssetID; public IClientAPI RequestUser; public LLUUID TransferRequestID; //public bool AssetInCache; //public int TimeRequested; + + public AssetRequest() + { + } } #endregion diff --git a/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetsTransactions.cs b/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetsTransactions.cs index 008daa2..555d5f4 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 readonly bool m_dumpAssetsToFile; + private bool m_dumpAssetsToFile; public AgentAssetTransactionsManager Manager; public LLUUID UserID; public Dictionary XferUploaders = new Dictionary(); @@ -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; - private bool m_createItem; + private sbyte invType = 0; + private bool m_createItem = false; private string m_description = String.Empty; - private bool m_finished; + private bool m_dumpAssetToFile; + private bool m_finished = false; private string m_name = String.Empty; private bool m_storeLocal; - private uint nextPerm; + private AgentAssetTransactions m_userTransactions; + private uint nextPerm = 0; private IClientAPI ourClient; public LLUUID TransactionID = LLUUID.Zero; - private sbyte type; + private sbyte type = 0; public bool UploadComplete; - private byte wearableType; + private byte wearableType = 0; 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 = wearableType; + item.Flags = (uint) 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 d7f5804..fcd0e0c 100644 --- a/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetTransactionModule.cs +++ b/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetTransactionModule.cs @@ -40,11 +40,16 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction public class AssetTransactionModule : IRegionModule, IAgentAssetTransactions { private readonly Dictionary RegisteredScenes = new Dictionary(); - private bool m_dumpAssetsToFile; - private Scene m_scene; + private bool m_dumpAssetsToFile = false; + private Scene m_scene = null; private AgentAssetTransactionsManager m_transactionManager; + public AssetTransactionModule() + { + // System.Console.WriteLine("creating AgentAssetTransactionModule"); + } + #region IAgentAssetTransactions Members public void HandleItemCreationFromTransaction(IClientAPI remoteClient, LLUUID transactionID, LLUUID folderID, @@ -140,13 +145,13 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction /// /// Each agent has its own singleton collection of transactions /// - private readonly Dictionary AgentTransactions = + private Dictionary AgentTransactions = new Dictionary(); /// /// Should we dump uploaded assets to the filesystem? /// - private readonly bool m_dumpAssetsToFile; + private bool m_dumpAssetsToFile; public Scene MyScene; diff --git a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureDownloadModule.cs b/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureDownloadModule.cs index 96ef61f..474ac75 100644 --- a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureDownloadModule.cs +++ b/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureDownloadModule.cs @@ -47,8 +47,6 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload private readonly BlockingQueue m_queueSenders = new BlockingQueue(); - private readonly List m_scenes = new List(); - /// /// Each user has their own texture download service. /// @@ -56,9 +54,14 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload new Dictionary(); private Scene m_scene; + private List m_scenes = new List(); private Thread m_thread; + public TextureDownloadModule() + { + } + #region IRegionModule Members public void Initialise(Scene scene, IConfigSource config) @@ -66,7 +69,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload if (m_scene == null) { //Console.WriteLine("Creating Texture download module"); - m_thread = new Thread(ProcessTextureSenders); + m_thread = new Thread(new ThreadStart(ProcessTextureSenders)); m_thread.Name = "ProcessTextureSenderThread"; m_thread.IsBackground = true; m_thread.Start(); diff --git a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureNotFoundSender.cs b/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureNotFoundSender.cs index 7d4c919..70e44d4 100644 --- a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureNotFoundSender.cs +++ b/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureNotFoundSender.cs @@ -40,13 +40,13 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload //private static readonly log4net.ILog m_log // = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); - private readonly LLUUID m_textureId; - private bool m_cancel; + private bool m_cancel = false; private IClientAPI m_client; // See ITextureSender - private bool m_sending; + private bool m_sending = false; + private LLUUID m_textureId; // See ITextureSender diff --git a/OpenSim/Region/Environment/Modules/Agent/TextureSender/TextureSender.cs b/OpenSim/Region/Environment/Modules/Agent/TextureSender/TextureSender.cs index 44b9a23..02c541b 100644 --- a/OpenSim/Region/Environment/Modules/Agent/TextureSender/TextureSender.cs +++ b/OpenSim/Region/Environment/Modules/Agent/TextureSender/TextureSender.cs @@ -43,14 +43,12 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureSender private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); - private readonly IClientAPI RequestUser; - /// /// Records the number of times texture send has been called. /// - public int counter; + public int counter = 0; - public bool ImageLoaded; + public bool ImageLoaded = false; /// /// Holds the texture asset to send. @@ -59,26 +57,27 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureSender //public LLUUID assetID { get { return m_asset.FullID; } } - private bool m_cancel; + private bool m_cancel = false; // See ITextureSender - private bool m_sending; + private bool m_sending = false; /// /// This is actually the number of extra packets required to send the texture data! We always assume /// at least one is required. /// - private int NumPackets; + private int NumPackets = 0; /// /// Holds the packet number to send next. In this case, each packet is 1000 bytes long and starts /// at the 600th byte (0th indexed). /// - private int PacketCounter; + private int PacketCounter = 0; private int RequestedDiscardLevel = -1; - private uint StartPacketNumber; + private IClientAPI RequestUser; + private uint StartPacketNumber = 0; public TextureSender(IClientAPI client, int discardLevel, uint packetNumber) { @@ -191,7 +190,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureSender catch (ArgumentOutOfRangeException) { m_log.Error("[TEXTURE SENDER]: Unable to separate texture into multiple packets: Array bounds failure on asset:" + - m_asset.FullID); + m_asset.FullID.ToString()); return; } RequestUser.OutPacket(im, ThrottleOutPacketType.Texture); diff --git a/OpenSim/Region/Environment/Modules/Agent/Xfer/XferModule.cs b/OpenSim/Region/Environment/Modules/Agent/Xfer/XferModule.cs index eaf2198..8e90d17 100644 --- a/OpenSim/Region/Environment/Modules/Agent/Xfer/XferModule.cs +++ b/OpenSim/Region/Environment/Modules/Agent/Xfer/XferModule.cs @@ -41,6 +41,10 @@ namespace OpenSim.Region.Environment.Modules.Agent.Xfer public Dictionary NewFiles = new Dictionary(); public Dictionary Transfers = new Dictionary(); + public XferModule() + { + } + #region IRegionModule Members public void Initialise(Scene scene, IConfigSource config) @@ -145,11 +149,11 @@ namespace OpenSim.Region.Environment.Modules.Agent.Xfer public IClientAPI Client; private bool complete; public byte[] Data = new byte[0]; - public int DataPointer; + public int DataPointer = 0; public string FileName = String.Empty; - public uint Packet; + public uint Packet = 0; public uint Serial = 1; - public ulong XferID; + public ulong XferID = 0; public XferDownLoad(string fileName, byte[] data, ulong xferID, IClientAPI client) { @@ -213,7 +217,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.Xfer { byte[] transferData = new byte[Data.Length - DataPointer]; Array.Copy(Data, DataPointer, transferData, 0, Data.Length - DataPointer); - uint endPacket = Packet |= 0x80000000; + uint endPacket = Packet |= (uint) 0x80000000; Client.SendXferPacket(XferID, endPacket, transferData); Packet++; DataPointer += (Data.Length - DataPointer); -- cgit v1.1