6 files changed, 193 insertions, 47 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;

+            }

+        }

     }

 }

diff --git a/OpenSim/OpenSim.Region/OpenSim.Region.csproj b/OpenSim/OpenSim.Region/OpenSim.Region.csproj
index d18bf3f..fd583a9 100644
--- a/OpenSim/OpenSim.Region/OpenSim.Region.csproj
+++ b/OpenSim/OpenSim.Region/OpenSim.Region.csproj
@@ -1,4 +1,4 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

   <PropertyGroup>

     <ProjectType>Local</ProjectType>

     <ProductVersion>8.0.50727</ProductVersion>

@@ -6,7 +6,8 @@
     <ProjectGuid>{196916AF-0000-0000-0000-000000000000}</ProjectGuid>

     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ApplicationIcon></ApplicationIcon>

+    <ApplicationIcon>

+    </ApplicationIcon>

     <AssemblyKeyContainerName>

     </AssemblyKeyContainerName>

     <AssemblyName>OpenSim.Region</AssemblyName>

@@ -15,9 +16,11 @@
     <DefaultTargetSchema>IE50</DefaultTargetSchema>

     <DelaySign>false</DelaySign>

     <OutputType>Library</OutputType>

-    <AppDesignerFolder></AppDesignerFolder>

+    <AppDesignerFolder>

+    </AppDesignerFolder>

     <RootNamespace>OpenSim.Region</RootNamespace>

-    <StartupObject></StartupObject>

+    <StartupObject>

+    </StartupObject>

     <FileUpgradeFlags>

     </FileUpgradeFlags>

   </PropertyGroup>

@@ -28,7 +31,8 @@
     <ConfigurationOverrideFile>

     </ConfigurationOverrideFile>

     <DefineConstants>TRACE;DEBUG</DefineConstants>

-    <DocumentationFile></DocumentationFile>

+    <DocumentationFile>

+    </DocumentationFile>

     <DebugSymbols>True</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>False</Optimize>

@@ -37,7 +41,8 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

     <WarningLevel>4</WarningLevel>

-    <NoWarn></NoWarn>

+    <NoWarn>

+    </NoWarn>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

     <AllowUnsafeBlocks>False</AllowUnsafeBlocks>

@@ -46,7 +51,8 @@
     <ConfigurationOverrideFile>

     </ConfigurationOverrideFile>

     <DefineConstants>TRACE</DefineConstants>

-    <DocumentationFile></DocumentationFile>

+    <DocumentationFile>

+    </DocumentationFile>

     <DebugSymbols>False</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>True</Optimize>

@@ -55,26 +61,28 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

     <WarningLevel>4</WarningLevel>

-    <NoWarn></NoWarn>

+    <NoWarn>

+    </NoWarn>

   </PropertyGroup>

   <ItemGroup>

-    <Reference Include="Axiom.MathLib.dll" >

+    <Reference Include="Axiom.MathLib.dll">

       <HintPath>..\..\bin\Axiom.MathLib.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="Db4objects.Db4o.dll" >

+    <Reference Include="Db4objects.Db4o.dll">

       <HintPath>..\..\bin\Db4objects.Db4o.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="libsecondlife.dll" >

+    <Reference Include="libsecondlife.dll">

       <HintPath>..\..\bin\libsecondlife.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="System" >

+    <Reference Include="System">

       <HintPath>System.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="System.Xml" >

+    <Reference Include="System.Data" />

+    <Reference Include="System.Xml">

       <HintPath>System.Xml.dll</HintPath>

       <Private>False</Private>

     </Reference>

@@ -84,55 +92,55 @@
       <Name>OpenGrid.Framework.Communications</Name>

       <Project>{683344D5-0000-0000-0000-000000000000}</Project>

       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

-                        <Private>False</Private>

+      <Private>False</Private>

     </ProjectReference>

     <ProjectReference Include="..\OpenSim.Caches\OpenSim.Caches.csproj">

       <Name>OpenSim.Caches</Name>

       <Project>{1938EB12-0000-0000-0000-000000000000}</Project>

       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

-                        <Private>False</Private>

+      <Private>False</Private>

     </ProjectReference>

     <ProjectReference Include="..\..\Common\OpenSim.Framework\OpenSim.Framework.csproj">

       <Name>OpenSim.Framework</Name>

       <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>

       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

-                        <Private>False</Private>

+      <Private>False</Private>

     </ProjectReference>

     <ProjectReference Include="..\..\Common\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">

       <Name>OpenSim.Framework.Console</Name>

       <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>

       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

-                        <Private>False</Private>

+      <Private>False</Private>

     </ProjectReference>

     <ProjectReference Include="..\..\Common\OpenSim.GenericConfig\Xml\OpenSim.GenericConfig.Xml.csproj">

       <Name>OpenSim.GenericConfig.Xml</Name>

       <Project>{E88EF749-0000-0000-0000-000000000000}</Project>

       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

-                        <Private>False</Private>

+      <Private>False</Private>

     </ProjectReference>

     <ProjectReference Include="..\OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj">

       <Name>OpenSim.Physics.Manager</Name>

       <Project>{8BE16150-0000-0000-0000-000000000000}</Project>

       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

-                        <Private>False</Private>

+      <Private>False</Private>

     </ProjectReference>

     <ProjectReference Include="..\..\Common\OpenSim.Servers\OpenSim.Servers.csproj">

       <Name>OpenSim.Servers</Name>

       <Project>{8BB20F0A-0000-0000-0000-000000000000}</Project>

       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

-                        <Private>False</Private>

+      <Private>False</Private>

     </ProjectReference>

     <ProjectReference Include="..\OpenSim.Terrain.BasicTerrain\OpenSim.Terrain.BasicTerrain.csproj">

       <Name>OpenSim.Terrain.BasicTerrain</Name>

       <Project>{2270B8FE-0000-0000-0000-000000000000}</Project>

       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

-                        <Private>False</Private>

+      <Private>False</Private>

     </ProjectReference>

     <ProjectReference Include="..\..\Common\XmlRpcCS\XMLRPC.csproj">

       <Name>XMLRPC</Name>

       <Project>{8E81D43C-0000-0000-0000-000000000000}</Project>

       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

-                        <Private>False</Private>

+      <Private>False</Private>

     </ProjectReference>

   </ItemGroup>

   <ItemGroup>

@@ -145,6 +153,7 @@
     <Compile Include="ParcelManager.cs">

       <SubType>Code</SubType>

     </Compile>

+    <Compile Include="RegionManager.cs" />

     <Compile Include="Scenes\Entity.cs">

       <SubType>Code</SubType>

     </Compile>

@@ -204,4 +213,4 @@
     <PostBuildEvent>

     </PostBuildEvent>

   </PropertyGroup>

-</Project>

+</Project>
\ No newline at end of file
diff --git a/OpenSim/OpenSim.Region/RegionManager.cs b/OpenSim/OpenSim.Region/RegionManager.cs
new file mode 100644
index 0000000..a317f0f
--- /dev/null
+++ b/OpenSim/OpenSim.Region/RegionManager.cs
@@ -0,0 +1,30 @@
+using System;

+using System.Collections.Generic;

+using System.Text;

+using OpenGrid.Framework.Communications;

+using OpenSim.Framework;

+using OpenSim.Framework.Types;

+using OpenSim.Servers;

+

+namespace OpenSim.Region

+{

+    public class RegionManager //needs renaming , but first we need to rename the namespace

+    {

+        protected AuthenticateSessionsBase authenticateHandler;

+        protected RegionCommsListener regionCommsHost;

+        protected CommunicationsManager commsManager;

+        protected List<Caps> capsHandlers = new List<Caps>();

+        protected BaseHttpServer httpListener;

+

+        protected Scenes.Scene m_Scene;

+

+        public ParcelManager parcelManager;

+        public EstateManager estateManager;

+

+        public RegionManager()

+        {

+

+        }

+

+    }

+}

diff --git a/OpenSim/OpenSim.Region/Scenes/Primitive.cs b/OpenSim/OpenSim.Region/Scenes/Primitive.cs
index 8192bf0..62f401c 100644
--- a/OpenSim/OpenSim.Region/Scenes/Primitive.cs
+++ b/OpenSim/OpenSim.Region/Scenes/Primitive.cs
@@ -273,7 +273,7 @@ namespace OpenSim.Region.Scenes
         /// <param name="tex"></param>

         public void UpdateTexture(byte[] tex)

         {

-            this.primData.Texture = tex;

+            this.primData.TextureEntry = tex;

         }

 

         /// <summary>

@@ -411,7 +411,7 @@ namespace OpenSim.Region.Scenes
                 lPos = this.Pos;

             }

 

-            remoteClient.SendPrimitiveToClient(this.m_regionHandle, 64096, this.LocalId, this.primData, lPos, new LLUUID("00000000-0000-1000-5005-000000000018"));

+            remoteClient.SendPrimitiveToClient(this.m_regionHandle, 64096, this.LocalId, this.primData, lPos, new LLUUID("00000000-0000-0000-9999-000000000005"));

         }

 

         /// <summary>

diff --git a/OpenSim/OpenSim.Region/Scenes/Scene.cs b/OpenSim/OpenSim.Region/Scenes/Scene.cs
index 07f1d70..07b1ee4 100644
--- a/OpenSim/OpenSim.Region/Scenes/Scene.cs
+++ b/OpenSim/OpenSim.Region/Scenes/Scene.cs
@@ -730,7 +730,7 @@ namespace OpenSim.Region.Scenes
                 if (agent.CapsPath != "")

                 {

                     //Console.WriteLine("new user, so creating caps handler for it");

-                    Caps cap = new Caps(httpListener, this.m_regInfo.IPListenAddr, 9000, agent.CapsPath, agent.AgentID);

+                    Caps cap = new Caps(this.assetCache, httpListener, this.m_regInfo.IPListenAddr, 9000, agent.CapsPath, agent.AgentID);

                     cap.RegisterHandlers();

                     this.capsHandlers.Add(cap);

                 }

@@ -795,7 +795,7 @@ namespace OpenSim.Region.Scenes
         {

             List<MapBlockData> mapBlocks;

             mapBlocks = this.commsManager.GridServer.RequestNeighbourMapBlocks(minX, minY, maxX, maxY);

-

+            Console.WriteLine("number of mapblocks " + mapBlocks.Count +" in "+ minX +" , " + minY + " , "+ maxX + " , "+ maxY);

             remoteClient.SendMapBlock(mapBlocks);

         }

 

@@ -843,9 +843,9 @@ namespace OpenSim.Region.Scenes
         /// <param name="regionhandle"></param>

         /// <param name="agentID"></param>

         /// <param name="position"></param>

-        public void InformNeighbourOfCrossing(ulong regionhandle, LLUUID agentID, LLVector3 position)

+        public bool InformNeighbourOfCrossing(ulong regionhandle, LLUUID agentID, LLVector3 position)

         {

-            this.commsManager.InterRegion.ExpectAvatarCrossing(regionhandle, agentID, position);

+           return this.commsManager.InterRegion.ExpectAvatarCrossing(regionhandle, agentID, position);

         }

 

         #endregion

diff --git a/OpenSim/OpenSim.Region/Scenes/ScenePresence.cs b/OpenSim/OpenSim.Region/Scenes/ScenePresence.cs
index 1255606..fe82130 100644
--- a/OpenSim/OpenSim.Region/Scenes/ScenePresence.cs
+++ b/OpenSim/OpenSim.Region/Scenes/ScenePresence.cs
@@ -43,6 +43,7 @@ namespace OpenSim.Region.Scenes
     {

         public static bool PhysicsEngineFlying = false;

         public static AvatarAnimations Animations;

+        public static byte[] DefaultTexture;

         public string firstname;

         public string lastname;

         public IClientAPI ControllingClient;

@@ -324,7 +325,7 @@ namespace OpenSim.Region.Scenes
         /// <param name="remoteAvatar"></param>

         public void SendFullUpdateToOtherClient(ScenePresence remoteAvatar)

         {

-            remoteAvatar.ControllingClient.SendAvatarData(m_regionInfo.RegionHandle, this.firstname, this.lastname, this.uuid, this.LocalId, this.Pos);

+            remoteAvatar.ControllingClient.SendAvatarData(m_regionInfo.RegionHandle, this.firstname, this.lastname, this.uuid, this.LocalId, this.Pos, DefaultTexture);

         }

 

         /// <summary>

@@ -332,7 +333,7 @@ namespace OpenSim.Region.Scenes
         /// </summary>

         public void SendInitialData()

         {

-            this.ControllingClient.SendAvatarData(m_regionInfo.RegionHandle, this.firstname, this.lastname, this.uuid, this.LocalId, this.Pos);

+            this.ControllingClient.SendAvatarData(m_regionInfo.RegionHandle, this.firstname, this.lastname, this.uuid, this.LocalId, this.Pos, DefaultTexture);

             if (this.newAvatar)

             {

                 this.m_world.InformClientOfNeighbours(this.ControllingClient);

@@ -439,10 +440,12 @@ namespace OpenSim.Region.Scenes
             RegionInfo neighbourRegion = this.m_world.RequestNeighbouringRegionInfo(neighbourHandle);

             if (neighbourRegion != null)

             {

-                this.m_world.InformNeighbourOfCrossing(neighbourHandle, this.ControllingClient.AgentId, newpos);

-                this.MakeChildAgent();

-                this.ControllingClient.CrossRegion(neighbourHandle, newpos, vel, System.Net.IPAddress.Parse(neighbourRegion.IPListenAddr), (ushort)neighbourRegion.IPListenPort);

-

+                bool res = this.m_world.InformNeighbourOfCrossing(neighbourHandle, this.ControllingClient.AgentId, newpos);

+                if (res)

+                {

+                    this.MakeChildAgent();

+                    this.ControllingClient.CrossRegion(neighbourHandle, newpos, vel, System.Net.IPAddress.Parse(neighbourRegion.IPListenAddr), (ushort)neighbourRegion.IPListenPort);

+                }

             }

         }

         #endregion

@@ -481,6 +484,18 @@ namespace OpenSim.Region.Scenes
             }

         }

 

+        public static void LoadTextureFile(string name)

+        {

+            FileInfo fInfo = new FileInfo(name);

+            long numBytes = fInfo.Length;

+            FileStream fStream = new FileStream(name, FileMode.Open, FileAccess.Read);

+            BinaryReader br = new BinaryReader(fStream);

+            byte[] data1 = br.ReadBytes((int)numBytes);

+            br.Close();

+            fStream.Close();

+            DefaultTexture = data1;

+        }

+

         public class NewForce

         {

             public float X;