aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Servers/BaseHttpServer.cs
diff options
context:
space:
mode:
authorMelanie Thielker2008-11-19 06:15:21 +0000
committerMelanie Thielker2008-11-19 06:15:21 +0000
commit3234472d6203671a492a73042a0b56d6301903e0 (patch)
tree2d4c6ef2b21ee24d315e27564b5426cdfe77e9b3 /OpenSim/Framework/Servers/BaseHttpServer.cs
parentEnsure that the physics representation of a deleted object is also removed (diff)
downloadopensim-SC_OLD-3234472d6203671a492a73042a0b56d6301903e0.zip
opensim-SC_OLD-3234472d6203671a492a73042a0b56d6301903e0.tar.gz
opensim-SC_OLD-3234472d6203671a492a73042a0b56d6301903e0.tar.bz2
opensim-SC_OLD-3234472d6203671a492a73042a0b56d6301903e0.tar.xz
Reverting the texture sending patch and the new libOMV. This makes this
release a direct descendant of the stable 7364, with all the features and none of the issues. This omits the following patch chain: r7383 r7382 r7381 r7377 r7375 r7373 r7372 r7370 r7369 r7368 r7367 r7366
Diffstat (limited to 'OpenSim/Framework/Servers/BaseHttpServer.cs')
-rw-r--r--OpenSim/Framework/Servers/BaseHttpServer.cs18
1 files changed, 9 insertions, 9 deletions
diff --git a/OpenSim/Framework/Servers/BaseHttpServer.cs b/OpenSim/Framework/Servers/BaseHttpServer.cs
index 0724e8c..1a54d60 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 OSD llsdRequest = null; 695 LLSD llsdRequest = null;
696 OSD llsdResponse = null; 696 LLSD 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 = OSDParser.DeserializeLLSDXml(requestBody); 707 llsdRequest = LLSDParser.DeserializeXml(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 = OSDParser.SerializeLLSDXmlBytes(llsdResponse); 759 buffer = LLSDParser.SerializeXmlBytes(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 OSDMap GenerateNoLLSDHandlerResponse() 951 private LLSDMap GenerateNoLLSDHandlerResponse()
952 { 952 {
953 OSDMap map = new OSDMap(); 953 LLSDMap map = new LLSDMap();
954 map["reason"] = OSD.FromString("LLSDRequest"); 954 map["reason"] = LLSD.FromString("LLSDRequest");
955 map["message"] = OSD.FromString("No handler registered for LLSD Requests"); 955 map["message"] = LLSD.FromString("No handler registered for LLSD Requests");
956 map["login"] = OSD.FromString("false"); 956 map["login"] = LLSD.FromString("false");
957 return map; 957 return map;
958 } 958 }
959 /// <summary> 959 /// <summary>