From 8f55b9d735fbc975ce7a4b54e972c17ffbfb1f49 Mon Sep 17 00:00:00 2001 From: Charles Krinke Date: Sun, 22 Feb 2009 20:52:55 +0000 Subject: Mantis#3218. Thank you kindly, TLaukkan (Tommil) for a patch that: * Added log4net dependency to physxplugin in prebuild.xml. * Added missing m_log fields to classes. * Replaced Console.WriteLine with appropriate m_log.Xxxx * Tested that nant test target runs succesfully. * Tested that local opensim sandbox starts up without errors. --- .../Agent/AssetTransaction/AgentAssetTransactionsManager.cs | 6 +++--- .../Agent/AssetTransaction/AssetTransactionModule.cs | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'OpenSim/Region/CoreModules/Agent/AssetTransaction') diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetTransactionsManager.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetTransactionsManager.cs index 3c24b05..312c434 100644 --- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetTransactionsManager.cs +++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetTransactionsManager.cs @@ -176,7 +176,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction public void HandleUDPUploadRequest(IClientAPI remoteClient, UUID assetID, UUID transaction, sbyte type, byte[] data, bool storeLocal, bool tempFile) { - //System.Console.WriteLine("HandleUDPUploadRequest - assetID: " + assetID.ToString() + " transaction: " + transaction.ToString() + " type: " + type.ToString() + " storelocal: " + storeLocal + " tempFile: " + tempFile); + //m_log.Debug("HandleUDPUploadRequest - assetID: " + assetID.ToString() + " transaction: " + transaction.ToString() + " type: " + type.ToString() + " storelocal: " + storeLocal + " tempFile: " + tempFile); if (((AssetType)type == AssetType.Texture || (AssetType)type == AssetType.Sound || (AssetType)type == AssetType.TextureTGA || @@ -196,7 +196,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction } } - //Console.WriteLine("asset upload of " + assetID); + //m_log.Debug("asset upload of " + assetID); AgentAssetTransactions transactions = GetUserTransactions(remoteClient.AgentId); AssetXferUploader uploader = transactions.RequestXferUploader(transaction); @@ -216,7 +216,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction /// public void HandleXfer(IClientAPI remoteClient, ulong xferID, uint packetID, byte[] data) { - //System.Console.WriteLine("xferID: " + xferID + " packetID: " + packetID + " data!"); + //m_log.Debug("xferID: " + xferID + " packetID: " + packetID + " data!"); AgentAssetTransactions transactions = GetUserTransactions(remoteClient.AgentId); transactions.HandleXfer(xferID, packetID, data); diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs index 3fd4a70..0adafd3 100644 --- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs +++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs @@ -55,7 +55,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction public AssetTransactionModule() { - // System.Console.WriteLine("creating AgentAssetTransactionModule"); + //m_log.Debug("creating AgentAssetTransactionModule"); } #region IRegionModule Members @@ -64,7 +64,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction { if (!RegisteredScenes.ContainsKey(scene.RegionInfo.RegionID)) { - // System.Console.WriteLine("initialising AgentAssetTransactionModule"); + // m_log.Debug("initialising AgentAssetTransactionModule"); RegisteredScenes.Add(scene.RegionInfo.RegionID, scene); scene.RegisterModuleInterface(this); @@ -237,7 +237,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction public void HandleUDPUploadRequest(IClientAPI remoteClient, UUID assetID, UUID transaction, sbyte type, byte[] data, bool storeLocal, bool tempFile) { - //System.Console.WriteLine("HandleUDPUploadRequest - assetID: " + assetID.ToString() + " transaction: " + transaction.ToString() + " type: " + type.ToString() + " storelocal: " + storeLocal + " tempFile: " + tempFile); + //m_log.Debug("HandleUDPUploadRequest - assetID: " + assetID.ToString() + " transaction: " + transaction.ToString() + " type: " + type.ToString() + " storelocal: " + storeLocal + " tempFile: " + tempFile); if (((AssetType)type == AssetType.Texture || (AssetType)type == AssetType.Sound || (AssetType)type == AssetType.TextureTGA || @@ -257,7 +257,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction } } - //Console.WriteLine("asset upload of " + assetID); + //m_log.Debug("asset upload of " + assetID); AgentAssetTransactions transactions = GetUserTransactions(remoteClient.AgentId); AssetXferUploader uploader = transactions.RequestXferUploader(transaction); @@ -277,7 +277,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction /// public void HandleXfer(IClientAPI remoteClient, ulong xferID, uint packetID, byte[] data) { - //System.Console.WriteLine("xferID: " + xferID + " packetID: " + packetID + " data!"); + //m_log.Debug("xferID: " + xferID + " packetID: " + packetID + " data!"); AgentAssetTransactions transactions = GetUserTransactions(remoteClient.AgentId); transactions.HandleXfer(xferID, packetID, data); -- cgit v1.1