aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim.GridInterfaces
diff options
context:
space:
mode:
authorAdam Frisby2007-05-12 15:44:10 +0000
committerAdam Frisby2007-05-12 15:44:10 +0000
commitec1901e4b8bcd1dd8487cd4b5ee48a7c58748f3d (patch)
tree569da9ef2e6e528ea799d8c7e1eac637cdffa889 /OpenSim.GridInterfaces
parent93 warnings in the compiler, 93 warnings appear, you fix one up, create two m... (diff)
downloadopensim-SC-ec1901e4b8bcd1dd8487cd4b5ee48a7c58748f3d.zip
opensim-SC-ec1901e4b8bcd1dd8487cd4b5ee48a7c58748f3d.tar.gz
opensim-SC-ec1901e4b8bcd1dd8487cd4b5ee48a7c58748f3d.tar.bz2
opensim-SC-ec1901e4b8bcd1dd8487cd4b5ee48a7c58748f3d.tar.xz
EXTERM-INATED. (Add warnings produced by WriteLine change have been updated to include Log Priority)
Diffstat (limited to 'OpenSim.GridInterfaces')
-rw-r--r--OpenSim.GridInterfaces/Local/LocalAssetServer.cs2
-rw-r--r--OpenSim.GridInterfaces/Remote/RemoteAssetServer.cs4
-rw-r--r--OpenSim.GridInterfaces/Remote/RemoteGridServer.cs6
3 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim.GridInterfaces/Local/LocalAssetServer.cs b/OpenSim.GridInterfaces/Local/LocalAssetServer.cs
index 962cd40..5c98377 100644
--- a/OpenSim.GridInterfaces/Local/LocalAssetServer.cs
+++ b/OpenSim.GridInterfaces/Local/LocalAssetServer.cs
@@ -49,7 +49,7 @@ namespace OpenSim.GridInterfaces.Local
49 { 49 {
50 db.Close(); 50 db.Close();
51 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.MEDIUM,"Db4 Asset server :Constructor - Exception occured"); 51 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.MEDIUM,"Db4 Asset server :Constructor - Exception occured");
52 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(e.ToString()); 52 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, e.ToString());
53 } 53 }
54 if (!yapfile) 54 if (!yapfile)
55 { 55 {
diff --git a/OpenSim.GridInterfaces/Remote/RemoteAssetServer.cs b/OpenSim.GridInterfaces/Remote/RemoteAssetServer.cs
index 2c94ac1..d79073a 100644
--- a/OpenSim.GridInterfaces/Remote/RemoteAssetServer.cs
+++ b/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("Remote Asset Server class created"); 29 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Remote Asset Server class created");
30 } 30 }
31 31
32 public void SetReceiver(IAssetReceiver receiver) 32 public void SetReceiver(IAssetReceiver receiver)
@@ -66,7 +66,7 @@ namespace OpenSim.GridInterfaces.Remote
66 // 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 66 // 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
67 ARequest req = this._assetRequests.Dequeue(); 67 ARequest req = this._assetRequests.Dequeue();
68 LLUUID assetID = req.AssetID; 68 LLUUID assetID = req.AssetID;
69 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(" RemoteAssetServer- Got a AssetServer request, processing it - " + this.AssetServerUrl + "assets/" + assetID); 69 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW," RemoteAssetServer- Got a AssetServer request, processing it - " + this.AssetServerUrl + "assets/" + assetID);
70 WebRequest AssetLoad = WebRequest.Create(this.AssetServerUrl + "assets/" + assetID); 70 WebRequest AssetLoad = WebRequest.Create(this.AssetServerUrl + "assets/" + assetID);
71 WebResponse AssetResponse = AssetLoad.GetResponse(); 71 WebResponse AssetResponse = AssetLoad.GetResponse();
72 byte[] idata = new byte[(int)AssetResponse.ContentLength]; 72 byte[] idata = new byte[(int)AssetResponse.ContentLength];
diff --git a/OpenSim.GridInterfaces/Remote/RemoteGridServer.cs b/OpenSim.GridInterfaces/Remote/RemoteGridServer.cs
index a475471..56aa002 100644
--- a/OpenSim.GridInterfaces/Remote/RemoteGridServer.cs
+++ b/OpenSim.GridInterfaces/Remote/RemoteGridServer.cs
@@ -68,7 +68,7 @@ namespace OpenSim.GridInterfaces.Remote
68 68
69 public RemoteGridServer() 69 public RemoteGridServer()
70 { 70 {
71 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Remote Grid Server class created"); 71 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Remote Grid Server class created");
72 } 72 }
73 73
74 public override bool RequestConnection(LLUUID SimUUID, string sim_ip, uint sim_port) 74 public override bool RequestConnection(LLUUID SimUUID, string sim_ip, uint sim_port)
@@ -88,8 +88,8 @@ namespace OpenSim.GridInterfaces.Remote
88 88
89 if(GridRespData.ContainsKey("error")) { 89 if(GridRespData.ContainsKey("error")) {
90 string errorstring = (string)GridRespData["error"]; 90 string errorstring = (string)GridRespData["error"];
91 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Error connecting to grid:"); 91 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,"Error connecting to grid:");
92 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(errorstring); 92 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,errorstring);
93 return false; 93 return false;
94 } 94 }
95 this.neighbours = (ArrayList)GridRespData["neighbours"]; 95 this.neighbours = (ArrayList)GridRespData["neighbours"];