diff options
author | Teravus Ovares | 2008-09-06 07:52:41 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-09-06 07:52:41 +0000 |
commit | 7d89e122930be39e84a6d174548fa2d12ac0484a (patch) | |
tree | e5aa5752f988a9aba2a969f49e5e208985eda80c /OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs | |
parent | * minor: speculatively try a change to bamboo.build to see if this generates ... (diff) | |
download | opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.zip opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.gz opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.bz2 opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.xz |
* This is the fabled LibOMV update with all of the libOMV types from JHurliman
* This is a HUGE OMG update and will definitely have unknown side effects.. so this is really only for the strong hearted at this point. Regular people should let the dust settle.
* This has been tested to work with most basic functions. However.. make sure you back up 'everything' before using this. It's that big!
* Essentially we're back at square 1 in the testing phase.. so lets identify things that broke.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs b/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs index 8285fb1..1f0c067 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs | |||
@@ -28,7 +28,7 @@ | |||
28 | using System; | 28 | using System; |
29 | using System.Reflection; | 29 | using System.Reflection; |
30 | using System.Runtime.Remoting; | 30 | using System.Runtime.Remoting; |
31 | using libsecondlife; | 31 | using OpenMetaverse; |
32 | using log4net; | 32 | using log4net; |
33 | using OpenSim.Framework; | 33 | using OpenSim.Framework; |
34 | 34 | ||
@@ -36,17 +36,17 @@ namespace OpenSim.Region.Communications.OGS1 | |||
36 | { | 36 | { |
37 | public delegate bool InformRegionChild(ulong regionHandle, AgentCircuitData agentData); | 37 | public delegate bool InformRegionChild(ulong regionHandle, AgentCircuitData agentData); |
38 | 38 | ||
39 | public delegate bool ExpectArrival(ulong regionHandle, LLUUID agentID, LLVector3 position, bool isFlying); | 39 | public delegate bool ExpectArrival(ulong regionHandle, UUID agentID, Vector3 position, bool isFlying); |
40 | 40 | ||
41 | public delegate bool InformRegionPrimGroup(ulong regionHandle, LLUUID primID, LLVector3 Positon, bool isPhysical); | 41 | public delegate bool InformRegionPrimGroup(ulong regionHandle, UUID primID, Vector3 Positon, bool isPhysical); |
42 | 42 | ||
43 | public delegate bool PrimGroupArrival(ulong regionHandle, LLUUID primID, string objData, int XMLMethod); | 43 | public delegate bool PrimGroupArrival(ulong regionHandle, UUID primID, string objData, int XMLMethod); |
44 | 44 | ||
45 | public delegate bool RegionUp(RegionUpData region, ulong regionhandle); | 45 | public delegate bool RegionUp(RegionUpData region, ulong regionhandle); |
46 | 46 | ||
47 | public delegate bool ChildAgentUpdate(ulong regionHandle, ChildAgentDataUpdate childUpdate); | 47 | public delegate bool ChildAgentUpdate(ulong regionHandle, ChildAgentDataUpdate childUpdate); |
48 | 48 | ||
49 | public delegate bool TellRegionToCloseChildConnection(ulong regionHandle, LLUUID agentID); | 49 | public delegate bool TellRegionToCloseChildConnection(ulong regionHandle, UUID agentID); |
50 | 50 | ||
51 | public sealed class InterRegionSingleton | 51 | public sealed class InterRegionSingleton |
52 | { | 52 | { |
@@ -112,7 +112,7 @@ namespace OpenSim.Region.Communications.OGS1 | |||
112 | return false; | 112 | return false; |
113 | } | 113 | } |
114 | 114 | ||
115 | public bool ExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position, bool isFlying) | 115 | public bool ExpectAvatarCrossing(ulong regionHandle, UUID agentID, Vector3 position, bool isFlying) |
116 | { | 116 | { |
117 | handlerArrival = OnArrival; | 117 | handlerArrival = OnArrival; |
118 | if (handlerArrival != null) | 118 | if (handlerArrival != null) |
@@ -122,7 +122,7 @@ namespace OpenSim.Region.Communications.OGS1 | |||
122 | return false; | 122 | return false; |
123 | } | 123 | } |
124 | 124 | ||
125 | public bool InformRegionPrim(ulong regionHandle, LLUUID primID, LLVector3 position, bool isPhysical) | 125 | public bool InformRegionPrim(ulong regionHandle, UUID primID, Vector3 position, bool isPhysical) |
126 | { | 126 | { |
127 | handlerPrimGroupNear = OnPrimGroupNear; | 127 | handlerPrimGroupNear = OnPrimGroupNear; |
128 | if (handlerPrimGroupNear != null) | 128 | if (handlerPrimGroupNear != null) |
@@ -132,7 +132,7 @@ namespace OpenSim.Region.Communications.OGS1 | |||
132 | return false; | 132 | return false; |
133 | } | 133 | } |
134 | 134 | ||
135 | public bool ExpectPrimCrossing(ulong regionHandle, LLUUID primID, string objData, int XMLMethod) | 135 | public bool ExpectPrimCrossing(ulong regionHandle, UUID primID, string objData, int XMLMethod) |
136 | { | 136 | { |
137 | handlerPrimGroupArrival = OnPrimGroupArrival; | 137 | handlerPrimGroupArrival = OnPrimGroupArrival; |
138 | if (handlerPrimGroupArrival != null) | 138 | if (handlerPrimGroupArrival != null) |
@@ -142,7 +142,7 @@ namespace OpenSim.Region.Communications.OGS1 | |||
142 | return false; | 142 | return false; |
143 | } | 143 | } |
144 | 144 | ||
145 | public bool TellRegionToCloseChildConnection(ulong regionHandle, LLUUID agentID) | 145 | public bool TellRegionToCloseChildConnection(ulong regionHandle, UUID agentID) |
146 | { | 146 | { |
147 | handlerTellRegionToCloseChildConnection = OnTellRegionToCloseChildConnection; | 147 | handlerTellRegionToCloseChildConnection = OnTellRegionToCloseChildConnection; |
148 | if (handlerTellRegionToCloseChildConnection != null) | 148 | if (handlerTellRegionToCloseChildConnection != null) |
@@ -202,13 +202,13 @@ namespace OpenSim.Region.Communications.OGS1 | |||
202 | } | 202 | } |
203 | 203 | ||
204 | 204 | ||
205 | public bool ExpectAvatarCrossing(ulong regionHandle, Guid agentID, sLLVector3 position, bool isFlying) | 205 | public bool ExpectAvatarCrossing(ulong regionHandle, Guid agentID, Vector3 position, bool isFlying) |
206 | { | 206 | { |
207 | try | 207 | try |
208 | { | 208 | { |
209 | return | 209 | return |
210 | InterRegionSingleton.Instance.ExpectAvatarCrossing(regionHandle, new LLUUID(agentID), | 210 | InterRegionSingleton.Instance.ExpectAvatarCrossing(regionHandle, new UUID(agentID), |
211 | new LLVector3(position.x, position.y, position.z), | 211 | position, |
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, sLLVector3 position, bool isPhysical) | 221 | public bool InformRegionPrim(ulong regionHandle, Guid SceneObjectGroupID, Vector3 position, bool isPhysical) |
222 | { | 222 | { |
223 | try | 223 | try |
224 | { | 224 | { |
225 | return | 225 | return |
226 | InterRegionSingleton.Instance.InformRegionPrim(regionHandle, new LLUUID(SceneObjectGroupID), | 226 | InterRegionSingleton.Instance.InformRegionPrim(regionHandle, new UUID(SceneObjectGroupID), |
227 | new LLVector3(position.x, position.y, position.z), | 227 | position, |
228 | isPhysical); | 228 | isPhysical); |
229 | } | 229 | } |
230 | catch (RemotingException e) | 230 | catch (RemotingException e) |
@@ -238,7 +238,7 @@ namespace OpenSim.Region.Communications.OGS1 | |||
238 | { | 238 | { |
239 | try | 239 | try |
240 | { | 240 | { |
241 | return InterRegionSingleton.Instance.ExpectPrimCrossing(regionHandle, new LLUUID(primID), objData, XMLMethod); | 241 | return InterRegionSingleton.Instance.ExpectPrimCrossing(regionHandle, new UUID(primID), objData, XMLMethod); |
242 | } | 242 | } |
243 | catch (RemotingException e) | 243 | catch (RemotingException e) |
244 | { | 244 | { |
@@ -251,7 +251,7 @@ namespace OpenSim.Region.Communications.OGS1 | |||
251 | { | 251 | { |
252 | try | 252 | try |
253 | { | 253 | { |
254 | return InterRegionSingleton.Instance.TellRegionToCloseChildConnection(regionHandle, new LLUUID(agentID)); | 254 | return InterRegionSingleton.Instance.TellRegionToCloseChildConnection(regionHandle, new UUID(agentID)); |
255 | } | 255 | } |
256 | catch (RemotingException) | 256 | catch (RemotingException) |
257 | { | 257 | { |