From f518ca7feb33c0c1641ccb8f3956246b855f9b6c Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Wed, 19 Nov 2008 06:25:34 +0000
Subject: Reapply r7369 r7367 r7366 r7370 r7381. This brings it back up to the
 new libOMV.

---
 OpenSim/Framework/Servers/BaseHttpServer.cs | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'OpenSim/Framework/Servers/BaseHttpServer.cs')

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
             //m_log.DebugFormat("[OGP]: {0}:{1}", request.RawUrl, requestBody);
             response.KeepAlive = true;
 
-            LLSD llsdRequest = null;
-            LLSD llsdResponse = null;
+            OSD llsdRequest = null;
+            OSD llsdResponse = null;
             
             bool LegacyLLSDLoginLibOMV = (requestBody.Contains("passwd") && requestBody.Contains("mac") && requestBody.Contains("viewer_digest"));
             
@@ -704,7 +704,7 @@ namespace OpenSim.Framework.Servers
             }
             try
             {
-                llsdRequest = LLSDParser.DeserializeXml(requestBody);
+                llsdRequest = OSDParser.DeserializeLLSDXml(requestBody);
             }
             catch (Exception ex)
             {
@@ -756,7 +756,7 @@ namespace OpenSim.Framework.Servers
             {
                 response.ContentType = "application/llsd+xml";
                 //m_log.Info("[Debug BASE HTTP SERVER]: Response: " + llsdResponse.ToString());
-                buffer = LLSDParser.SerializeXmlBytes(llsdResponse);
+                buffer = OSDParser.SerializeLLSDXmlBytes(llsdResponse);
             }
             response.SendChunked = false;
             response.ContentLength64 = buffer.Length;
@@ -948,12 +948,12 @@ namespace OpenSim.Framework.Servers
             }
         }
 
-        private LLSDMap GenerateNoLLSDHandlerResponse()
+        private OSDMap GenerateNoLLSDHandlerResponse()
         {
-            LLSDMap map = new LLSDMap();
-            map["reason"] = LLSD.FromString("LLSDRequest");
-            map["message"] = LLSD.FromString("No handler registered for LLSD Requests");
-            map["login"] = LLSD.FromString("false");
+            OSDMap map = new OSDMap();
+            map["reason"] = OSD.FromString("LLSDRequest");
+            map["message"] = OSD.FromString("No handler registered for LLSD Requests");
+            map["login"] = OSD.FromString("false");
             return map;
         }
         /// <summary>
-- 
cgit v1.1