aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Servers
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework/Servers')
-rw-r--r--OpenSim/Framework/Servers/BaseHttpServer.cs18
-rw-r--r--OpenSim/Framework/Servers/BaseOpenSimServer.cs5
-rw-r--r--OpenSim/Framework/Servers/LLSDMethod.cs4
-rw-r--r--OpenSim/Framework/Servers/LLSDMethodString.cs2
4 files changed, 13 insertions, 16 deletions
diff --git a/OpenSim/Framework/Servers/BaseHttpServer.cs b/OpenSim/Framework/Servers/BaseHttpServer.cs
index 1a54d60..0724e8c 100644
--- a/OpenSim/Framework/Servers/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/BaseHttpServer.cs
@@ -692,8 +692,8 @@ namespace OpenSim.Framework.Servers
692 //m_log.DebugFormat("[OGP]: {0}:{1}", request.RawUrl, requestBody); 692 //m_log.DebugFormat("[OGP]: {0}:{1}", request.RawUrl, requestBody);
693 response.KeepAlive = true; 693 response.KeepAlive = true;
694 694
695 LLSD llsdRequest = null; 695 OSD llsdRequest = null;
696 LLSD llsdResponse = null; 696 OSD llsdResponse = null;
697 697
698 bool LegacyLLSDLoginLibOMV = (requestBody.Contains("passwd") && requestBody.Contains("mac") && requestBody.Contains("viewer_digest")); 698 bool LegacyLLSDLoginLibOMV = (requestBody.Contains("passwd") && requestBody.Contains("mac") && requestBody.Contains("viewer_digest"));
699 699
@@ -704,7 +704,7 @@ namespace OpenSim.Framework.Servers
704 } 704 }
705 try 705 try
706 { 706 {
707 llsdRequest = LLSDParser.DeserializeXml(requestBody); 707 llsdRequest = OSDParser.DeserializeLLSDXml(requestBody);
708 } 708 }
709 catch (Exception ex) 709 catch (Exception ex)
710 { 710 {
@@ -756,7 +756,7 @@ namespace OpenSim.Framework.Servers
756 { 756 {
757 response.ContentType = "application/llsd+xml"; 757 response.ContentType = "application/llsd+xml";
758 //m_log.Info("[Debug BASE HTTP SERVER]: Response: " + llsdResponse.ToString()); 758 //m_log.Info("[Debug BASE HTTP SERVER]: Response: " + llsdResponse.ToString());
759 buffer = LLSDParser.SerializeXmlBytes(llsdResponse); 759 buffer = OSDParser.SerializeLLSDXmlBytes(llsdResponse);
760 } 760 }
761 response.SendChunked = false; 761 response.SendChunked = false;
762 response.ContentLength64 = buffer.Length; 762 response.ContentLength64 = buffer.Length;
@@ -948,12 +948,12 @@ namespace OpenSim.Framework.Servers
948 } 948 }
949 } 949 }
950 950
951 private LLSDMap GenerateNoLLSDHandlerResponse() 951 private OSDMap GenerateNoLLSDHandlerResponse()
952 { 952 {
953 LLSDMap map = new LLSDMap(); 953 OSDMap map = new OSDMap();
954 map["reason"] = LLSD.FromString("LLSDRequest"); 954 map["reason"] = OSD.FromString("LLSDRequest");
955 map["message"] = LLSD.FromString("No handler registered for LLSD Requests"); 955 map["message"] = OSD.FromString("No handler registered for LLSD Requests");
956 map["login"] = LLSD.FromString("false"); 956 map["login"] = OSD.FromString("false");
957 return map; 957 return map;
958 } 958 }
959 /// <summary> 959 /// <summary>
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
index 1281335..302640b 100644
--- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs
+++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
@@ -341,8 +341,7 @@ namespace OpenSim.Framework.Servers
341 public virtual void Show(string[] showParams) 341 public virtual void Show(string[] showParams)
342 { 342 {
343 switch (showParams[0]) 343 switch (showParams[0])
344 { 344 {
345
346 case "info": 345 case "info":
347 Notice("Version: " + m_version); 346 Notice("Version: " + m_version);
348 Notice("Startup directory: " + m_startupDirectory); 347 Notice("Startup directory: " + m_startupDirectory);
@@ -350,9 +349,7 @@ namespace OpenSim.Framework.Servers
350 349
351 case "stats": 350 case "stats":
352 if (m_stats != null) 351 if (m_stats != null)
353 {
354 Notice(m_stats.Report()); 352 Notice(m_stats.Report());
355 }
356 break; 353 break;
357 354
358 case "threads": 355 case "threads":
diff --git a/OpenSim/Framework/Servers/LLSDMethod.cs b/OpenSim/Framework/Servers/LLSDMethod.cs
index 6a39544..693d298 100644
--- a/OpenSim/Framework/Servers/LLSDMethod.cs
+++ b/OpenSim/Framework/Servers/LLSDMethod.cs
@@ -29,6 +29,6 @@ using OpenMetaverse.StructuredData;
29 29
30namespace OpenSim.Framework.Servers 30namespace OpenSim.Framework.Servers
31{ 31{
32 public delegate LLSD LLSDMethod( string path, LLSD request, string endpoint ); 32 public delegate OSD LLSDMethod( string path, OSD request, string endpoint );
33 public delegate LLSD DefaultLLSDMethod(LLSD request); 33 public delegate OSD DefaultLLSDMethod(OSD request);
34} 34}
diff --git a/OpenSim/Framework/Servers/LLSDMethodString.cs b/OpenSim/Framework/Servers/LLSDMethodString.cs
index e15b621..77fc290 100644
--- a/OpenSim/Framework/Servers/LLSDMethodString.cs
+++ b/OpenSim/Framework/Servers/LLSDMethodString.cs
@@ -29,5 +29,5 @@ using OpenMetaverse.StructuredData;
29 29
30namespace OpenSim.Framework.Servers 30namespace OpenSim.Framework.Servers
31{ 31{
32 public delegate LLSD LLSDMethodString(LLSD request, string thePath); 32 public delegate OSD LLSDMethodString(OSD request, string thePath);
33} 33}