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

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

23 files changed, 12 insertions, 266 deletions

diff --git a/OpenSim/Region/Simulation/EstateManager.cs b/OpenSim/Region/Environment/EstateManager.cs
index c2c1ecf..c2c1ecf 100644
--- a/OpenSim/Region/Simulation/EstateManager.cs
+++ b/OpenSim/Region/Environment/EstateManager.cs
diff --git a/OpenSim/Region/Simulation/OpenSim.Region.Environment.csproj b/OpenSim/Region/Environment/OpenSim.Region.Environment.csproj
index 3f8b60d..6f07969 100644
--- a/OpenSim/Region/Simulation/OpenSim.Region.Environment.csproj
+++ b/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">

diff --git a/OpenSim/Region/Simulation/ParcelManager.cs b/OpenSim/Region/Environment/ParcelManager.cs
index 1cab4ab..1cab4ab 100644
--- a/OpenSim/Region/Simulation/ParcelManager.cs
+++ b/OpenSim/Region/Environment/ParcelManager.cs
diff --git a/OpenSim/Region/Simulation/RegionManager.cs b/OpenSim/Region/Environment/RegionManager.cs
index 17d9aad..4ff55a8 100644
--- a/OpenSim/Region/Simulation/RegionManager.cs
+++ b/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

 {

diff --git a/OpenSim/Region/Simulation/Scenes/Entity.cs b/OpenSim/Region/Environment/Scenes/Entity.cs
index bbba34d..bbba34d 100644
--- a/OpenSim/Region/Simulation/Scenes/Entity.cs
+++ b/OpenSim/Region/Environment/Scenes/Entity.cs
diff --git a/OpenSim/Region/Simulation/Scenes/IScenePresenceBody.cs b/OpenSim/Region/Environment/Scenes/IScenePresenceBody.cs
index 36023d0..36023d0 100644
--- a/OpenSim/Region/Simulation/Scenes/IScenePresenceBody.cs
+++ b/OpenSim/Region/Environment/Scenes/IScenePresenceBody.cs
diff --git a/OpenSim/Region/Simulation/Scenes/Primitive.cs b/OpenSim/Region/Environment/Scenes/Primitive.cs
index 0f649b2..0f649b2 100644
--- a/OpenSim/Region/Simulation/Scenes/Primitive.cs
+++ b/OpenSim/Region/Environment/Scenes/Primitive.cs
diff --git a/OpenSim/Region/Simulation/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
index 1d55c4d..1d55c4d 100644
--- a/OpenSim/Region/Simulation/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
diff --git a/OpenSim/Region/Simulation/Scenes/Scene.Scripting.cs b/OpenSim/Region/Environment/Scenes/Scene.Scripting.cs
index 2249c3d..2249c3d 100644
--- a/OpenSim/Region/Simulation/Scenes/Scene.Scripting.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Scripting.cs
diff --git a/OpenSim/Region/Simulation/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index e71f601..ff54efa 100644
--- a/OpenSim/Region/Simulation/Scenes/Scene.cs
+++ b/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);

                 }

diff --git a/OpenSim/Region/Simulation/Scenes/SceneBase.cs b/OpenSim/Region/Environment/Scenes/SceneBase.cs
index 3d8f522..3d8f522 100644
--- a/OpenSim/Region/Simulation/Scenes/SceneBase.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneBase.cs
diff --git a/OpenSim/Region/Simulation/Scenes/SceneEvents.cs b/OpenSim/Region/Environment/Scenes/SceneEvents.cs
index fa1bacb..fa1bacb 100644
--- a/OpenSim/Region/Simulation/Scenes/SceneEvents.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneEvents.cs
diff --git a/OpenSim/Region/Simulation/Scenes/SceneObject.cs b/OpenSim/Region/Environment/Scenes/SceneObject.cs
index 88fb160..88fb160 100644
--- a/OpenSim/Region/Simulation/Scenes/SceneObject.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObject.cs
diff --git a/OpenSim/Region/Simulation/Scenes/ScenePresence.Animations.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.Animations.cs
index 2caabc2..2caabc2 100644
--- a/OpenSim/Region/Simulation/Scenes/ScenePresence.Animations.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.Animations.cs
diff --git a/OpenSim/Region/Simulation/Scenes/ScenePresence.Body.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.Body.cs
index 2c81d2a..2c81d2a 100644
--- a/OpenSim/Region/Simulation/Scenes/ScenePresence.Body.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.Body.cs
diff --git a/OpenSim/Region/Simulation/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 96e5c94..96e5c94 100644
--- a/OpenSim/Region/Simulation/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
diff --git a/OpenSim/Region/Simulation/Scenes/scripting/IScriptContext.cs b/OpenSim/Region/Environment/Scenes/scripting/IScriptContext.cs
index eb8a117..eb8a117 100644
--- a/OpenSim/Region/Simulation/Scenes/scripting/IScriptContext.cs
+++ b/OpenSim/Region/Environment/Scenes/scripting/IScriptContext.cs
diff --git a/OpenSim/Region/Simulation/Scenes/scripting/IScriptEntity.cs b/OpenSim/Region/Environment/Scenes/scripting/IScriptEntity.cs
index e813626..e813626 100644
--- a/OpenSim/Region/Simulation/Scenes/scripting/IScriptEntity.cs
+++ b/OpenSim/Region/Environment/Scenes/scripting/IScriptEntity.cs
diff --git a/OpenSim/Region/Simulation/Scenes/scripting/IScriptHandler.cs b/OpenSim/Region/Environment/Scenes/scripting/IScriptHandler.cs
index 115b4f4..115b4f4 100644
--- a/OpenSim/Region/Simulation/Scenes/scripting/IScriptHandler.cs
+++ b/OpenSim/Region/Environment/Scenes/scripting/IScriptHandler.cs
diff --git a/OpenSim/Region/Simulation/Scenes/scripting/Script.cs b/OpenSim/Region/Environment/Scenes/scripting/Script.cs
index 5d398b0..5d398b0 100644
--- a/OpenSim/Region/Simulation/Scenes/scripting/Script.cs
+++ b/OpenSim/Region/Environment/Scenes/scripting/Script.cs
diff --git a/OpenSim/Region/Simulation/Scenes/scripting/ScriptFactory.cs b/OpenSim/Region/Environment/Scenes/scripting/ScriptFactory.cs
index 0ce65ea..0ce65ea 100644
--- a/OpenSim/Region/Simulation/Scenes/scripting/ScriptFactory.cs
+++ b/OpenSim/Region/Environment/Scenes/scripting/ScriptFactory.cs
diff --git a/OpenSim/Region/Simulation/Scenes/scripting/Scripts/FollowRandomAvatar.cs b/OpenSim/Region/Environment/Scenes/scripting/Scripts/FollowRandomAvatar.cs
index 90c79e3..90c79e3 100644
--- a/OpenSim/Region/Simulation/Scenes/scripting/Scripts/FollowRandomAvatar.cs
+++ b/OpenSim/Region/Environment/Scenes/scripting/Scripts/FollowRandomAvatar.cs
diff --git a/OpenSim/Region/Simulation/Caps.cs b/OpenSim/Region/Simulation/Caps.cs
deleted file mode 100644
index 9edbd54..0000000
--- a/OpenSim/Region/Simulation/Caps.cs
+++ /dev/null
@@ -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;

-            }

-        }

-    }

-}