diff options
author | Adam Frisby | 2007-06-05 12:55:12 +0000 |
---|---|---|
committer | Adam Frisby | 2007-06-05 12:55:12 +0000 |
commit | 1e716260c8166005d3bd33f4cda68502a09994bb (patch) | |
tree | 457d68f241ca0d8b28e03fdcd1a93f6aaf75ec44 /OpenSim/OpenSim.GridInterfaces/Remote | |
parent | * Removing dead comments (diff) | |
download | opensim-SC-1e716260c8166005d3bd33f4cda68502a09994bb.zip opensim-SC-1e716260c8166005d3bd33f4cda68502a09994bb.tar.gz opensim-SC-1e716260c8166005d3bd33f4cda68502a09994bb.tar.bz2 opensim-SC-1e716260c8166005d3bd33f4cda68502a09994bb.tar.xz |
* Removed MainConsole.Instance.WriteLine completely
* Now exists MainConsole.Instance.Error/Warn/Notice/Verbose -- use those instead
* Removed some instances of System.Console use - aiming to depreciate this in favour of MainConsole completely.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/OpenSim.GridInterfaces/Remote/RemoteAssetServer.cs | 4 | ||||
-rw-r--r-- | OpenSim/OpenSim.GridInterfaces/Remote/RemoteGridServer.cs | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/OpenSim/OpenSim.GridInterfaces/Remote/RemoteAssetServer.cs b/OpenSim/OpenSim.GridInterfaces/Remote/RemoteAssetServer.cs index 7432dee..aef848d 100644 --- a/OpenSim/OpenSim.GridInterfaces/Remote/RemoteAssetServer.cs +++ b/OpenSim/OpenSim.GridInterfaces/Remote/RemoteAssetServer.cs | |||
@@ -26,7 +26,7 @@ namespace OpenSim.GridInterfaces.Remote | |||
26 | this._remoteAssetServerThread = new Thread(new ThreadStart(RunRequests)); | 26 | this._remoteAssetServerThread = new Thread(new ThreadStart(RunRequests)); |
27 | this._remoteAssetServerThread.IsBackground = true; | 27 | this._remoteAssetServerThread.IsBackground = true; |
28 | this._remoteAssetServerThread.Start(); | 28 | this._remoteAssetServerThread.Start(); |
29 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Remote Asset Server class created"); | 29 | OpenSim.Framework.Console.MainConsole.Instance.Verbose("Remote Asset Server class created"); |
30 | } | 30 | } |
31 | 31 | ||
32 | public void SetReceiver(IAssetReceiver receiver) | 32 | public void SetReceiver(IAssetReceiver receiver) |
@@ -71,7 +71,7 @@ namespace OpenSim.GridInterfaces.Remote | |||
71 | // 404... THE MAGIC FILE NOT FOUND ERROR, very useful for telling you things such as a file (or asset ;) ) not being found!!!!!!!!!!! it's 2:22AM | 71 | // 404... THE MAGIC FILE NOT FOUND ERROR, very useful for telling you things such as a file (or asset ;) ) not being found!!!!!!!!!!! it's 2:22AM |
72 | ARequest req = this._assetRequests.Dequeue(); | 72 | ARequest req = this._assetRequests.Dequeue(); |
73 | LLUUID assetID = req.AssetID; | 73 | LLUUID assetID = req.AssetID; |
74 | // OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW," RemoteAssetServer- Got a AssetServer request, processing it - " + this.AssetServerUrl + "assets/" + assetID); | 74 | // OpenSim.Framework.Console.MainConsole.Instance.Verbose(" RemoteAssetServer- Got a AssetServer request, processing it - " + this.AssetServerUrl + "assets/" + assetID); |
75 | WebRequest AssetLoad = WebRequest.Create(this.AssetServerUrl + "assets/" + assetID); | 75 | WebRequest AssetLoad = WebRequest.Create(this.AssetServerUrl + "assets/" + assetID); |
76 | WebResponse AssetResponse = AssetLoad.GetResponse(); | 76 | WebResponse AssetResponse = AssetLoad.GetResponse(); |
77 | byte[] idata = new byte[(int)AssetResponse.ContentLength]; | 77 | byte[] idata = new byte[(int)AssetResponse.ContentLength]; |
diff --git a/OpenSim/OpenSim.GridInterfaces/Remote/RemoteGridServer.cs b/OpenSim/OpenSim.GridInterfaces/Remote/RemoteGridServer.cs index 7f911d8..1995b21 100644 --- a/OpenSim/OpenSim.GridInterfaces/Remote/RemoteGridServer.cs +++ b/OpenSim/OpenSim.GridInterfaces/Remote/RemoteGridServer.cs | |||
@@ -35,6 +35,7 @@ using libsecondlife; | |||
35 | using Nwc.XmlRpc; | 35 | using Nwc.XmlRpc; |
36 | using OpenSim.Framework.Interfaces; | 36 | using OpenSim.Framework.Interfaces; |
37 | using OpenSim.Framework.Types; | 37 | using OpenSim.Framework.Types; |
38 | using OpenSim.Framework.Console; | ||
38 | 39 | ||
39 | namespace OpenSim.GridInterfaces.Remote | 40 | namespace OpenSim.GridInterfaces.Remote |
40 | { | 41 | { |
@@ -68,7 +69,7 @@ namespace OpenSim.GridInterfaces.Remote | |||
68 | 69 | ||
69 | public RemoteGridServer() | 70 | public RemoteGridServer() |
70 | { | 71 | { |
71 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Remote Grid Server class created"); | 72 | MainConsole.Instance.Notice("Remote Grid Server class created"); |
72 | } | 73 | } |
73 | 74 | ||
74 | public override bool RequestConnection(LLUUID SimUUID, string sim_ip, uint sim_port) | 75 | public override bool RequestConnection(LLUUID SimUUID, string sim_ip, uint sim_port) |
@@ -89,8 +90,8 @@ namespace OpenSim.GridInterfaces.Remote | |||
89 | if (GridRespData.ContainsKey("error")) | 90 | if (GridRespData.ContainsKey("error")) |
90 | { | 91 | { |
91 | string errorstring = (string)GridRespData["error"]; | 92 | string errorstring = (string)GridRespData["error"]; |
92 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "Error connecting to grid:"); | 93 | MainConsole.Instance.Warn("Error connecting to grid:"); |
93 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, errorstring); | 94 | MainConsole.Instance.Warn(errorstring); |
94 | return false; | 95 | return false; |
95 | } | 96 | } |
96 | this.neighbours = (ArrayList)GridRespData["neighbours"]; | 97 | this.neighbours = (ArrayList)GridRespData["neighbours"]; |