aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs16
1 files changed, 11 insertions, 5 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
index 7653bf4..db2327e 100644
--- a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
@@ -168,12 +168,16 @@ namespace OpenSim.Region.Environment.Scenes
168 } 168 }
169 } 169 }
170 170
171 protected void IncomingPrimCrossing(ulong regionHandle, LLUUID primID, String objXMLData) 171 protected bool IncomingPrimCrossing(ulong regionHandle, LLUUID primID, String objXMLData, int XMLMethod)
172 { 172 {
173 handlerExpectPrim = OnExpectPrim; 173 handlerExpectPrim = OnExpectPrim;
174 if (handlerExpectPrim != null) 174 if (handlerExpectPrim != null)
175 { 175 {
176 handlerExpectPrim(regionHandle, primID, objXMLData); 176 return handlerExpectPrim(regionHandle, primID, objXMLData, XMLMethod);
177 }
178 else
179 {
180 return false;
177 } 181 }
178 182
179 } 183 }
@@ -342,8 +346,10 @@ namespace OpenSim.Region.Environment.Scenes
342 private void InformNeighboursThatRegionIsUpAsync(RegionInfo region, ulong regionhandle) 346 private void InformNeighboursThatRegionIsUpAsync(RegionInfo region, ulong regionhandle)
343 { 347 {
344 m_log.Info("[INTERGRID]: Starting to inform neighbors that I'm here"); 348 m_log.Info("[INTERGRID]: Starting to inform neighbors that I'm here");
349 //RegionUpData regiondata = new RegionUpData(region.RegionLocX, region.RegionLocY, region.ExternalHostName, region.InternalEndPoint.Port);
350
345 bool regionAccepted = 351 bool regionAccepted =
346 m_commsProvider.InterRegion.RegionUp((new SearializableRegionInfo(region)), regionhandle); 352 m_commsProvider.InterRegion.RegionUp(new SearializableRegionInfo(region), regionhandle);
347 353
348 if (regionAccepted) 354 if (regionAccepted)
349 { 355 {
@@ -605,9 +611,9 @@ namespace OpenSim.Region.Environment.Scenes
605 return m_commsProvider.InterRegion.ExpectAvatarCrossing(regionhandle, agentID, position, isFlying); 611 return m_commsProvider.InterRegion.ExpectAvatarCrossing(regionhandle, agentID, position, isFlying);
606 } 612 }
607 613
608 public bool PrimCrossToNeighboringRegion(ulong regionhandle, LLUUID primID, string objData) 614 public bool PrimCrossToNeighboringRegion(ulong regionhandle, LLUUID primID, string objData, int XMLMethod)
609 { 615 {
610 return m_commsProvider.InterRegion.InformRegionOfPrimCrossing(regionhandle, primID, objData); 616 return m_commsProvider.InterRegion.InformRegionOfPrimCrossing(regionhandle, primID, objData, XMLMethod);
611 } 617 }
612 618
613 619