4 files changed, 87 insertions, 36 deletions

diff --git a/OpenSim/OpenSim.Caches/AssetCache.cs b/OpenSim/OpenSim.Caches/AssetCache.cs
index f310752..d0cc370 100644
--- a/OpenSim/OpenSim.Caches/AssetCache.cs
+++ b/OpenSim/OpenSim.Caches/AssetCache.cs
@@ -39,6 +39,7 @@ using OpenSim.Framework.Utilities;
 namespace OpenSim.Caches

 {

     public delegate void DownloadComplete(AssetCache.TextureSender sender);

+

     /// <summary>

     /// Manages local cache of assets and their sending to viewers.

     /// </summary>

diff --git a/OpenSim/OpenSim.Region/Caps.cs b/OpenSim/OpenSim.Region/Caps.cs
index 59f24e3..7ec0c75 100644
--- a/OpenSim/OpenSim.Region/Caps.cs
+++ b/OpenSim/OpenSim.Region/Caps.cs
@@ -22,9 +22,11 @@ namespace OpenSim.Region
         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;

 

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

         {

@@ -45,6 +47,7 @@ namespace OpenSim.Region
             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>

@@ -74,6 +77,7 @@ namespace OpenSim.Region
             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;

         }

 

@@ -116,6 +120,40 @@ namespace OpenSim.Region
             return res;

         }

 

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

+        {

+            Console.WriteLine("event queue request " + request);

+            string res = "";

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

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

@@ -123,13 +161,13 @@ namespace OpenSim.Region
             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);

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

@@ -138,7 +176,7 @@ namespace OpenSim.Region
 

         public void UploadHandler(LLUUID assetID, LLUUID inventoryItem, byte[] data)

         {

-           // Console.WriteLine("upload handler called");

+            // Console.WriteLine("upload handler called");

             AssetBase asset;

             asset = new AssetBase();

             asset.FullID = assetID;

@@ -147,7 +185,7 @@ namespace OpenSim.Region
             asset.Name = "UploadedTexture" + Util.RandomClass.Next(1, 1000).ToString("000");

             asset.Data = data;

             this.assetCache.AddAsset(asset);

-            

+

         }

 

         public class AssetUploader

@@ -181,12 +219,12 @@ namespace OpenSim.Region
                 res += "</map></llsd>";

 

                 Console.WriteLine("asset " + newAssetID.ToStringHyphenated() + " , inventory item " + inv.ToStringHyphenated());

-                httpListener.RemoveRestHandler("POST", "/CAPS/"+uploaderPath);

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

diff --git a/OpenSim/OpenSim/OpenSim.csproj b/OpenSim/OpenSim/OpenSim.csproj
index a8cadc0..91eb474 100644
--- a/OpenSim/OpenSim/OpenSim.csproj
+++ b/OpenSim/OpenSim/OpenSim.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>{438A9556-0000-0000-0000-000000000000}</ProjectGuid>

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

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

-    <ApplicationIcon></ApplicationIcon>

+    <ApplicationIcon>

+    </ApplicationIcon>

     <AssemblyKeyContainerName>

     </AssemblyKeyContainerName>

     <AssemblyName>OpenSim</AssemblyName>

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

     <DelaySign>false</DelaySign>

     <OutputType>Exe</OutputType>

-    <AppDesignerFolder></AppDesignerFolder>

+    <AppDesignerFolder>

+    </AppDesignerFolder>

     <RootNamespace>OpenSim</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,108 +61,113 @@
     <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.Xml">

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

       <Private>False</Private>

     </Reference>

   </ItemGroup>

   <ItemGroup>

+    <ProjectReference Include="..\..\Common\OpenGrid.Framework.Communications.OGS1\OpenGrid.Framework.Communications.OGS1.csproj">

+      <Project>{C1F40DD4-A68B-4233-9142-CE236775A3CE}</Project>

+      <Name>OpenGrid.Framework.Communications.OGS1</Name>

+    </ProjectReference>

     <ProjectReference Include="..\..\Common\OpenGrid.Framework.Communications\OpenGrid.Framework.Communications.csproj">

       <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="..\..\Common\OpenGrid.Framework.UserManager\OpenGrid.Framework.UserManagement.csproj">

       <Name>OpenGrid.Framework.UserManagement</Name>

       <Project>{DA9A7391-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.LocalCommunications\OpenSim.LocalCommunications.csproj">

       <Name>OpenSim.LocalCommunications</Name>

       <Project>{79CED992-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="..\OpenSim.Region\OpenSim.Region.csproj">

       <Name>OpenSim.Region</Name>

       <Project>{196916AF-0000-0000-0000-000000000000}</Project>

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

-                        <Private>False</Private>

+      <Private>False</Private>

     </ProjectReference>

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

       <Name>OpenSim.RegionServer</Name>

       <Project>{632E1BFD-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>

@@ -174,4 +185,4 @@
     <PostBuildEvent>

     </PostBuildEvent>

   </PropertyGroup>

-</Project>

+</Project>
\ No newline at end of file
diff --git a/OpenSim/OpenSim/OpenSimMain.cs b/OpenSim/OpenSim/OpenSimMain.cs
index e2dddaf..50da5a1 100644
--- a/OpenSim/OpenSim/OpenSimMain.cs
+++ b/OpenSim/OpenSim/OpenSimMain.cs
@@ -54,6 +54,7 @@ using OpenSim.Servers;
 using OpenSim.GenericConfig;

 using OpenGrid.Framework.Communications;

 using OpenSim.LocalCommunications;

+using OpenGrid.Framework.Communications.OGS1;

 

 namespace OpenSim

 {

@@ -114,7 +115,7 @@ namespace OpenSim
             else

             {

                 this.SetupRemoteGridServers();

-                this.commsManager = new CommunicationsLocal(this.serversData.DefaultHomeLocX, this.serversData.DefaultHomeLocY); //shouldn't be using the local communications manager

+                this.commsManager = new GridCommsManager();

             }

 

             startuptime = DateTime.Now;

@@ -267,7 +268,7 @@ namespace OpenSim
 

         protected override void SetupHttpListener()

         {

-            httpServer = new BaseHttpServer(9000); //regionData[0].IPListenPort);

+            httpServer = new BaseHttpServer(this.serversData.HttpListenerPort); //regionData[0].IPListenPort);

 

             if (!this.m_sandbox)

             {