* Restarting regions with the estate tools works in sandbox mode. I'm still working on grid mode, however. It doesn't break anything, but that feature doesn't work in grid mode yet either.

1 files changed, 27 insertions, 6 deletions

diff --git a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
index 9a10c51..ae44acb 100644
--- a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
@@ -21,6 +21,7 @@ namespace OpenSim.Region.Environment.Scenes
         public event ExpectUserDelegate OnExpectUser;
         public event CloseAgentConnection OnCloseAgentConnection;
         public event PrimCrossing OnPrimCrossingIntoRegion;
+        public event RegionUp OnRegionUp;
         
 
         public SceneCommunicationService(CommunicationsManager commsMan)
@@ -38,6 +39,7 @@ namespace OpenSim.Region.Environment.Scenes
                 regionCommsHost.OnAvatarCrossingIntoRegion += AgentCrossing;
                 regionCommsHost.OnPrimCrossingIntoRegion += PrimCrossing;
                 regionCommsHost.OnCloseAgentConnection += CloseConnection;
+                regionCommsHost.OnRegionUp += newRegionUp;
                 
 
             }
@@ -45,12 +47,16 @@ namespace OpenSim.Region.Environment.Scenes
 
         public void Close()
         {
-            regionCommsHost.OnExpectUser -= NewUserConnection;
-            regionCommsHost.OnAvatarCrossingIntoRegion -= AgentCrossing;
-            regionCommsHost.OnPrimCrossingIntoRegion -= PrimCrossing;
-            regionCommsHost.OnCloseAgentConnection -= CloseConnection;
-            m_commsProvider.GridService.DeregisterRegion(m_regionInfo);
-            regionCommsHost = null;
+            if (regionCommsHost != null)
+            {
+                regionCommsHost.OnRegionUp -= newRegionUp;
+                regionCommsHost.OnExpectUser -= NewUserConnection;
+                regionCommsHost.OnAvatarCrossingIntoRegion -= AgentCrossing;
+                regionCommsHost.OnPrimCrossingIntoRegion -= PrimCrossing;
+                regionCommsHost.OnCloseAgentConnection -= CloseConnection;
+                m_commsProvider.GridService.DeregisterRegion(m_regionInfo);
+                regionCommsHost = null;
+            }
         }
 
         #region CommsManager Event handlers
@@ -59,6 +65,7 @@ namespace OpenSim.Region.Environment.Scenes
         /// </summary>
         /// <param name="regionHandle"></param>
         /// <param name="agent"></param>
+        ///
         protected void NewUserConnection(ulong regionHandle, AgentCircuitData agent)
         {
             if (OnExpectUser != null)
@@ -67,6 +74,15 @@ namespace OpenSim.Region.Environment.Scenes
             }
         }
 
+        protected bool newRegionUp(RegionInfo region)
+        {
+            if (OnRegionUp != null)
+            {
+                OnRegionUp(region);
+            }
+            return true;
+        }
+
         protected void AgentCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position, bool isFlying)
         {
             if (OnAvatarCrossingIntoRegion != null)
@@ -249,6 +265,11 @@ namespace OpenSim.Region.Environment.Scenes
             return m_commsProvider.InterRegion.ExpectAvatarCrossing(regionhandle, agentID, position, isFlying);
         }
 
+        public void InformNeighborsThatRegionisUp(RegionInfo region)
+        {
+            bool val = m_commsProvider.InterRegion.RegionUp(region);
+        }
+
         public bool PrimCrossToNeighboringRegion(ulong regionhandle, LLUUID primID, LLVector3 position, bool isPhysical)
         {
             return m_commsProvider.InterRegion.ExpectPrimCrossing(regionhandle, primID, position, isPhysical);