diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs index 6c2928a..3ca4882 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs | |||
@@ -149,7 +149,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
149 | m_log.ErrorFormat("[LOCAL GRID CONNECTOR]: simulator seems to have more than one region with the same UUID. Please correct this!"); | 149 | m_log.ErrorFormat("[LOCAL GRID CONNECTOR]: simulator seems to have more than one region with the same UUID. Please correct this!"); |
150 | else | 150 | else |
151 | m_LocalCache.Add(scene.RegionInfo.RegionID, new RegionCache(scene)); | 151 | m_LocalCache.Add(scene.RegionInfo.RegionID, new RegionCache(scene)); |
152 | |||
153 | } | 152 | } |
154 | } | 153 | } |
155 | 154 | ||
@@ -184,7 +183,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
184 | { | 183 | { |
185 | if (m_LocalCache.ContainsKey(regionID)) | 184 | if (m_LocalCache.ContainsKey(regionID)) |
186 | { | 185 | { |
187 | return m_LocalCache[regionID].GetNeighbours(); | 186 | List<GridRegion> neighbours = m_LocalCache[regionID].GetNeighbours(); |
187 | if (neighbours.Count == 0) | ||
188 | // try the DB | ||
189 | neighbours = m_GridService.GetNeighbours(scopeID, regionID); | ||
190 | return neighbours; | ||
188 | } | 191 | } |
189 | else | 192 | else |
190 | { | 193 | { |