From c25a0ea7923aa390d30b8eebdbca4e599edf9b0d Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Mon, 17 Nov 2008 21:00:34 +0000
Subject: * Update libOMV to r2359.  This is necessary for the progressive
 texture patch * Update libopenjpeg as well for this patch. * Appears to be
 okay on a very short sniff test * Source code will be placed in opensim-libs
 shortly

---
 OpenSim/Framework/Servers/BaseHttpServer.cs    | 18 +++++++++---------
 OpenSim/Framework/Servers/BaseOpenSimServer.cs |  5 +----
 OpenSim/Framework/Servers/LLSDMethod.cs        |  4 ++--
 OpenSim/Framework/Servers/LLSDMethodString.cs  |  2 +-
 4 files changed, 13 insertions(+), 16 deletions(-)

(limited to 'OpenSim/Framework/Servers')

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>
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
         public virtual void Show(string[] showParams)
         {
             switch (showParams[0])
-            {
-                        
+            {                       
                 case "info":
                     Notice("Version: " + m_version);
                     Notice("Startup directory: " + m_startupDirectory);
@@ -350,9 +349,7 @@ namespace OpenSim.Framework.Servers
 
                 case "stats":
                     if (m_stats != null)
-                    {
                         Notice(m_stats.Report());
-                    }
                     break;
 
                 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;
 
 namespace OpenSim.Framework.Servers
 {
-    public delegate LLSD LLSDMethod( string path, LLSD request, string endpoint );
-    public delegate LLSD DefaultLLSDMethod(LLSD request);
+    public delegate OSD LLSDMethod( string path, OSD request, string endpoint );
+    public delegate OSD DefaultLLSDMethod(OSD request);
 }
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;
 
 namespace OpenSim.Framework.Servers
 {
-    public delegate LLSD LLSDMethodString(LLSD request, string thePath);
+    public delegate OSD LLSDMethodString(OSD request, string thePath);
 }
-- 
cgit v1.1