3 files changed, 4 insertions, 3 deletions

diff --git a/OpenSim/Region/CoreModules/ServiceConnectors/Neighbour/LocalNeighbourServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectors/Neighbour/LocalNeighbourServiceConnector.cs
index 7f6186c..cfebba3 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectors/Neighbour/LocalNeighbourServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectors/Neighbour/LocalNeighbourServiceConnector.cs
@@ -86,7 +86,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectors.Neighbour
 

         public void AddRegion(Scene scene)

         {

-            // Always add

             m_Scenes.Add(scene);

 

             if (!m_Enabled)

diff --git a/OpenSim/Region/CoreModules/ServiceConnectors/Neighbour/RemoteNeighourServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectors/Neighbour/RemoteNeighourServiceConnector.cs
index b0bd428..8ea4ca7 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectors/Neighbour/RemoteNeighourServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectors/Neighbour/RemoteNeighourServiceConnector.cs
@@ -113,13 +113,15 @@ namespace OpenSim.Region.CoreModules.ServiceConnectors.Neighbour
             if (!m_Enabled)

                 return;

 

+            m_MapService = scene.CommsManager.GridService;

+            m_LocalService.AddRegion(scene);

             scene.RegisterModuleInterface<INeighbourService>(this);

         }

 

         public void RemoveRegion(Scene scene)

         {

             if (m_Enabled && m_Scenes.Contains(scene))

-                m_Scenes.Remove(scene);

+                m_LocalService.RemoveRegion(scene);

         }

 

         public void RegionLoaded(Scene scene)

diff --git a/OpenSim/Services/Connectors/Neighbour/NeighbourServiceConnector.cs b/OpenSim/Services/Connectors/Neighbour/NeighbourServiceConnector.cs
index d6f5fe9..26f606d 100644
--- a/OpenSim/Services/Connectors/Neighbour/NeighbourServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Neighbour/NeighbourServiceConnector.cs
@@ -49,7 +49,7 @@ namespace OpenSim.Services.Connectors
                 LogManager.GetLogger(

                 MethodBase.GetCurrentMethod().DeclaringType);

 

-        private IGridServices m_MapService = null;

+        protected IGridServices m_MapService = null;

 

         public NeighbourServicesConnector()

         {