aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs
diff options
context:
space:
mode:
authorTeravus Ovares2008-09-06 22:28:51 +0000
committerTeravus Ovares2008-09-06 22:28:51 +0000
commit3378b502c5c02de2cc0d9d73bd24aecafa5dd3fe (patch)
tree78f306a05c126927d06936cd87ef9e6e0a1cdaf7 /OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs
parentMantis#1234. Thank you HomerHorwitz for a patch that: (diff)
downloadopensim-SC_OLD-3378b502c5c02de2cc0d9d73bd24aecafa5dd3fe.zip
opensim-SC_OLD-3378b502c5c02de2cc0d9d73bd24aecafa5dd3fe.tar.gz
opensim-SC_OLD-3378b502c5c02de2cc0d9d73bd24aecafa5dd3fe.tar.bz2
opensim-SC_OLD-3378b502c5c02de2cc0d9d73bd24aecafa5dd3fe.tar.xz
* This changes gridcomms types back to our home grown wholy controlled types.
* These are different types then the OMV types because changing them causes just about all grid comms to break. If these were the libOMV types, then libOMV couldn't change them ever again after that.. or we'd have a breakage whenever they changed them. * This might introduce a map issue. Still checking it out.
Diffstat (limited to 'OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs')
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs8
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs b/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs
index 1f0c067..0195a58 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs
@@ -202,13 +202,13 @@ namespace OpenSim.Region.Communications.OGS1
202 } 202 }
203 203
204 204
205 public bool ExpectAvatarCrossing(ulong regionHandle, Guid agentID, Vector3 position, bool isFlying) 205 public bool ExpectAvatarCrossing(ulong regionHandle, Guid agentID, sLLVector3 position, bool isFlying)
206 { 206 {
207 try 207 try
208 { 208 {
209 return 209 return
210 InterRegionSingleton.Instance.ExpectAvatarCrossing(regionHandle, new UUID(agentID), 210 InterRegionSingleton.Instance.ExpectAvatarCrossing(regionHandle, new UUID(agentID),
211 position, 211 new Vector3(position.x, position.y, position.z),
212 isFlying); 212 isFlying);
213 } 213 }
214 catch (RemotingException e) 214 catch (RemotingException e)
@@ -218,13 +218,13 @@ namespace OpenSim.Region.Communications.OGS1
218 } 218 }
219 } 219 }
220 220
221 public bool InformRegionPrim(ulong regionHandle, Guid SceneObjectGroupID, Vector3 position, bool isPhysical) 221 public bool InformRegionPrim(ulong regionHandle, Guid SceneObjectGroupID, sLLVector3 position, bool isPhysical)
222 { 222 {
223 try 223 try
224 { 224 {
225 return 225 return
226 InterRegionSingleton.Instance.InformRegionPrim(regionHandle, new UUID(SceneObjectGroupID), 226 InterRegionSingleton.Instance.InformRegionPrim(regionHandle, new UUID(SceneObjectGroupID),
227 position, 227 new Vector3(position.x, position.y, position.z),
228 isPhysical); 228 isPhysical);
229 } 229 }
230 catch (RemotingException e) 230 catch (RemotingException e)