Fixed an event in the events chain in inter-region communications.

As a consequence, restarting sims in the same process instance now shows them when they come back up in grid mode and standalone mode.

4 files changed, 6 insertions, 1 deletions

diff --git a/OpenSim/Framework/Communications/IGridServices.cs b/OpenSim/Framework/Communications/IGridServices.cs
index c1fb9c4..b67db89 100644
--- a/OpenSim/Framework/Communications/IGridServices.cs
+++ b/OpenSim/Framework/Communications/IGridServices.cs
@@ -32,6 +32,7 @@ namespace OpenSim.Framework.Communications
 {
     public interface IGridServices
     {
+        string gdebugRegionName { get; set; }
         RegionCommsListener RegisterRegion(RegionInfo regionInfos);
         bool DeregisterRegion(RegionInfo regionInfo);
         List<SimpleRegionInfo> RequestNeighbours(uint x, uint y);
diff --git a/OpenSim/Framework/Communications/IInterRegionCommunications.cs b/OpenSim/Framework/Communications/IInterRegionCommunications.cs
index c64abb5..55616a4 100644
--- a/OpenSim/Framework/Communications/IInterRegionCommunications.cs
+++ b/OpenSim/Framework/Communications/IInterRegionCommunications.cs
@@ -31,6 +31,8 @@ namespace OpenSim.Framework.Communications
 {
     public interface IInterRegionCommunications
     {
+        
+        string rdebugRegionName{ get; set; }
         bool InformRegionOfChildAgent(ulong regionHandle, AgentCircuitData agentData);
         bool InformRegionOfPrimCrossing(ulong regionHandle, LLUUID primID, string objData);
         bool RegionUp(RegionInfo region);
diff --git a/OpenSim/Framework/RegionCommsListener.cs b/OpenSim/Framework/RegionCommsListener.cs
index 449c073..d209ff4 100644
--- a/OpenSim/Framework/RegionCommsListener.cs
+++ b/OpenSim/Framework/RegionCommsListener.cs
@@ -43,6 +43,7 @@ namespace OpenSim.Framework
         public event AcknowledgePrimCross OnAcknowledgePrimCrossed;
         public event CloseAgentConnection OnCloseAgentConnection;
         public event RegionUp OnRegionUp;
+        public string debugRegionName="";
         
 
         /// <summary>
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index 75923ee..c604d53 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -39,6 +39,7 @@ using OpenSim.Framework;
 
 namespace OpenSim.Framework
 {
+    [Serializable]
     public class SimpleRegionInfo
     {
         public SimpleRegionInfo()
@@ -183,7 +184,7 @@ namespace OpenSim.Framework
             }
         }
     }
-
+    [Serializable]
     public class RegionInfo : SimpleRegionInfo
     {
         public string RegionName = "";