*Moved all the classes into their own file from LLSDHelpers.cs

*Some folder renaming to follow project Name
*Updated prebuild.xml

OpenSim.sln

@@ -20,7 +20,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.UserManag
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Caches", "OpenSim\Region\Caches\OpenSim.Region.Caches.csproj", "{61FCCDB3-0000-0000-0000-000000000000}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Caps", "OpenSim\Region\Caps\OpenSim.Region.Caps.csproj", "{E3C085C5-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Capabilities", "OpenSim\Region\Capabilities\OpenSim.Region.Capabilities.csproj", "{39038E85-0000-0000-0000-000000000000}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.ClientStack", "OpenSim\Region\ClientStack\OpenSim.Region.ClientStack.csproj", "{DC3698B2-0000-0000-0000-000000000000}"
 EndProject
@@ -28,7 +28,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Communicatio
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Communications.OGS1", "OpenSim\Region\Communications\OGS1\OpenSim.Region.Communications.OGS1.csproj", "{4806E378-0000-0000-0000-000000000000}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Environment", "OpenSim\Region\Simulation\OpenSim.Region.Environment.csproj", "{DCBA491C-0000-0000-0000-000000000000}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Environment", "OpenSim\Region\Environment\OpenSim.Region.Environment.csproj", "{DCBA491C-0000-0000-0000-000000000000}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.GridInterfaces.Local", "OpenSim\Region\GridInterfaces\Local\OpenSim.Region.GridInterfaces.Local.csproj", "{241A8CDD-0000-0000-0000-000000000000}"
 EndProject
@@ -98,10 +98,10 @@ Global
 		{61FCCDB3-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{61FCCDB3-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{61FCCDB3-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E3C085C5-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{39038E85-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E3C085C5-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{39038E85-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E3C085C5-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{39038E85-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E3C085C5-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+		{39038E85-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
 		{DC3698B2-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{DC3698B2-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{DC3698B2-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU

OpenSim/Region/Application/OpenSim.csproj

@@ -144,7 +144,7 @@
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
 			<Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\Simulation\OpenSim.Region.Environment.csproj">
+    <ProjectReference Include="..\Environment\OpenSim.Region.Environment.csproj">
       <Name>OpenSim.Region.Environment</Name>
       <Project>{DCBA491C-0000-0000-0000-000000000000}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

OpenSim/Region/Capabilities/Caps.cs

@@ -1,3 +1,30 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -11,7 +38,7 @@ using OpenSim.Framework.Types;
 using OpenSim.Region.Caches;
 using libsecondlife;
 
-namespace OpenSim.Region
+namespace OpenSim.Region.Capabilities
 {
     public delegate void UpLoadedTexture(LLUUID assetID, LLUUID inventoryItem, byte[] data);
 
@@ -126,14 +153,8 @@ namespace OpenSim.Region
 
         public string ProcessEventQueue(string request, string path, string param)
         {
-            //  Console.WriteLine("event queue request " + request);
             string res = "";
-            int timer = 0;
+            
-
-            /*while ((timer < 200) || (this.CapsEventQueue.Count < 1))
-             {
-                 timer++;
-             }*/
             if (this.CapsEventQueue.Count > 0)
             {
                 lock (this.CapsEventQueue)

OpenSim/Region/Capabilities/LLSDArray.cs

@@ -0,0 +1,45 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Text;
+
+namespace OpenSim.Region.Capabilities
+{
+    [LLSDType("ARRAY")]
+    public class LLSDArray
+    {
+        public ArrayList Array = new ArrayList();
+
+        public LLSDArray()
+        {
+
+        }
+    }
+}

OpenSim/Region/Capabilities/LLSDCapEvent.cs

@@ -0,0 +1,45 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace OpenSim.Region.Capabilities
+{
+    [LLSDType("MAP")]
+    public class LLSDCapEvent
+    {
+        public int id = 0;
+        public LLSDArray events = new LLSDArray();
+
+        public LLSDCapEvent()
+        {
+
+        }
+    }
+}

OpenSim/Region/Capabilities/LLSDCapsDetails.cs

@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace OpenSim.Region.Capabilities
+{
+    [LLSDType("MAP")]
+    public class LLSDCapsDetails
+    {
+        public string MapLayer = "";
+        public string NewFileAgentInventory = "";
+        //public string EventQueueGet = "";
+
+        public LLSDCapsDetails()
+        {
+
+        }
+    }
+}

OpenSim/Region/Capabilities/LLSDEmpty.cs

@@ -0,0 +1,42 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace OpenSim.Region.Capabilities
+{
+    [LLSDType("MAP")]
+    public class LLSDEmpty
+    {
+        public LLSDEmpty()
+        {
+
+        }
+    }
+}

OpenSim/Region/Capabilities/LLSDHelpers.cs

@@ -1,3 +1,30 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -6,7 +33,7 @@ using System.IO;
 using System.Xml;
 using libsecondlife;
 
-namespace OpenSim.Framework
+namespace OpenSim.Region.Capabilities
 {
     public class LLSDHelpers
     {
@@ -115,132 +142,22 @@ 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;
-        public int Right = 0;
-        public int Top = 0;
-        public int Bottom = 0;
-        public LLUUID ImageID = LLUUID.Zero;
 
-        public LLSDMapLayer()
+    
-        {
-           
-        }
-    }
-
-    [LLSDType("ARRAY")]
-    public class LLSDArray
-    {
-        public ArrayList Array = new ArrayList();
-
-        public LLSDArray()
-        {
-
-        }
-    }
-
-    [LLSDType("MAP")]
-    public class LLSDMapRequest
-    {
-        public int Flags = 0;
-
-        public LLSDMapRequest()
-        {
-
-        }
-    }
-
-    [LLSDType("MAP")]
-    public class LLSDUploadReply
-    {
-        public string new_asset = "";
-        public LLUUID new_inventory_item = LLUUID.Zero;
-        public string state = "";
-
-        public LLSDUploadReply()
-        {
-
-        }
-    }
-
-    [LLSDType("MAP")]
-    public class LLSDCapEvent
-    {
-        public int id = 0;
-        public LLSDArray events = new LLSDArray();
-
-        public LLSDCapEvent()
-        {
-
-        }
-    }
-
-    [LLSDType("MAP")]
-    public class LLSDEmpty
-    {
-        public LLSDEmpty()
-        {
-
-        }
-    }
-
-    [LLSDType("MAP")]
-    public class LLSDTest
-    {
-        public int Test1 = 20;
-        public int Test2 = 10;
-
-        public LLSDTest()
-        {
-
-        }
-    }
 
 
-    [AttributeUsage(AttributeTargets.Class)]
+    
-    public class LLSDType : Attribute
-    {
-        private string myType;
-
-        public LLSDType(string type)
-        {
-            myType = type;
-
-        }
-
-        public string ObjectType
-        {
-            get
-            {
-                return myType;
-            }
-        }
-    }
 }

OpenSim/Region/Capabilities/LLSDMapLayer.cs

@@ -0,0 +1,50 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+using libsecondlife;
+
+namespace OpenSim.Region.Capabilities
+{
+    [LLSDType("MAP")]
+    public class LLSDMapLayer
+    {
+        public int Left = 0;
+        public int Right = 0;
+        public int Top = 0;
+        public int Bottom = 0;
+        public LLUUID ImageID = LLUUID.Zero;
+
+        public LLSDMapLayer()
+        {
+
+        }
+    }
+}

OpenSim/Region/Capabilities/LLSDMapLayerResponse.cs

@@ -0,0 +1,45 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace OpenSim.Region.Capabilities
+{
+    [LLSDType("MAP")]
+    public class LLSDMapLayerResponse
+    {
+        public LLSDMapRequest AgentData = new LLSDMapRequest();
+        public LLSDArray LayerData = new LLSDArray();
+
+        public LLSDMapLayerResponse()
+        {
+
+        }
+    }
+}

OpenSim/Region/Capabilities/LLSDMapRequest.cs

@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace OpenSim.Region.Capabilities
+{
+    [LLSDType("MAP")]
+    public class LLSDMapRequest
+    {
+        public int Flags = 0;
+
+        public LLSDMapRequest()
+        {
+
+        }
+    }
+}

OpenSim/Region/Capabilities/LLSDTest.cs

@@ -0,0 +1,45 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace OpenSim.Region.Capabilities
+{
+    [LLSDType("MAP")]
+    public class LLSDTest
+    {
+        public int Test1 = 20;
+        public int Test2 = 10;
+
+        public LLSDTest()
+        {
+
+        }
+    }
+}

OpenSim/Region/Capabilities/LLSDType.cs

@@ -0,0 +1,53 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace OpenSim.Region.Capabilities
+{
+    [AttributeUsage(AttributeTargets.Class)]
+    public class LLSDType : Attribute
+    {
+        private string myType;
+
+        public LLSDType(string type)
+        {
+            myType = type;
+
+        }
+
+        public string ObjectType
+        {
+            get
+            {
+                return myType;
+            }
+        }
+    }
+}

OpenSim/Region/Capabilities/LLSDUploadReply.cs

@@ -0,0 +1,47 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+using libsecondlife;
+namespace OpenSim.Region.Capabilities
+{
+    [LLSDType("MAP")]
+    public class LLSDUploadReply
+    {
+        public string new_asset = "";
+        public LLUUID new_inventory_item = LLUUID.Zero;
+        public string state = "";
+
+        public LLSDUploadReply()
+        {
+
+        }
+    }
+}

OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.csproj

@@ -0,0 +1,151 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectType>Local</ProjectType>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{39038E85-0000-0000-0000-000000000000}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ApplicationIcon></ApplicationIcon>
+    <AssemblyKeyContainerName>
+    </AssemblyKeyContainerName>
+    <AssemblyName>OpenSim.Region.Capabilities</AssemblyName>
+    <DefaultClientScript>JScript</DefaultClientScript>
+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+    <DefaultTargetSchema>IE50</DefaultTargetSchema>
+    <DelaySign>false</DelaySign>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder></AppDesignerFolder>
+    <RootNamespace>OpenSim.Region.Capabilities</RootNamespace>
+    <StartupObject></StartupObject>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
+    <DocumentationFile></DocumentationFile>
+    <DebugSymbols>True</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>False</Optimize>
+    <OutputPath>..\..\..\bin\</OutputPath>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <RemoveIntegerChecks>False</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn></NoWarn>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE</DefineConstants>
+    <DocumentationFile></DocumentationFile>
+    <DebugSymbols>False</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>True</Optimize>
+    <OutputPath>..\..\..\bin\</OutputPath>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <RemoveIntegerChecks>False</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn></NoWarn>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="libsecondlife.dll" >
+      <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="OpenSim.Framework.Types" >
+      <HintPath>OpenSim.Framework.Types.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="OpenSim.Framework.Utilities" >
+      <HintPath>OpenSim.Framework.Utilities.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System" >
+      <HintPath>System.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Xml" >
+      <HintPath>System.Xml.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="XMLRPC.dll" >
+      <HintPath>..\..\..\bin\XMLRPC.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\Framework\General\OpenSim.Framework.csproj">
+      <Name>OpenSim.Framework</Name>
+      <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Framework\Servers\OpenSim.Framework.Servers.csproj">
+      <Name>OpenSim.Framework.Servers</Name>
+      <Project>{2CC71860-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\Caches\OpenSim.Region.Caches.csproj">
+      <Name>OpenSim.Region.Caches</Name>
+      <Project>{61FCCDB3-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="LLSDCapsDetails.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="LLSDMapRequest.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="LLSDMapLayerResponse.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Caps.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="LLSDArray.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="LLSDCapEvent.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="LLSDEmpty.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="LLSDHelpers.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="LLSDMapLayer.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="LLSDTest.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="LLSDType.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="LLSDUploadReply.cs">
+      <SubType>Code</SubType>
+    </Compile>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+</Project>

OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj

@@ -70,10 +70,6 @@
       <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="OpenSim.FrameworkGenericConfig.Xml" >
-      <HintPath>OpenSim.FrameworkGenericConfig.Xml.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
     <Reference Include="System" >
       <HintPath>System.dll</HintPath>
       <Private>False</Private>

OpenSim/Region/Environment/OpenSim.Region.Environment.csproj

@@ -120,6 +120,12 @@
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
 			<Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\Capabilities\OpenSim.Region.Capabilities.csproj">
+      <Name>OpenSim.Region.Capabilities</Name>
+      <Project>{39038E85-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
     <ProjectReference Include="..\Physics\Manager\OpenSim.Region.Physics.Manager.csproj">
       <Name>OpenSim.Region.Physics.Manager</Name>
       <Project>{F4FF31EB-0000-0000-0000-000000000000}</Project>
@@ -134,16 +140,13 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="RegionManager.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="EstateManager.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="ParcelManager.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Caps.cs">
+    <Compile Include="RegionManager.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Scenes\Entity.cs">
@@ -176,10 +179,10 @@
     <Compile Include="Scenes\IScenePresenceBody.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Scenes\Scene.cs">
+    <Compile Include="Scenes\SceneBase.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Scenes\SceneBase.cs">
+    <Compile Include="Scenes\Scene.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Scenes\scripting\IScriptHandler.cs">

OpenSim/Region/Environment/RegionManager.cs

@@ -5,6 +5,7 @@ using OpenSim.Framework.Communications;
 using OpenSim.Framework;
 using OpenSim.Framework.Types;
 using OpenSim.Framework.Servers;
+using OpenSim.Region.Capabilities;
 
 namespace OpenSim.Region.Environment
 {

OpenSim/Region/Environment/Scenes/Scene.cs

@@ -68,7 +68,7 @@ namespace OpenSim.Region.Environment.Scenes
         protected RegionCommsListener regionCommsHost;
         protected CommunicationsManager commsManager;
 
-        protected Dictionary<LLUUID, Caps> capsHandlers = new Dictionary<LLUUID, Caps>();
+        protected Dictionary<LLUUID, Capabilities.Caps> capsHandlers = new Dictionary<LLUUID, Capabilities.Caps>();
         protected BaseHttpServer httpListener;
 
         public ParcelManager parcelManager;
@@ -672,7 +672,7 @@ namespace OpenSim.Region.Environment.Scenes
                 if (agent.CapsPath != "")
                 {
                     //Console.WriteLine("new user, so creating caps handler for it");
-                    Caps cap = new Caps(this.assetCache, httpListener, this.m_regInfo.CommsIPListenAddr, 9000, agent.CapsPath, agent.AgentID);
+                    Capabilities.Caps cap = new Capabilities.Caps(this.assetCache, httpListener, this.m_regInfo.CommsIPListenAddr, 9000, agent.CapsPath, agent.AgentID);
                     cap.RegisterHandlers();
                     this.capsHandlers.Add(agent.AgentID, cap);
                 }

OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj

@@ -122,7 +122,7 @@
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
 			<Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\Simulation\OpenSim.Region.Environment.csproj">
+    <ProjectReference Include="..\..\Environment\OpenSim.Region.Environment.csproj">
       <Name>OpenSim.Region.Environment</Name>
       <Project>{DCBA491C-0000-0000-0000-000000000000}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

OpenSim/Region/Simulation/Caps.cs

@@ -1,258 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Text;
-using System.IO;
-using System.Xml;
-using OpenSim.Framework.Servers;
-using OpenSim.Framework;
-using OpenSim.Framework.Utilities;
-using OpenSim.Framework.Types;
-using OpenSim.Region.Caches;
-using libsecondlife;
-
-namespace OpenSim.Region.Environment
-{
-    public delegate void UpLoadedTexture(LLUUID assetID, LLUUID inventoryItem, byte[] data);
-
-    public class Caps
-    {
-        private string httpListenerAddress;
-        private uint httpListenPort;
-        private string capsObjectPath = "00001-";
-        private string requestPath = "0000/";
-        private string mapLayerPath = "0001/";
-        private string newInventory = "0002/";
-        private string requestTexture = "0003/";
-        private string eventQueue = "0100/";
-        private BaseHttpServer httpListener;
-        private LLUUID agentID;
-        private AssetCache assetCache;
-        private int eventQueueCount = 1;
-        private Queue<string> CapsEventQueue = new Queue<string>();
-
-        public Caps(AssetCache assetCach, BaseHttpServer httpServer, string httpListen, uint httpPort, string capsPath, LLUUID agent)
-        {
-            assetCache = assetCach;
-            capsObjectPath = capsPath;
-            httpListener = httpServer;
-            httpListenerAddress = httpListen;
-            httpListenPort = httpPort;
-            agentID = agent;
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        public void RegisterHandlers()
-        {
-            Console.WriteLine("registering CAPS handlers");
-            httpListener.AddRestHandler("POST", "/CAPS/" + capsObjectPath + requestPath, CapsRequest);
-            httpListener.AddRestHandler("POST", "/CAPS/" + capsObjectPath + mapLayerPath, MapLayer);
-            httpListener.AddRestHandler("POST", "/CAPS/" + capsObjectPath + newInventory, NewAgentInventory);
-            httpListener.AddRestHandler("POST", "/CAPS/" + capsObjectPath + eventQueue, ProcessEventQueue);
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="request"></param>
-        /// <param name="path"></param>
-        /// <param name="param"></param>
-        /// <returns></returns>
-        public string CapsRequest(string request, string path, string param)
-        {
-           // Console.WriteLine("Caps Request " + request);
-            string result = ""; 
-            result = LLSDHelpers.SerialiseLLSDReply(this.GetCapabilities());
-            return result;
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <returns></returns>
-        protected LLSDCapsDetails GetCapabilities()
-        {
-           /* string capURLS = "";
-            capURLS += "<key>MapLayer</key><string>http://" + httpListenerAddress + ":" + httpListenPort.ToString() + "/CAPS/" + capsObjectPath + mapLayerPath + "</string>";
-            capURLS += "<key>NewFileAgentInventory</key><string>http://" + httpListenerAddress + ":" + httpListenPort.ToString() + "/CAPS/" + capsObjectPath + newInventory + "</string>";
-            //capURLS += "<key>RequestTextureDownload</key><string>http://" + httpListenerAddress + ":" + httpListenPort.ToString() + "/CAPS/" + capsObjectPath + requestTexture + "</string>";
-            //capURLS += "<key>EventQueueGet</key><string>http://" + httpListenerAddress + ":" + httpListenPort.ToString() + "/CAPS/" + capsObjectPath + eventQueue + "</string>";
-            return capURLS;*/
-
-            LLSDCapsDetails caps = new LLSDCapsDetails();
-            caps.MapLayer = "http://" + httpListenerAddress + ":" + httpListenPort.ToString() + "/CAPS/" + capsObjectPath + mapLayerPath;
-            caps.NewFileAgentInventory = "http://" + httpListenerAddress + ":" + httpListenPort.ToString() + "/CAPS/" + capsObjectPath + newInventory;
-            return caps;
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="request"></param>
-        /// <param name="path"></param>
-        /// <param name="param"></param>
-        /// <returns></returns>
-        public string MapLayer(string request, string path, string param)
-        {
-            Encoding _enc = System.Text.Encoding.UTF8;
-            Hashtable hash =(Hashtable) LLSD.LLSDDeserialize(_enc.GetBytes(request));
-            LLSDMapRequest mapReq = new LLSDMapRequest();
-            LLSDHelpers.DeserialiseLLSDMap(hash, mapReq );
-
-            LLSDMapLayerResponse mapResponse= new LLSDMapLayerResponse();
-            mapResponse.LayerData.Array.Add(this.BuildLLSDMapLayerResponse());
-            string res = LLSDHelpers.SerialiseLLSDReply(mapResponse);
-            
-            //Console.WriteLine(" Maplayer response is " + res);
-          
-            return res;
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <returns></returns>
-        protected LLSDMapLayer BuildLLSDMapLayerResponse()
-        {
-            LLSDMapLayer mapLayer = new LLSDMapLayer();
-            mapLayer.Right = 5000;
-            mapLayer.Top = 5000;
-            mapLayer.ImageID = new LLUUID("00000000-0000-0000-9999-000000000006");
-
-            return mapLayer;
-        }
-
-        public string ProcessEventQueue(string request, string path, string param)
-        {
-            //  Console.WriteLine("event queue request " + request);
-            string res = "";
-            int timer = 0;
-
-            /*while ((timer < 200) || (this.CapsEventQueue.Count < 1))
-             {
-                 timer++;
-             }*/
-            if (this.CapsEventQueue.Count > 0)
-            {
-                lock (this.CapsEventQueue)
-                {
-                    string item = CapsEventQueue.Dequeue();
-                    res = item;
-                }
-            }
-            else
-            {
-                res = this.CreateEmptyEventResponse();
-            }
-            return res;
-        }
-
-        public string CreateEstablishAgentComms(string caps, string ipAddressPort)
-        {
-            string res = "<llsd><map><key>id</key><integer>" + eventQueueCount + "</integer>";
-            res += "<key>events</key><array><map>";
-            res += "<key>message</key><string>EstablishAgentCommunication</string>";
-            res += "<key>body</key><map>";
-            res += "<key>sim-ip-and-port</key><string>" + ipAddressPort + "</string>";
-            res += "<key>seed-capability</key><string>" + caps + "</string>";
-            res += "<key>agent-id</key><uuid>" + this.agentID.ToStringHyphenated() + "</uuid>";
-            res += "</map>";
-            res += "</map></array>";
-            res += "</map></llsd>";
-            eventQueueCount++;
-            this.CapsEventQueue.Enqueue(res);
-            return res;
-        }
-
-        public string CreateEmptyEventResponse()
-        {
-            string res = "<llsd><map><key>id</key><integer>" + eventQueueCount + "</integer>";
-            res += "<key>events</key><array><map>";
-            res += "</map></array>";
-            res += "</map></llsd>";
-            eventQueueCount++;
-            return res;
-        }
-
-        public string NewAgentInventory(string request, string path, string param)
-        {
-            //Console.WriteLine("received upload request:"+ request);
-            string res = "";
-            LLUUID newAsset = LLUUID.Random();
-            LLUUID newInvItem = LLUUID.Random();
-            string uploaderPath = capsObjectPath + Util.RandomClass.Next(5000, 8000).ToString("0000");
-            AssetUploader uploader = new AssetUploader(newAsset, newInvItem, uploaderPath, this.httpListener);
-            httpListener.AddRestHandler("POST", "/CAPS/" + uploaderPath, uploader.uploaderCaps);
-            string uploaderURL = "http://" + httpListenerAddress + ":" + httpListenPort.ToString() + "/CAPS/" + uploaderPath;
-            //Console.WriteLine("uploader url is " + uploaderURL);
-            res += "<llsd><map>";
-            res += "<key>uploader</key><string>" + uploaderURL + "</string>";
-            //res += "<key>success</key><boolean>true</boolean>";
-            res += "<key>state</key><string>upload</string>";
-            res += "</map></llsd>";
-            uploader.OnUpLoad += this.UploadHandler;
-            return res;
-        }
-
-        public void UploadHandler(LLUUID assetID, LLUUID inventoryItem, byte[] data)
-        {
-            // Console.WriteLine("upload handler called");
-            AssetBase asset;
-            asset = new AssetBase();
-            asset.FullID = assetID;
-            asset.Type = 0;
-            asset.InvType = 0;
-            asset.Name = "UploadedTexture" + Util.RandomClass.Next(1, 1000).ToString("000");
-            asset.Data = data;
-            this.assetCache.AddAsset(asset);
-        }
-
-        public class AssetUploader
-        {
-            public event UpLoadedTexture OnUpLoad;
-
-            private string uploaderPath = "";
-            private LLUUID newAssetID;
-            private LLUUID inventoryItemID;
-            private BaseHttpServer httpListener;
-            public AssetUploader(LLUUID assetID, LLUUID inventoryItem, string path, BaseHttpServer httpServer)
-            {
-                newAssetID = assetID;
-                inventoryItemID = inventoryItem;
-                uploaderPath = path;
-                httpListener = httpServer;
-
-            }
-
-            public string uploaderCaps(string request, string path, string param)
-            {
-                Encoding _enc = System.Text.Encoding.UTF8;
-                byte[] data = _enc.GetBytes(request);
-                //Console.WriteLine("recieved upload " + Util.FieldToString(data));
-                LLUUID inv = this.inventoryItemID;
-                string res = "";
-                res += "<llsd><map>";
-                res += "<key>new_asset</key><string>" + newAssetID.ToStringHyphenated() + "</string>";
-                res += "<key>new_inventory_item</key><uuid>" + inv.ToStringHyphenated() + "</uuid>";
-                res += "<key>state</key><string>complete</string>";
-                res += "</map></llsd>";
-
-               // Console.WriteLine("asset " + newAssetID.ToStringHyphenated() + " , inventory item " + inv.ToStringHyphenated());
-                httpListener.RemoveRestHandler("POST", "/CAPS/" + uploaderPath);
-                if (OnUpLoad != null)
-                {
-                    OnUpLoad(newAssetID, inv, data);
-                }
-
-                /*FileStream fs = File.Create("upload.jp2");
-                BinaryWriter bw = new BinaryWriter(fs);
-                bw.Write(data);
-                bw.Close();
-                fs.Close();*/
-                return res;
-            }
-        }
-    }
-}

prebuild.xml

@@ -125,7 +125,7 @@
       </Files>
     </Project>
 
-	<Project name="OpenSim.Region.Caps" path="OpenSim/Region/Caps" type="Library">
+	<Project name="OpenSim.Region.Capabilities" path="OpenSim/Region/Capabilities" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -598,7 +598,6 @@
       <Reference name="OpenSim.Region.Terrain.BasicTerrain"/>
       <Reference name="OpenSim.Framework"/>
       <Reference name="OpenSim.Framework.Console"/>
-      <Reference name="OpenSim.FrameworkGenericConfig.Xml"/>
       <Reference name="OpenSim.Region.Physics.Manager"/>
       <Reference name="OpenSim.Framework.Servers"/>
       <Reference name="OpenSim.Region.Caches"/>
@@ -611,7 +610,7 @@
 
 
 
-    <Project name="OpenSim.Region.Environment" path="OpenSim/Region/Simulation" type="Library">
+    <Project name="OpenSim.Region.Environment" path="OpenSim/Region/Environment" type="Library">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../../../bin/</OutputPath>
@@ -636,6 +635,7 @@
       <Reference name="OpenSim.Region.Physics.Manager"/>
       <Reference name="OpenSim.Framework.Servers"/>
 	<Reference name="OpenSim.Region.Caches"/>
+	<Reference name="OpenSim.Region.Capabilities"/>
       <Reference name="XMLRPC.dll"/>
       <Reference name="OpenSim.Framework.Communications"/>