diff options
author | Teravus Ovares | 2007-12-07 23:21:32 +0000 |
---|---|---|
committer | Teravus Ovares | 2007-12-07 23:21:32 +0000 |
commit | 5f516c9fb20e8c061f7b634ceeb2b21286dfcd5e (patch) | |
tree | 33928fb162f8f7bddd26e19f343ec79e2734f7ad /OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs | |
parent | Enabled the TextureDownloadModule, so that hopefully I might get some feedbac... (diff) | |
download | opensim-SC-5f516c9fb20e8c061f7b634ceeb2b21286dfcd5e.zip opensim-SC-5f516c9fb20e8c061f7b634ceeb2b21286dfcd5e.tar.gz opensim-SC-5f516c9fb20e8c061f7b634ceeb2b21286dfcd5e.tar.bz2 opensim-SC-5f516c9fb20e8c061f7b634ceeb2b21286dfcd5e.tar.xz |
* 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.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs | 12 |
1 files changed, 6 insertions, 6 deletions
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 | { |