From b2eb668814586f6c4df7644ed33e9574a0697fc0 Mon Sep 17 00:00:00 2001 From: MW Date: Fri, 22 Jun 2007 22:30:39 +0000 Subject: Deleted some comments being wrote to console --- Common/OpenSim.Servers/BaseHttpServer.cs | 3 +-- OpenSim/OpenSim.Region/Caps.cs | 15 ++++++++++----- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/Common/OpenSim.Servers/BaseHttpServer.cs b/Common/OpenSim.Servers/BaseHttpServer.cs index 71c36a7..1071692 100644 --- a/Common/OpenSim.Servers/BaseHttpServer.cs +++ b/Common/OpenSim.Servers/BaseHttpServer.cs @@ -213,7 +213,7 @@ namespace OpenSim.Servers //Console.WriteLine(requestBody); string responseString = ""; - Console.WriteLine("new request " + request.ContentType); + //Console.WriteLine("new request " + request.ContentType); switch (request.ContentType) { case "text/xml": @@ -228,7 +228,6 @@ namespace OpenSim.Servers case "application/xml": // probably LLSD we hope, otherwise it should be ignored by the parser // responseString = ParseLLSDXML(requestBody); - Console.WriteLine(" request " + request.HttpMethod + " to " + request.RawUrl); responseString = ParseREST(requestBody, request.RawUrl, request.HttpMethod); response.AddHeader("Content-type", "application/xml"); break; diff --git a/OpenSim/OpenSim.Region/Caps.cs b/OpenSim/OpenSim.Region/Caps.cs index c672d29..f3ee628 100644 --- a/OpenSim/OpenSim.Region/Caps.cs +++ b/OpenSim/OpenSim.Region/Caps.cs @@ -13,6 +13,7 @@ namespace OpenSim.Region private string MainPath = "00334-0000/"; private string MapLayerPath = "00334-0001/"; private BaseHttpServer httpListener; + // private LLUUID agentID; public Caps(BaseHttpServer httpServer, string httpListen, uint httpPort) { @@ -26,7 +27,7 @@ namespace OpenSim.Region /// public void RegisterHandlers() { - Console.WriteLine("registering caps handlers"); + Console.WriteLine("registering CAPS handlers"); httpListener.AddRestHandler("POST", "/CAPS/" + MainPath, CapsRequest); httpListener.AddRestHandler("POST", "/CAPS/" + MapLayerPath, MapLayer); } @@ -40,7 +41,6 @@ namespace OpenSim.Region /// public string CapsRequest(string request, string path, string param) { - Console.WriteLine("Caps request " + request); string result = ""; result += this.GetCapabilities(); result += ""; @@ -53,7 +53,10 @@ namespace OpenSim.Region /// protected string GetCapabilities() { - string capURLS = "MapLayerhttp://" + httpListenerAddress + ":" + httpListenPort.ToString() + "/CAPS/" + MapLayerPath + ""; + string capURLS=""; + + capURLS += "MapLayerhttp://" + httpListenerAddress + ":" + httpListenPort.ToString() + "/CAPS/" + MapLayerPath + ""; + return capURLS; } @@ -66,7 +69,7 @@ namespace OpenSim.Region /// public string MapLayer(string request, string path, string param) { - Console.WriteLine("Caps MapLayer request " + request); + string res = "AgentDataFlags0LayerData"; res += this.BuildLLSDMapLayerResponse(); res += ""; @@ -79,6 +82,7 @@ namespace OpenSim.Region /// protected string BuildLLSDMapLayerResponse() { + string res = ""; int left; int right; int top; @@ -91,7 +95,8 @@ namespace OpenSim.Region right = 1500; image = new LLUUID("00000000-0000-0000-9999-000000000006"); - string res= "Left"+left+"Bottom"+bottom +"Top"+top+"Right"+right+"ImageID"+image.ToStringHyphenated()+""; + res += "Left" + left + "Bottom" + bottom + "Top" + top + "Right" + right + "ImageID" + image.ToStringHyphenated() + ""; + return res; } } -- cgit v1.1