aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1GridServices.cs6
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs12
2 files changed, 9 insertions, 9 deletions
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
678 678
679 if (remObject != null) 679 if (remObject != null)
680 { 680 {
681 retValue = remObject.InformRegionOfPrimCrossing(regionHandle,primID, objData); 681 retValue = remObject.InformRegionOfPrimCrossing(regionHandle,primID.UUID, objData);
682 } 682 }
683 else 683 else
684 { 684 {
@@ -751,7 +751,7 @@ namespace OpenSim.Region.Communications.OGS1
751 "/InterRegions"); 751 "/InterRegions");
752 if (remObject != null) 752 if (remObject != null)
753 { 753 {
754 retValue = remObject.ExpectAvatarCrossing(regionHandle, agentID, position, isFlying); 754 retValue = remObject.ExpectAvatarCrossing(regionHandle, agentID.UUID, new sLLVector3(position), isFlying);
755 } 755 }
756 else 756 else
757 { 757 {
@@ -797,7 +797,7 @@ namespace OpenSim.Region.Communications.OGS1
797 "/InterRegions"); 797 "/InterRegions");
798 if (remObject != null) 798 if (remObject != null)
799 { 799 {
800 retValue = remObject.ExpectAvatarCrossing(regionHandle, agentID, position, isPhysical); 800 retValue = remObject.ExpectAvatarCrossing(regionHandle, agentID.UUID, new sLLVector3(position), isPhysical);
801 } 801 }
802 else 802 else
803 { 803 {
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
143 } 143 }
144 } 144 }
145 145
146 public bool ExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position, bool isFlying) 146 public bool ExpectAvatarCrossing(ulong regionHandle, Guid agentID, sLLVector3 position, bool isFlying)
147 { 147 {
148 try 148 try
149 { 149 {
150 return InterRegionSingleton.Instance.ExpectAvatarCrossing(regionHandle, agentID, position, isFlying); 150 return InterRegionSingleton.Instance.ExpectAvatarCrossing(regionHandle, new LLUUID(agentID), new LLVector3(position.x,position.y,position.z), isFlying);
151 } 151 }
152 catch (RemotingException e) 152 catch (RemotingException e)
153 { 153 {
@@ -155,11 +155,11 @@ namespace OpenSim.Region.Communications.OGS1
155 return false; 155 return false;
156 } 156 }
157 } 157 }
158 public bool InformRegionPrim(ulong regionHandle, LLUUID SceneObjectGroupID, LLVector3 position, bool isPhysical) 158 public bool InformRegionPrim(ulong regionHandle, Guid SceneObjectGroupID, sLLVector3 position, bool isPhysical)
159 { 159 {
160 try 160 try
161 { 161 {
162 return InterRegionSingleton.Instance.InformRegionPrim(regionHandle, SceneObjectGroupID, position, isPhysical); 162 return InterRegionSingleton.Instance.InformRegionPrim(regionHandle, new LLUUID(SceneObjectGroupID), new LLVector3(position.x,position.y,position.z), isPhysical);
163 } 163 }
164 catch (RemotingException e) 164 catch (RemotingException e)
165 { 165 {
@@ -168,11 +168,11 @@ namespace OpenSim.Region.Communications.OGS1
168 } 168 }
169 169
170 } 170 }
171 public bool InformRegionOfPrimCrossing(ulong regionHandle,LLUUID primID, string objData) 171 public bool InformRegionOfPrimCrossing(ulong regionHandle,Guid primID, string objData)
172 { 172 {
173 try 173 try
174 { 174 {
175 return InterRegionSingleton.Instance.ExpectPrimCrossing(regionHandle, primID, objData); 175 return InterRegionSingleton.Instance.ExpectPrimCrossing(regionHandle, new LLUUID(primID), objData);
176 } 176 }
177 catch (RemotingException e) 177 catch (RemotingException e)
178 { 178 {