From 5f516c9fb20e8c061f7b634ceeb2b21286dfcd5e Mon Sep 17 00:00:00 2001
From: Teravus Ovares
Date: Fri, 7 Dec 2007 23:21:32 +0000
Subject: * All remoting calls are now using Serializable values * There's
 still goofyness though, because other regions are denying child agent avatar.
 * Still more debugging required.

---
 OpenSim/Region/Communications/OGS1/OGS1GridServices.cs  |  6 +++---
 OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'OpenSim/Region/Communications')

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)
             {
-- 
cgit v1.1