1 files changed, 104 insertions, 12 deletions

diff --git a/OpenSim/OpenSim.Region/Caps.cs b/OpenSim/OpenSim.Region/Caps.cs
index c86061f..5be481e 100644
--- a/OpenSim/OpenSim.Region/Caps.cs
+++ b/OpenSim/OpenSim.Region/Caps.cs
@@ -1,23 +1,34 @@
 using System;

 using System.Collections.Generic;

 using System.Text;

+using System.IO;

 using OpenSim.Servers;

+using OpenSim.Framework.Utilities;

+using OpenSim.Framework.Types;

+using OpenSim.Caches;

 using libsecondlife;

 

 namespace OpenSim.Region

 {

+    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 BaseHttpServer httpListener;

         private LLUUID agentID;

+        private AssetCache assetCache;

 

-        public Caps(BaseHttpServer httpServer, string httpListen, uint httpPort, string capsPath, LLUUID agent)

+        public Caps(AssetCache assetCach, BaseHttpServer httpServer, string httpListen, uint httpPort, string capsPath, LLUUID agent)

         {

+            assetCache = assetCach;

             capsObjectPath = capsPath;

             httpListener = httpServer;

             httpListenerAddress = httpListen;

@@ -31,8 +42,9 @@ namespace OpenSim.Region
         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 + requestPath, CapsRequest);

+            httpListener.AddRestHandler("POST", "/CAPS/" + capsObjectPath + mapLayerPath, MapLayer);

+            httpListener.AddRestHandler("POST", "/CAPS/" + capsObjectPath + newInventory, NewAgentInventory);

         }

 

         /// <summary>

@@ -44,7 +56,7 @@ namespace OpenSim.Region
         /// <returns></returns>

         public string CapsRequest(string request, string path, string param)

         {

-            //Console.WriteLine("Caps Request " + request);

+            Console.WriteLine("Caps Request " + request);

             string result = "<llsd><map>";

             result += this.GetCapabilities();

             result += "</map></llsd>";

@@ -57,10 +69,11 @@ namespace OpenSim.Region
         /// <returns></returns>

         protected string GetCapabilities()

         {

-            string capURLS="";

+            string capURLS = "";

 

-            capURLS += "<key>MapLayer</key><string>http://" + httpListenerAddress + ":" + httpListenPort.ToString() + "/CAPS/" +capsObjectPath+ mapLayerPath + "</string>";

-            

+            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>";

             return capURLS;

         }

 

@@ -93,15 +106,94 @@ namespace OpenSim.Region
             int bottom;

             LLUUID image = null;

 

-            left = 500;

-            bottom = 500;

-            top = 1500;

-            right = 1500;

+            left = 0;

+            bottom = 0;

+            top = 5000;

+            right = 5000;

             image = new LLUUID("00000000-0000-0000-9999-000000000006");

 

             res += "<map><key>Left</key><integer>" + left + "</integer><key>Bottom</key><integer>" + bottom + "</integer><key>Top</key><integer>" + top + "</integer><key>Right</key><integer>" + right + "</integer><key>ImageID</key><uuid>" + image.ToStringHyphenated() + "</uuid></map>";

-            

+

+            return res;

+        }

+

+        public string NewAgentInventory(string request, string path, string param)

+        {

+

+            //Console.WriteLine("received upload request:"+ request);

+            string res = "";

+            LLUUID newAsset = LLUUID.Random();

+            string uploaderPath = capsObjectPath + Util.RandomClass.Next(5000, 7000).ToString("0000");

+            AssetUploader uploader = new AssetUploader(newAsset, 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, string path,BaseHttpServer httpServer)

+            {

+                newAssetID = assetID;

+                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 =  LLUUID.Random();

+                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;

+            }

+        }

     }

 }