OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Deleted some comments being wrote to console

Sugilite
MW 2007-06-22 22:30:39 +00:00
parent d7121a422a
commit b2eb668814
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Common/OpenSim.Servers/BaseHttpServer.cs
View File

@ -213,7 +213,7 @@ namespace OpenSim.Servers
//Console.WriteLine(requestBody); //Console.WriteLine(requestBody);
string responseString = ""; string responseString = "";
Console.WriteLine("new request " + request.ContentType); //Console.WriteLine("new request " + request.ContentType);
switch (request.ContentType) switch (request.ContentType)
{ {
case "text/xml": case "text/xml":
@ -228,7 +228,6 @@ namespace OpenSim.Servers
case "application/xml": case "application/xml":
// probably LLSD we hope, otherwise it should be ignored by the parser // probably LLSD we hope, otherwise it should be ignored by the parser
// responseString = ParseLLSDXML(requestBody); // responseString = ParseLLSDXML(requestBody);
Console.WriteLine(" request " + request.HttpMethod + " to " + request.RawUrl);
responseString = ParseREST(requestBody, request.RawUrl, request.HttpMethod); responseString = ParseREST(requestBody, request.RawUrl, request.HttpMethod);
response.AddHeader("Content-type", "application/xml"); response.AddHeader("Content-type", "application/xml");
break; break;

15
OpenSim/OpenSim.Region/Caps.cs
View File

@ -13,6 +13,7 @@ namespace OpenSim.Region
private string MainPath = "00334-0000/"; private string MainPath = "00334-0000/";
private string MapLayerPath = "00334-0001/"; private string MapLayerPath = "00334-0001/";
private BaseHttpServer httpListener; private BaseHttpServer httpListener;
// private LLUUID agentID;
public Caps(BaseHttpServer httpServer, string httpListen, uint httpPort) public Caps(BaseHttpServer httpServer, string httpListen, uint httpPort)
{ {
@ -26,7 +27,7 @@ namespace OpenSim.Region
/// </summary> /// </summary>
public void RegisterHandlers() public void RegisterHandlers()
{ {
Console.WriteLine("registering caps handlers"); Console.WriteLine("registering CAPS handlers");
httpListener.AddRestHandler("POST", "/CAPS/" + MainPath, CapsRequest); httpListener.AddRestHandler("POST", "/CAPS/" + MainPath, CapsRequest);
httpListener.AddRestHandler("POST", "/CAPS/" + MapLayerPath, MapLayer); httpListener.AddRestHandler("POST", "/CAPS/" + MapLayerPath, MapLayer);
} }
@ -40,7 +41,6 @@ namespace OpenSim.Region
/// <returns></returns> /// <returns></returns>
public string CapsRequest(string request, string path, string param) public string CapsRequest(string request, string path, string param)
{ {
Console.WriteLine("Caps request " + request);
string result = "<llsd><map>"; string result = "<llsd><map>";
result += this.GetCapabilities(); result += this.GetCapabilities();
result += "</map></llsd>"; result += "</map></llsd>";
@ -53,7 +53,10 @@ namespace OpenSim.Region
/// <returns></returns> /// <returns></returns>
protected string GetCapabilities() protected string GetCapabilities()
{ {
string capURLS = "<key>MapLayer</key><string>http://" + httpListenerAddress + ":" + httpListenPort.ToString() + "/CAPS/" + MapLayerPath + "</string>"; string capURLS="";
capURLS += "<key>MapLayer</key><string>http://" + httpListenerAddress + ":" + httpListenPort.ToString() + "/CAPS/" + MapLayerPath + "</string>";
return capURLS; return capURLS;
} }
@ -66,7 +69,7 @@ namespace OpenSim.Region
/// <returns></returns> /// <returns></returns>
public string MapLayer(string request, string path, string param) public string MapLayer(string request, string path, string param)
{ {
Console.WriteLine("Caps MapLayer request " + request);
string res = "<llsd><map><key>AgentData</key><map><key>Flags</key><integer>0</integer></map><key>LayerData</key><array>"; string res = "<llsd><map><key>AgentData</key><map><key>Flags</key><integer>0</integer></map><key>LayerData</key><array>";
res += this.BuildLLSDMapLayerResponse(); res += this.BuildLLSDMapLayerResponse();
res += "</array></map></llsd>"; res += "</array></map></llsd>";
@ -79,6 +82,7 @@ namespace OpenSim.Region
/// <returns></returns> /// <returns></returns>
protected string BuildLLSDMapLayerResponse() protected string BuildLLSDMapLayerResponse()
{ {
string res = "";
int left; int left;
int right; int right;
int top; int top;
@ -91,7 +95,8 @@ namespace OpenSim.Region
right = 1500; right = 1500;
image = new LLUUID("00000000-0000-0000-9999-000000000006"); image = new LLUUID("00000000-0000-0000-9999-000000000006");
string res= "<map><key>Left</key><integer>"+left+"</integer><key>Bottom</key><integer>"+bottom +"</integer><key>Top</key><integer>"+top+"</integer><key>Right</key><integer>"+right+"</integer><key>ImageID</key><uuid>"+image.ToStringHyphenated()+"</uuid></map>"; res += "<map><key>Left</key><integer>" + left + "</integer><key>Bottom</key><integer>" + bottom + "</integer><key>Top</key><integer>" + top + "</integer><key>Right</key><integer>" + right + "</integer><key>ImageID</key><uuid>" + image.ToStringHyphenated() + "</uuid></map>";
return res; return res;
} }
} }