Some Caps/LLSD cleaning up.

2 files changed, 31 insertions, 7 deletions

diff --git a/Common/OpenSim.Framework/LLSDHelpers.cs b/Common/OpenSim.Framework/LLSDHelpers.cs
index 5b73483..3b044a3 100644
--- a/Common/OpenSim.Framework/LLSDHelpers.cs
+++ b/Common/OpenSim.Framework/LLSDHelpers.cs
@@ -100,6 +100,31 @@ namespace OpenSim.Framework
     }

 

     [LLSDType("MAP")]

+    public class LLSDMapLayerResponse

+    {

+        public LLSDMapRequest AgentData = new LLSDMapRequest();

+        public LLSDArray LayerData = new LLSDArray();

+

+        public LLSDMapLayerResponse()

+        {

+

+        }

+    }

+

+    [LLSDType("MAP")]

+    public class LLSDCapsDetails

+    {

+        public string MapLayer = "";

+        public string NewFileAgentInventory = "";

+        //public string EventQueueGet = "";

+

+        public LLSDCapsDetails()

+        {

+

+        }

+    }

+

+    [LLSDType("MAP")]

     public class LLSDMapLayer

     {

         public int Left = 0;

@@ -108,10 +133,9 @@ namespace OpenSim.Framework
         public int Bottom = 0;

         public LLUUID ImageID = LLUUID.Zero;

 

-        public LLSDArray TestArray = new LLSDArray();

         public LLSDMapLayer()

         {

-

+           

         }

     }

 

@@ -137,6 +161,7 @@ namespace OpenSim.Framework
         }

     }

 

+

     [LLSDType("MAP")]

     public class LLSDTest

     {

@@ -153,12 +178,11 @@ namespace OpenSim.Framework
     [AttributeUsage(AttributeTargets.Class)]

     public class LLSDType : Attribute

     {

-        private string myHandler;

-

+        private string myType;

 

         public LLSDType(string type)

         {

-            myHandler = type;

+            myType = type;

 

         }

 

@@ -166,7 +190,7 @@ namespace OpenSim.Framework
         {

             get

             {

-                return myHandler;

+                return myType;

             }

         }

     }

diff --git a/Common/OpenSim.Servers/BaseHttpServer.cs b/Common/OpenSim.Servers/BaseHttpServer.cs
index 86339c1..e55e33c 100644
--- a/Common/OpenSim.Servers/BaseHttpServer.cs
+++ b/Common/OpenSim.Servers/BaseHttpServer.cs
@@ -75,7 +75,7 @@ namespace OpenSim.Servers
 

         public bool AddRestHandler(string method, string path, RestMethod handler)

         {

-            Console.WriteLine("adding new REST handler for path " + path);

+           //Console.WriteLine("adding new REST handler for path " + path);

             string methodKey = String.Format("{0}: {1}", method, path);

 

             if (!this.m_restHandlers.ContainsKey(methodKey))