aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs')
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs16
1 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs b/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs
index c282464..2e106d7 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs
@@ -38,9 +38,9 @@ namespace OpenSim.Region.Communications.OGS1
38 38
39 public delegate bool InformRegionPrimGroup(ulong regionHandle, LLUUID primID, LLVector3 Positon, bool isPhysical); 39 public delegate bool InformRegionPrimGroup(ulong regionHandle, LLUUID primID, LLVector3 Positon, bool isPhysical);
40 40
41 public delegate bool PrimGroupArrival(ulong regionHandle, LLUUID primID, string objData); 41 public delegate bool PrimGroupArrival(ulong regionHandle, LLUUID primID, string objData, int XMLMethod);
42 42
43 public delegate bool RegionUp(SearializableRegionInfo region, ulong regionhandle); 43 public delegate bool RegionUp(RegionUpData region, ulong regionhandle);
44 44
45 public delegate bool ChildAgentUpdate(ulong regionHandle, ChildAgentDataUpdate childUpdate); 45 public delegate bool ChildAgentUpdate(ulong regionHandle, ChildAgentDataUpdate childUpdate);
46 46
@@ -90,7 +90,7 @@ namespace OpenSim.Region.Communications.OGS1
90 return false; 90 return false;
91 } 91 }
92 92
93 public bool RegionUp(SearializableRegionInfo sregion, ulong regionhandle) 93 public bool RegionUp(RegionUpData sregion, ulong regionhandle)
94 { 94 {
95 handlerRegionUp = OnRegionUp; 95 handlerRegionUp = OnRegionUp;
96 if (handlerRegionUp != null) 96 if (handlerRegionUp != null)
@@ -130,12 +130,12 @@ namespace OpenSim.Region.Communications.OGS1
130 return false; 130 return false;
131 } 131 }
132 132
133 public bool ExpectPrimCrossing(ulong regionHandle, LLUUID primID, string objData) 133 public bool ExpectPrimCrossing(ulong regionHandle, LLUUID primID, string objData, int XMLMethod)
134 { 134 {
135 handlerPrimGroupArrival = OnPrimGroupArrival; 135 handlerPrimGroupArrival = OnPrimGroupArrival;
136 if (handlerPrimGroupArrival != null) 136 if (handlerPrimGroupArrival != null)
137 { 137 {
138 return handlerPrimGroupArrival(regionHandle, primID, objData); 138 return handlerPrimGroupArrival(regionHandle, primID, objData, XMLMethod);
139 } 139 }
140 return false; 140 return false;
141 } 141 }
@@ -173,7 +173,7 @@ namespace OpenSim.Region.Communications.OGS1
173 } 173 }
174 } 174 }
175 175
176 public bool RegionUp(SearializableRegionInfo region, ulong regionhandle) 176 public bool RegionUp(RegionUpData region, ulong regionhandle)
177 { 177 {
178 try 178 try
179 { 179 {
@@ -232,11 +232,11 @@ namespace OpenSim.Region.Communications.OGS1
232 } 232 }
233 } 233 }
234 234
235 public bool InformRegionOfPrimCrossing(ulong regionHandle, Guid primID, string objData) 235 public bool InformRegionOfPrimCrossing(ulong regionHandle, Guid primID, string objData, int XMLMethod)
236 { 236 {
237 try 237 try
238 { 238 {
239 return InterRegionSingleton.Instance.ExpectPrimCrossing(regionHandle, new LLUUID(primID), objData); 239 return InterRegionSingleton.Instance.ExpectPrimCrossing(regionHandle, new LLUUID(primID), objData, XMLMethod);
240 } 240 }
241 catch (RemotingException e) 241 catch (RemotingException e)
242 { 242 {