aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authordiva2009-06-14 16:26:14 +0000
committerdiva2009-06-14 16:26:14 +0000
commita0b68178b854a250ae2fcf969499d7d07720bf2c (patch)
tree6ec55542242e791c4a6616855f7d5ebbd85e278a /OpenSim
parentAnd this one too... (diff)
downloadopensim-SC-a0b68178b854a250ae2fcf969499d7d07720bf2c.zip
opensim-SC-a0b68178b854a250ae2fcf969499d7d07720bf2c.tar.gz
opensim-SC-a0b68178b854a250ae2fcf969499d7d07720bf2c.tar.bz2
opensim-SC-a0b68178b854a250ae2fcf969499d7d07720bf2c.tar.xz
Bug fix in remote neighbour connector.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectors/Neighbour/LocalNeighbourServiceConnector.cs1
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectors/Neighbour/RemoteNeighourServiceConnector.cs4
-rw-r--r--OpenSim/Services/Connectors/Neighbour/NeighbourServiceConnector.cs2
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
86 86
87 public void AddRegion(Scene scene) 87 public void AddRegion(Scene scene)
88 { 88 {
89 // Always add
90 m_Scenes.Add(scene); 89 m_Scenes.Add(scene);
91 90
92 if (!m_Enabled) 91 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
113 if (!m_Enabled) 113 if (!m_Enabled)
114 return; 114 return;
115 115
116 m_MapService = scene.CommsManager.GridService;
117 m_LocalService.AddRegion(scene);
116 scene.RegisterModuleInterface<INeighbourService>(this); 118 scene.RegisterModuleInterface<INeighbourService>(this);
117 } 119 }
118 120
119 public void RemoveRegion(Scene scene) 121 public void RemoveRegion(Scene scene)
120 { 122 {
121 if (m_Enabled && m_Scenes.Contains(scene)) 123 if (m_Enabled && m_Scenes.Contains(scene))
122 m_Scenes.Remove(scene); 124 m_LocalService.RemoveRegion(scene);
123 } 125 }
124 126
125 public void RegionLoaded(Scene scene) 127 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
49 LogManager.GetLogger( 49 LogManager.GetLogger(
50 MethodBase.GetCurrentMethod().DeclaringType); 50 MethodBase.GetCurrentMethod().DeclaringType);
51 51
52 private IGridServices m_MapService = null; 52 protected IGridServices m_MapService = null;
53 53
54 public NeighbourServicesConnector() 54 public NeighbourServicesConnector()
55 { 55 {