diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs index 391e7c8..2c234d2 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs | |||
@@ -188,9 +188,26 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
188 | return rinfo; | 188 | return rinfo; |
189 | } | 189 | } |
190 | 190 | ||
191 | // Let's not override GetRegionsByName -- let's get them all from the grid server | 191 | public override List<GridRegion> GetRegionsByName(UUID scopeID, string name, int maxNumber) |
192 | { | ||
193 | List<GridRegion> rinfo = m_LocalGridService.GetRegionsByName(scopeID, name, maxNumber); | ||
194 | List<GridRegion> grinfo = base.GetRegionsByName(scopeID, name, maxNumber); | ||
195 | |||
196 | if (grinfo != null) | ||
197 | rinfo.AddRange(grinfo); | ||
198 | return rinfo; | ||
199 | } | ||
200 | |||
192 | // Let's not override GetRegionRange -- let's get them all from the grid server | 201 | // Let's not override GetRegionRange -- let's get them all from the grid server |
193 | 202 | ||
203 | public override int GetRegionFlags(UUID scopeID, UUID regionID) | ||
204 | { | ||
205 | int flags = m_LocalGridService.GetRegionFlags(scopeID, regionID); | ||
206 | if (flags == -1) | ||
207 | flags = base.GetRegionFlags(scopeID, regionID); | ||
208 | |||
209 | return flags; | ||
210 | } | ||
194 | #endregion | 211 | #endregion |
195 | } | 212 | } |
196 | } | 213 | } |