8 files changed, 52 insertions, 9 deletions

diff --git a/Common/OpenGrid.Framework.Communications/CommunicationsManager.cs b/Common/OpenGrid.Framework.Communications/CommunicationsManager.cs
index 10fe251..2ed4fd2 100644
--- a/Common/OpenGrid.Framework.Communications/CommunicationsManager.cs
+++ b/Common/OpenGrid.Framework.Communications/CommunicationsManager.cs
@@ -41,7 +41,7 @@ namespace OpenGrid.Framework.Communications
     {

         public IUserServices UserServer;

         public IGridServices GridServer;

-        public IInterRegionCommunications InterSims;

+        public IInterRegionCommunications InterRegion;

 

         public CommunicationsManager()

         {

diff --git a/Common/OpenGrid.Framework.Communications/IGridServices.cs b/Common/OpenGrid.Framework.Communications/IGridServices.cs
index 9466647..b4bc3b6 100644
--- a/Common/OpenGrid.Framework.Communications/IGridServices.cs
+++ b/Common/OpenGrid.Framework.Communications/IGridServices.cs
@@ -36,8 +36,9 @@ namespace OpenGrid.Framework.Communications
 {

     public interface IGridServices

     {

-        RegionCommsHostBase RegisterRegion(RegionInfo regionInfo);

+        RegionCommsListener RegisterRegion(RegionInfo regionInfo);

         List<RegionInfo> RequestNeighbours(RegionInfo regionInfo);

         RegionInfo RequestNeighbourInfo(ulong regionHandle);

+        List<MapBlockData> RequestNeighbourMapBlocks(int minX, int minY, int maxX, int maxY);

     }

 }

diff --git a/Common/OpenSim.Framework/IRegionCommsHost.cs b/Common/OpenSim.Framework/IRegionCommsListener.cs
index 658afe6..0e80941 100644
--- a/Common/OpenSim.Framework/IRegionCommsHost.cs
+++ b/Common/OpenSim.Framework/IRegionCommsListener.cs
@@ -37,7 +37,7 @@ namespace OpenSim.Framework
     public delegate void UpdateNeighbours(List<RegionInfo> neighbours);

     public delegate void AgentCrossing(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position);

 

-    public interface IRegionCommsHost

+    public interface IRegionCommsListener

     {

         event ExpectUserDelegate OnExpectUser;

         event GenericCall2 OnExpectChildAgent;

diff --git a/Common/OpenSim.Framework/Interfaces/IClientAPI.cs b/Common/OpenSim.Framework/Interfaces/IClientAPI.cs
index 45d73ef..6e758b2 100644
--- a/Common/OpenSim.Framework/Interfaces/IClientAPI.cs
+++ b/Common/OpenSim.Framework/Interfaces/IClientAPI.cs
@@ -41,12 +41,16 @@ namespace OpenSim.Framework.Interfaces
     public delegate void SetAppearance(byte[] texture, AgentSetAppearancePacket.VisualParamBlock[] visualParam);

     public delegate void StartAnim(LLUUID animID, int seq);

     public delegate void LinkObjects(uint parent, List<uint> children);

+    public delegate void RequestMapBlocks(IClientAPI remoteClient, int minX, int minY, int maxX, int maxY);

+    public delegate void TeleportLocationRequest(IClientAPI remoteClient, ulong regionHandle, LLVector3 position, LLVector3 lookAt, uint flags);

+

     public delegate void GenericCall(IClientAPI remoteClient);

     public delegate void GenericCall2();

     public delegate void GenericCall3(Packet packet); // really don't want to be passing packets in these events, so this is very temporary.

     public delegate void GenericCall4(Packet packet, IClientAPI remoteClient);

     public delegate void GenericCall5(IClientAPI remoteClient, bool status);

     public delegate void GenericCall6(LLUUID uid);

+

     public delegate void UpdateShape(uint localID, ObjectShapePacket.ObjectDataBlock shapeBlock);

     public delegate void ObjectSelect(uint localID, IClientAPI remoteClient);

     public delegate void UpdatePrimFlags(uint localID, Packet packet, IClientAPI remoteClient);

@@ -72,6 +76,9 @@ namespace OpenSim.Framework.Interfaces
         event SetAppearance OnSetAppearance;

         event StartAnim OnStartAnim;

         event LinkObjects OnLinkObjects;

+        event RequestMapBlocks OnRequestMapBlocks;

+        event TeleportLocationRequest OnTeleportLocationRequest;

+

         event GenericCall4 OnDeRezObject;

         event GenericCall OnRegionHandShakeReply;

         event GenericCall OnRequestWearables;

@@ -79,6 +86,7 @@ namespace OpenSim.Framework.Interfaces
         event UpdateAgent OnAgentUpdate;

         event GenericCall OnRequestAvatarsData;

         event GenericCall4 OnAddPrim;

+

         event UpdateShape OnUpdatePrimShape;

         event ObjectSelect OnObjectSelect;

         event UpdatePrimFlags OnUpdatePrimFlags;

@@ -125,10 +133,15 @@ namespace OpenSim.Framework.Interfaces
         void SendChatMessage(string message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID);

         void SendChatMessage(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID);

         void SendLayerData(float[] map);

-        void MoveAgentIntoRegion(RegionInfo regInfo, LLVector3 pos);

+        void MoveAgentIntoRegion(RegionInfo regInfo, LLVector3 pos, LLVector3 look);

         void InformClientOfNeighbour(ulong neighbourHandle, System.Net.IPAddress neighbourIP, ushort neighbourPort);

         AgentCircuitData RequestClientInfo();

         void CrossRegion(ulong newRegionHandle, LLVector3 pos, LLVector3 lookAt, System.Net.IPAddress newRegionIP, ushort newRegionPort);

+        void SendMapBlock(List<MapBlockData> mapBlocks);

+        void SendLocalTeleport(LLVector3 position, LLVector3 lookAt, uint flags);

+        void SendRegionTeleport(ulong regionHandle, byte simAccess, string ipAddress, ushort ipPort, uint locationID, uint flags);

+        void SendTeleportCancel();

+        void SendTeleportLocationStart();

 

         void SendAvatarData(RegionInfo regionInfo, string firstName, string lastName, LLUUID avatarID, uint avatarLocalID, LLVector3 Pos);

         void SendAvatarTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, LLVector3 position, LLVector3 velocity);

diff --git a/Common/OpenSim.Framework/OpenSim.Framework.csproj b/Common/OpenSim.Framework/OpenSim.Framework.csproj
index 4939b59..060e471 100644
--- a/Common/OpenSim.Framework/OpenSim.Framework.csproj
+++ b/Common/OpenSim.Framework/OpenSim.Framework.csproj
@@ -99,13 +99,13 @@
     <Compile Include="BlockingQueue.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="IRegionCommsHost.cs">

+    <Compile Include="IRegionCommsListener.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="LoginService.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="RegionCommsHostBase.cs">

+    <Compile Include="RegionCommsListener.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="Remoting.cs">

@@ -183,6 +183,9 @@
     <Compile Include="Types\Login.cs">

       <SubType>Code</SubType>

     </Compile>

+    <Compile Include="Types\MapBlockData.cs">

+      <SubType>Code</SubType>

+    </Compile>

     <Compile Include="Types\NeighbourInfo.cs">

       <SubType>Code</SubType>

     </Compile>

diff --git a/Common/OpenSim.Framework/OpenSim.Framework.dll.build b/Common/OpenSim.Framework/OpenSim.Framework.dll.build
index 65a58dc..524255c 100644
--- a/Common/OpenSim.Framework/OpenSim.Framework.dll.build
+++ b/Common/OpenSim.Framework/OpenSim.Framework.dll.build
@@ -14,9 +14,9 @@
                 <include name="AgentInventory.cs" />

                 <include name="AuthenticateSessionBase.cs" />

                 <include name="BlockingQueue.cs" />

-                <include name="IRegionCommsHost.cs" />

+                <include name="IRegionCommsListener.cs" />

                 <include name="LoginService.cs" />

-                <include name="RegionCommsHostBase.cs" />

+                <include name="RegionCommsListener.cs" />

                 <include name="Remoting.cs" />

                 <include name="SimProfile.cs" />

                 <include name="UserProfile.cs" />

@@ -42,6 +42,7 @@
                 <include name="Types/AssetStorage.cs" />

                 <include name="Types/EstateSettings.cs" />

                 <include name="Types/Login.cs" />

+                <include name="Types/MapBlockData.cs" />

                 <include name="Types/NeighbourInfo.cs" />

                 <include name="Types/NetworkServersInfo.cs" />

                 <include name="Types/ParcelData.cs" />

diff --git a/Common/OpenSim.Framework/RegionCommsHostBase.cs b/Common/OpenSim.Framework/RegionCommsListener.cs
index 88751b8..3fec937 100644
--- a/Common/OpenSim.Framework/RegionCommsHostBase.cs
+++ b/Common/OpenSim.Framework/RegionCommsListener.cs
@@ -33,7 +33,7 @@ using OpenSim.Framework.Types;
 

 namespace OpenSim.Framework

 {

-    public class RegionCommsHostBase :IRegionCommsHost

+    public class RegionCommsListener :IRegionCommsListener

     {

         public event ExpectUserDelegate OnExpectUser;

         public event GenericCall2 OnExpectChildAgent;

diff --git a/Common/OpenSim.Framework/Types/MapBlockData.cs b/Common/OpenSim.Framework/Types/MapBlockData.cs
new file mode 100644
index 0000000..2e6f56e
--- /dev/null
+++ b/Common/OpenSim.Framework/Types/MapBlockData.cs
@@ -0,0 +1,25 @@
+using System;

+using System.Collections.Generic;

+using System.Text;

+using libsecondlife;

+

+namespace OpenSim.Framework.Types

+{

+    public class MapBlockData

+    {

+        public uint Flags;

+        public ushort X;

+        public ushort Y;

+        public byte Agents;

+        public byte Access;

+        public byte WaterHeight;

+        public LLUUID MapImageId;

+        public String Name;

+        public uint RegionFlags;

+

+        public MapBlockData()

+        {

+

+        }

+    }

+}