From b7d596a6af51bea7dba642cdc768ac5ff77af5f3 Mon Sep 17 00:00:00 2001 From: Teravus Ovares Date: Wed, 28 Nov 2007 06:18:07 +0000 Subject: * Restaring the sim works fine in grid mode now. Sims announce themselves to their neighbors when they start up. Neighbors get this message and tell their agents that there's a new sim up. * Certain unrecoverable physics based crashes in ODE are now hooked up to the 'restart the sim' routine. --- OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 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 aa6f59a..2f7e591 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 (RegionInfo region); + public delegate bool RegionUp (SearializableRegionInfo region); public sealed class InterRegionSingleton { @@ -76,11 +76,12 @@ namespace OpenSim.Region.Communications.OGS1 return false; } - public bool RegionUp(RegionInfo region) + public bool RegionUp(SearializableRegionInfo sregion) { + if (OnRegionUp != null) { - return OnRegionUp(region); + return OnRegionUp(sregion); } return false; } @@ -129,7 +130,7 @@ namespace OpenSim.Region.Communications.OGS1 return false; } } - public bool RegionUp(RegionInfo region) + public bool RegionUp(SearializableRegionInfo region) { try { @@ -141,6 +142,7 @@ namespace OpenSim.Region.Communications.OGS1 return false; } } + public bool ExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position, bool isFlying) { try -- cgit v1.1