diff options
author | Charles Krinke | 2009-02-22 20:52:55 +0000 |
---|---|---|
committer | Charles Krinke | 2009-02-22 20:52:55 +0000 |
commit | 8f55b9d735fbc975ce7a4b54e972c17ffbfb1f49 (patch) | |
tree | 96a24a49de82056060dd9b7bab0cb209d5f1a129 /OpenSim/Region/CoreModules/Agent | |
parent | Allow delivery of object messages gridwide (diff) | |
download | opensim-SC_OLD-8f55b9d735fbc975ce7a4b54e972c17ffbfb1f49.zip opensim-SC_OLD-8f55b9d735fbc975ce7a4b54e972c17ffbfb1f49.tar.gz opensim-SC_OLD-8f55b9d735fbc975ce7a4b54e972c17ffbfb1f49.tar.bz2 opensim-SC_OLD-8f55b9d735fbc975ce7a4b54e972c17ffbfb1f49.tar.xz |
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.
Diffstat (limited to 'OpenSim/Region/CoreModules/Agent')
4 files changed, 13 insertions, 13 deletions
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 | |||
176 | public void HandleUDPUploadRequest(IClientAPI remoteClient, UUID assetID, UUID transaction, sbyte type, | 176 | public void HandleUDPUploadRequest(IClientAPI remoteClient, UUID assetID, UUID transaction, sbyte type, |
177 | byte[] data, bool storeLocal, bool tempFile) | 177 | byte[] data, bool storeLocal, bool tempFile) |
178 | { | 178 | { |
179 | //System.Console.WriteLine("HandleUDPUploadRequest - assetID: " + assetID.ToString() + " transaction: " + transaction.ToString() + " type: " + type.ToString() + " storelocal: " + storeLocal + " tempFile: " + tempFile); | 179 | //m_log.Debug("HandleUDPUploadRequest - assetID: " + assetID.ToString() + " transaction: " + transaction.ToString() + " type: " + type.ToString() + " storelocal: " + storeLocal + " tempFile: " + tempFile); |
180 | if (((AssetType)type == AssetType.Texture || | 180 | if (((AssetType)type == AssetType.Texture || |
181 | (AssetType)type == AssetType.Sound || | 181 | (AssetType)type == AssetType.Sound || |
182 | (AssetType)type == AssetType.TextureTGA || | 182 | (AssetType)type == AssetType.TextureTGA || |
@@ -196,7 +196,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction | |||
196 | } | 196 | } |
197 | } | 197 | } |
198 | 198 | ||
199 | //Console.WriteLine("asset upload of " + assetID); | 199 | //m_log.Debug("asset upload of " + assetID); |
200 | AgentAssetTransactions transactions = GetUserTransactions(remoteClient.AgentId); | 200 | AgentAssetTransactions transactions = GetUserTransactions(remoteClient.AgentId); |
201 | 201 | ||
202 | AssetXferUploader uploader = transactions.RequestXferUploader(transaction); | 202 | AssetXferUploader uploader = transactions.RequestXferUploader(transaction); |
@@ -216,7 +216,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction | |||
216 | /// <param name="data"></param> | 216 | /// <param name="data"></param> |
217 | public void HandleXfer(IClientAPI remoteClient, ulong xferID, uint packetID, byte[] data) | 217 | public void HandleXfer(IClientAPI remoteClient, ulong xferID, uint packetID, byte[] data) |
218 | { | 218 | { |
219 | //System.Console.WriteLine("xferID: " + xferID + " packetID: " + packetID + " data!"); | 219 | //m_log.Debug("xferID: " + xferID + " packetID: " + packetID + " data!"); |
220 | AgentAssetTransactions transactions = GetUserTransactions(remoteClient.AgentId); | 220 | AgentAssetTransactions transactions = GetUserTransactions(remoteClient.AgentId); |
221 | 221 | ||
222 | transactions.HandleXfer(xferID, packetID, data); | 222 | 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 | |||
55 | 55 | ||
56 | public AssetTransactionModule() | 56 | public AssetTransactionModule() |
57 | { | 57 | { |
58 | // System.Console.WriteLine("creating AgentAssetTransactionModule"); | 58 | //m_log.Debug("creating AgentAssetTransactionModule"); |
59 | } | 59 | } |
60 | 60 | ||
61 | #region IRegionModule Members | 61 | #region IRegionModule Members |
@@ -64,7 +64,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction | |||
64 | { | 64 | { |
65 | if (!RegisteredScenes.ContainsKey(scene.RegionInfo.RegionID)) | 65 | if (!RegisteredScenes.ContainsKey(scene.RegionInfo.RegionID)) |
66 | { | 66 | { |
67 | // System.Console.WriteLine("initialising AgentAssetTransactionModule"); | 67 | // m_log.Debug("initialising AgentAssetTransactionModule"); |
68 | RegisteredScenes.Add(scene.RegionInfo.RegionID, scene); | 68 | RegisteredScenes.Add(scene.RegionInfo.RegionID, scene); |
69 | scene.RegisterModuleInterface<IAgentAssetTransactions>(this); | 69 | scene.RegisterModuleInterface<IAgentAssetTransactions>(this); |
70 | 70 | ||
@@ -237,7 +237,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction | |||
237 | public void HandleUDPUploadRequest(IClientAPI remoteClient, UUID assetID, UUID transaction, sbyte type, | 237 | public void HandleUDPUploadRequest(IClientAPI remoteClient, UUID assetID, UUID transaction, sbyte type, |
238 | byte[] data, bool storeLocal, bool tempFile) | 238 | byte[] data, bool storeLocal, bool tempFile) |
239 | { | 239 | { |
240 | //System.Console.WriteLine("HandleUDPUploadRequest - assetID: " + assetID.ToString() + " transaction: " + transaction.ToString() + " type: " + type.ToString() + " storelocal: " + storeLocal + " tempFile: " + tempFile); | 240 | //m_log.Debug("HandleUDPUploadRequest - assetID: " + assetID.ToString() + " transaction: " + transaction.ToString() + " type: " + type.ToString() + " storelocal: " + storeLocal + " tempFile: " + tempFile); |
241 | if (((AssetType)type == AssetType.Texture || | 241 | if (((AssetType)type == AssetType.Texture || |
242 | (AssetType)type == AssetType.Sound || | 242 | (AssetType)type == AssetType.Sound || |
243 | (AssetType)type == AssetType.TextureTGA || | 243 | (AssetType)type == AssetType.TextureTGA || |
@@ -257,7 +257,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction | |||
257 | } | 257 | } |
258 | } | 258 | } |
259 | 259 | ||
260 | //Console.WriteLine("asset upload of " + assetID); | 260 | //m_log.Debug("asset upload of " + assetID); |
261 | AgentAssetTransactions transactions = GetUserTransactions(remoteClient.AgentId); | 261 | AgentAssetTransactions transactions = GetUserTransactions(remoteClient.AgentId); |
262 | 262 | ||
263 | AssetXferUploader uploader = transactions.RequestXferUploader(transaction); | 263 | AssetXferUploader uploader = transactions.RequestXferUploader(transaction); |
@@ -277,7 +277,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction | |||
277 | /// <param name="data"></param> | 277 | /// <param name="data"></param> |
278 | public void HandleXfer(IClientAPI remoteClient, ulong xferID, uint packetID, byte[] data) | 278 | public void HandleXfer(IClientAPI remoteClient, ulong xferID, uint packetID, byte[] data) |
279 | { | 279 | { |
280 | //System.Console.WriteLine("xferID: " + xferID + " packetID: " + packetID + " data!"); | 280 | //m_log.Debug("xferID: " + xferID + " packetID: " + packetID + " data!"); |
281 | AgentAssetTransactions transactions = GetUserTransactions(remoteClient.AgentId); | 281 | AgentAssetTransactions transactions = GetUserTransactions(remoteClient.AgentId); |
282 | 282 | ||
283 | transactions.HandleXfer(xferID, packetID, data); | 283 | transactions.HandleXfer(xferID, packetID, data); |
diff --git a/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs b/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs index 2c6b51d..39dd84f 100644 --- a/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs +++ b/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs | |||
@@ -188,21 +188,21 @@ namespace OpenSim.Region.CoreModules.Agent.Capabilities | |||
188 | 188 | ||
189 | public void SetChildrenSeed(UUID agentID, Dictionary<ulong, string> seeds) | 189 | public void SetChildrenSeed(UUID agentID, Dictionary<ulong, string> seeds) |
190 | { | 190 | { |
191 | //Console.WriteLine(" !!! Setting child seeds in {0} to {1}", RegionInfo.RegionName, value.Count); | 191 | //m_log.Debug(" !!! Setting child seeds in {0} to {1}", RegionInfo.RegionName, value.Count); |
192 | childrenSeeds[agentID] = seeds; | 192 | childrenSeeds[agentID] = seeds; |
193 | } | 193 | } |
194 | 194 | ||
195 | public void DumpChildrenSeeds(UUID agentID) | 195 | public void DumpChildrenSeeds(UUID agentID) |
196 | { | 196 | { |
197 | Console.WriteLine("================ ChildrenSeed {0} ================", m_scene.RegionInfo.RegionName); | 197 | m_log.Info("================ ChildrenSeed "+m_scene.RegionInfo.RegionName+" ================"); |
198 | foreach (KeyValuePair<ulong, string> kvp in childrenSeeds[agentID]) | 198 | foreach (KeyValuePair<ulong, string> kvp in childrenSeeds[agentID]) |
199 | { | 199 | { |
200 | uint x, y; | 200 | uint x, y; |
201 | Utils.LongToUInts(kvp.Key, out x, out y); | 201 | Utils.LongToUInts(kvp.Key, out x, out y); |
202 | x = x / Constants.RegionSize; | 202 | x = x / Constants.RegionSize; |
203 | y = y / Constants.RegionSize; | 203 | y = y / Constants.RegionSize; |
204 | Console.WriteLine(" >> {0}, {1}: {2}", x, y, kvp.Value); | 204 | m_log.Info(" >> "+x+", "+y+": "+kvp.Value); |
205 | } | 205 | } |
206 | } | 206 | } |
207 | } | 207 | } |
208 | } \ No newline at end of file | 208 | } |
diff --git a/OpenSim/Region/CoreModules/Agent/TextureDownload/TextureDownloadModule.cs b/OpenSim/Region/CoreModules/Agent/TextureDownload/TextureDownloadModule.cs index 4bfa18f..124f0f6 100644 --- a/OpenSim/Region/CoreModules/Agent/TextureDownload/TextureDownloadModule.cs +++ b/OpenSim/Region/CoreModules/Agent/TextureDownload/TextureDownloadModule.cs | |||
@@ -72,7 +72,7 @@ namespace OpenSim.Region.CoreModules.Agent.TextureDownload | |||
72 | { | 72 | { |
73 | if (m_scene == null) | 73 | if (m_scene == null) |
74 | { | 74 | { |
75 | //Console.WriteLine("Creating Texture download module"); | 75 | //m_log.Debug("Creating Texture download module"); |
76 | m_scene = scene; | 76 | m_scene = scene; |
77 | m_thread = new Thread(new ThreadStart(ProcessTextureSenders)); | 77 | m_thread = new Thread(new ThreadStart(ProcessTextureSenders)); |
78 | m_thread.Name = "ProcessTextureSenderThread"; | 78 | m_thread.Name = "ProcessTextureSenderThread"; |