From b16abc8166c29585cb76cc55c3bdd76e5833cb4f Mon Sep 17 00:00:00 2001 From: Melanie Thielker Date: Thu, 5 Jan 2017 19:07:37 +0000 Subject: Massive tab and trailing space cleanup --- .../CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs | 2 +- .../CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs | 6 +++--- .../Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'OpenSim/Region/CoreModules/Agent/AssetTransaction') diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs index 1a19585..f48710f 100644 --- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs +++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs @@ -127,7 +127,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction if (estateModule.IsTerrainXfer(xferID)) return; } - + m_log.ErrorFormat( "[AGENT ASSET TRANSACTIONS]: Could not find uploader for xfer id {0}, packet id {1}, data length {2}", xferID, packetID, data.Length); diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs index f489262..89fdf09 100644 --- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs +++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs @@ -43,7 +43,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction IAgentAssetTransactions { // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); - + protected Scene m_Scene; private bool m_dumpAssetsToFile = false; private int m_levelUpload = 0; @@ -53,7 +53,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction /// private Dictionary AgentTransactions = new Dictionary(); - + #region Region Module interface public void Initialise(IConfigSource source) @@ -241,7 +241,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction // m_log.DebugFormat( // "[ASSET TRANSACTION MODULE]: HandleUDPUploadRequest - assetID: {0}, transaction {1}, type {2}, storeLocal {3}, tempFile {4}, data.Length {5}", // assetID, transactionID, type, storeLocal, tempFile, data.Length); - + if (((AssetType)type == AssetType.Texture || (AssetType)type == AssetType.Sound || (AssetType)type == AssetType.TextureTGA || diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs index 60a254e..d2aa177 100644 --- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs +++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs @@ -41,7 +41,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction { public class AssetXferUploader { - + private List defaultIDs = new List { // Viewer's notion of the default texture new UUID("5748decc-f629-461c-9a36-a35a221fe21f"), // others == default blank -- cgit v1.1