From 5c32b33a66fbdf371d53d85ee54ee8e837481570 Mon Sep 17 00:00:00 2001
From: lbsa71
Date: Wed, 4 Jul 2007 16:28:59 +0000
Subject: * re-fixed the utf-16 bug in xmlRpcResponse serialization * added
 LLSDStreamHandler.cs to Caps (Haven't enabled it yet, though) * removed last
 traces of old rest handling

---
 .../Region/Examples/SimpleApp/LlsdMethodEntry.cs   | 35 ++--------------------
 OpenSim/Region/Examples/SimpleApp/Program.cs       | 23 --------------
 2 files changed, 2 insertions(+), 56 deletions(-)

(limited to 'OpenSim/Region/Examples/SimpleApp')

diff --git a/OpenSim/Region/Examples/SimpleApp/LlsdMethodEntry.cs b/OpenSim/Region/Examples/SimpleApp/LlsdMethodEntry.cs
index f946482..d0ef2af 100644
--- a/OpenSim/Region/Examples/SimpleApp/LlsdMethodEntry.cs
+++ b/OpenSim/Region/Examples/SimpleApp/LlsdMethodEntry.cs
@@ -2,40 +2,9 @@ using System.Collections;
 using System.Text;
 using libsecondlife;
 using OpenSim.Region.Capabilities;
+using System.IO;
 
 namespace OpenSim.Framework.Servers
 {
-    public class LlsdMethodEntry<TResponse, TRequest> : ILlsdMethodHandler
-        where TRequest : new()
-    {
-        private LlsdMethod<TResponse, TRequest> m_method;
-
-
-        public LlsdMethodEntry( )
-        {
- 
-        }
-        
-        public LlsdMethodEntry(LlsdMethod<TResponse, TRequest> method)
-        {
-            m_method = method;
-        }
-
-        #region ILlsdMethodHandler Members
-
-        public string Handle(string body, string path)
-        {
-            Encoding _enc = Encoding.UTF8;
-            Hashtable hash = (Hashtable)LLSD.LLSDDeserialize(_enc.GetBytes( body ));
-            TRequest request = new TRequest();
-            
-            LLSDHelpers.DeserialiseLLSDMap(hash, request );
-
-            TResponse response = m_method(request);
-            
-            return LLSDHelpers.SerialiseLLSDReply( response );   
-        }
-
-        #endregion
-    }
+  
 }
diff --git a/OpenSim/Region/Examples/SimpleApp/Program.cs b/OpenSim/Region/Examples/SimpleApp/Program.cs
index bc84c35..ad70df8 100644
--- a/OpenSim/Region/Examples/SimpleApp/Program.cs
+++ b/OpenSim/Region/Examples/SimpleApp/Program.cs
@@ -60,8 +60,6 @@ namespace SimpleApp
 
             httpServer.AddXmlRPCHandler("login_to_simulator", communicationsManager.UserServices.XmlRpcLoginMethod );
             
-            RegisterLlsdHandler<LLSDMapLayerResponse, LLSDMapRequest>("/Caps/test/", LlsdMethodDemo);
-            
             httpServer.Start();
             
             m_log.WriteLine( LogPriority.NORMAL, "Press enter to quit.");
@@ -74,27 +72,6 @@ namespace SimpleApp
 
         }
 
-        private LLSDMapLayerResponse LlsdMethodDemo(LLSDMapRequest request)
-        {
-            return new LLSDMapLayerResponse();
-        }
-
-        ILlsdMethodHandler m_handler;
-        
-        private void RegisterLlsdHandler<TResponse, TRequest>( string path, LlsdMethod<TResponse, TRequest> method )
-            where TRequest : new()
-        {
-            // path should be handler key, but for now just conceptually store it.
-            m_handler = new LlsdMethodEntry<TResponse, TRequest>( method );
-        }
-        
-        private string ProcessLlsdMethod( string request,string path )
-        {
-            LlsdMethodEntry<LLSDMapLayerResponse, LLSDMapRequest> concreteHandler = new LlsdMethodEntry<LLSDMapLayerResponse, LLSDMapRequest>( LlsdMethodDemo );
-
-            return m_handler.Handle(request, path);
-        }
-                       
         private bool AddNewSessionHandler(ulong regionHandle, Login loginData)
         {
             m_log.WriteLine(LogPriority.NORMAL, "Region [{0}] recieved Login from [{1}] [{2}]", regionHandle, loginData.First, loginData.Last);
-- 
cgit v1.1