5 files changed, 36 insertions, 10 deletions

diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index 5dc11ad..770107f 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -235,6 +235,7 @@ namespace OpenSim.Framework
             m_externalHostName = ConvertFrom.ExternalHostName;
             m_remotingPort = ConvertFrom.RemotingPort;
             RemotingAddress = ConvertFrom.RemotingAddress;
+            RegionID = LLUUID.Zero;
         }
         //not in use, should swap to nini though.
         public void LoadFromNiniSource(IConfigSource source)
diff --git a/OpenSim/Framework/SerializableRegionInfo.cs b/OpenSim/Framework/SerializableRegionInfo.cs
index c7e7d27..172d338 100644
--- a/OpenSim/Framework/SerializableRegionInfo.cs
+++ b/OpenSim/Framework/SerializableRegionInfo.cs
@@ -72,7 +72,7 @@ namespace OpenSim.Framework
             m_internalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), (int) port);
         }
 
-        public LLUUID RegionID = LLUUID.Zero;
+        public Guid RegionID = LLUUID.Zero.UUID;
 
         public uint m_remotingPort;
         public uint RemotingPort
diff --git a/OpenSim/Framework/sLLVector3.cs b/OpenSim/Framework/sLLVector3.cs
new file mode 100644
index 0000000..25a9015
--- /dev/null
+++ b/OpenSim/Framework/sLLVector3.cs
@@ -0,0 +1,25 @@
+using System;

+using libsecondlife;

+

+

+namespace OpenSim.Framework

+{

+    [Serializable]

+    public class sLLVector3

+    {

+        public sLLVector3()

+        {

+

+        }

+        public sLLVector3(LLVector3 v)

+        {

+            x = v.X;

+            y = v.Y;

+            z = v.Z;

+        }

+        public float x;

+        public float y;

+        public float z;

+    }

+

+}

diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index fa776ed..978111f 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -678,7 +678,7 @@ namespace OpenSim.Region.Communications.OGS1
 
                     if (remObject != null)
                     {
-                        retValue = remObject.InformRegionOfPrimCrossing(regionHandle,primID, objData);
+                        retValue = remObject.InformRegionOfPrimCrossing(regionHandle,primID.UUID, objData);
                     }
                     else
                     {
@@ -751,7 +751,7 @@ namespace OpenSim.Region.Communications.OGS1
                                                                                       "/InterRegions");
                     if (remObject != null)
                     {
-                        retValue = remObject.ExpectAvatarCrossing(regionHandle, agentID, position, isFlying);
+                        retValue = remObject.ExpectAvatarCrossing(regionHandle, agentID.UUID, new sLLVector3(position), isFlying);
                     }
                     else
                     {
@@ -797,7 +797,7 @@ namespace OpenSim.Region.Communications.OGS1
                                                                                       "/InterRegions");
                     if (remObject != null)
                     {
-                        retValue = remObject.ExpectAvatarCrossing(regionHandle, agentID, position, isPhysical);
+                        retValue = remObject.ExpectAvatarCrossing(regionHandle, agentID.UUID, new sLLVector3(position), isPhysical);
                     }
                     else
                     {
diff --git a/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs b/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs
index 152107c..a7636da 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs
@@ -143,11 +143,11 @@ namespace OpenSim.Region.Communications.OGS1
             }
         }
 
-        public bool ExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position, bool isFlying)
+        public bool ExpectAvatarCrossing(ulong regionHandle, Guid agentID, sLLVector3 position, bool isFlying)
         {
             try
             {
-                return InterRegionSingleton.Instance.ExpectAvatarCrossing(regionHandle, agentID, position, isFlying);
+                return InterRegionSingleton.Instance.ExpectAvatarCrossing(regionHandle, new LLUUID(agentID), new LLVector3(position.x,position.y,position.z), isFlying);
             }
             catch (RemotingException e)
             {
@@ -155,11 +155,11 @@ namespace OpenSim.Region.Communications.OGS1
                 return false;
             }
         }
-        public bool InformRegionPrim(ulong regionHandle, LLUUID SceneObjectGroupID, LLVector3 position, bool isPhysical)
+        public bool InformRegionPrim(ulong regionHandle, Guid SceneObjectGroupID, sLLVector3 position, bool isPhysical)
         {
             try
             {
-                return InterRegionSingleton.Instance.InformRegionPrim(regionHandle, SceneObjectGroupID, position, isPhysical);
+                return InterRegionSingleton.Instance.InformRegionPrim(regionHandle, new LLUUID(SceneObjectGroupID), new LLVector3(position.x,position.y,position.z), isPhysical);
             }
             catch (RemotingException e)
             {
@@ -168,11 +168,11 @@ namespace OpenSim.Region.Communications.OGS1
             }
             
         }
-        public bool InformRegionOfPrimCrossing(ulong regionHandle,LLUUID primID, string objData)
+        public bool InformRegionOfPrimCrossing(ulong regionHandle,Guid primID, string objData)
         {
             try
             {
-                return InterRegionSingleton.Instance.ExpectPrimCrossing(regionHandle, primID, objData);
+                return InterRegionSingleton.Instance.ExpectPrimCrossing(regionHandle, new LLUUID(primID), objData);
             }
             catch (RemotingException e)
             {