From 81ba94fde8871df86e304a3dad7846059fd32045 Mon Sep 17 00:00:00 2001 From: Teravus Ovares Date: Thu, 29 Nov 2007 02:07:19 +0000 Subject: * Fixed about 7 issues with restarting sims and resolved interRegion comms issues. This includes the issue that MW described this morning. There's a lot of little nit picky changes that make a world of difference. --- OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs') diff --git a/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs b/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs index 2f7e591..d55528c 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs @@ -41,7 +41,7 @@ namespace OpenSim.Region.Communications.OGS1 public delegate bool PrimGroupArrival(ulong regionHandle, LLUUID primID, string objData); - public delegate bool RegionUp (SearializableRegionInfo region); + public delegate bool RegionUp (SearializableRegionInfo region, ulong regionhandle); public sealed class InterRegionSingleton { @@ -76,12 +76,12 @@ namespace OpenSim.Region.Communications.OGS1 return false; } - public bool RegionUp(SearializableRegionInfo sregion) + public bool RegionUp(SearializableRegionInfo sregion, ulong regionhandle) { if (OnRegionUp != null) { - return OnRegionUp(sregion); + return OnRegionUp(sregion, regionhandle); } return false; } @@ -130,11 +130,11 @@ namespace OpenSim.Region.Communications.OGS1 return false; } } - public bool RegionUp(SearializableRegionInfo region) + public bool RegionUp(SearializableRegionInfo region, ulong regionhandle) { try { - return InterRegionSingleton.Instance.RegionUp(region); + return InterRegionSingleton.Instance.RegionUp(region, regionhandle); } catch (RemotingException e) { -- cgit v1.1