diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs index c1b7235..743d3b9 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs | |||
@@ -35,6 +35,7 @@ using OpenSim.Server.Base; | |||
35 | using OpenSim.Region.Framework.Interfaces; | 35 | using OpenSim.Region.Framework.Interfaces; |
36 | using OpenSim.Region.Framework.Scenes; | 36 | using OpenSim.Region.Framework.Scenes; |
37 | using OpenSim.Services.Interfaces; | 37 | using OpenSim.Services.Interfaces; |
38 | using GridRegion = OpenSim.Services.Interfaces.GridRegion; | ||
38 | using OpenMetaverse; | 39 | using OpenMetaverse; |
39 | 40 | ||
40 | namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | 41 | namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid |
@@ -56,6 +57,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
56 | 57 | ||
57 | public LocalGridServicesConnector(IConfigSource source) | 58 | public LocalGridServicesConnector(IConfigSource source) |
58 | { | 59 | { |
60 | m_log.Debug("[LOCAL GRID CONNECTOR]: LocalGridServicesConnector instantiated"); | ||
59 | InitialiseService(source); | 61 | InitialiseService(source); |
60 | } | 62 | } |
61 | 63 | ||
@@ -111,7 +113,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
111 | 113 | ||
112 | if (m_GridService == null) | 114 | if (m_GridService == null) |
113 | { | 115 | { |
114 | m_log.Error("[LOCAL GRID CONNECTOR]: Can't load asset service"); | 116 | m_log.Error("[LOCAL GRID CONNECTOR]: Can't load grid service"); |
115 | return; | 117 | return; |
116 | } | 118 | } |
117 | } | 119 | } |
@@ -144,7 +146,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
144 | 146 | ||
145 | #region IGridService | 147 | #region IGridService |
146 | 148 | ||
147 | public bool RegisterRegion(UUID scopeID, SimpleRegionInfo regionInfo) | 149 | public bool RegisterRegion(UUID scopeID, GridRegion regionInfo) |
148 | { | 150 | { |
149 | return m_GridService.RegisterRegion(scopeID, regionInfo); | 151 | return m_GridService.RegisterRegion(scopeID, regionInfo); |
150 | } | 152 | } |
@@ -154,32 +156,32 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
154 | return m_GridService.DeregisterRegion(regionID); | 156 | return m_GridService.DeregisterRegion(regionID); |
155 | } | 157 | } |
156 | 158 | ||
157 | public List<SimpleRegionInfo> GetNeighbours(UUID scopeID, UUID regionID) | 159 | public List<GridRegion> GetNeighbours(UUID scopeID, UUID regionID) |
158 | { | 160 | { |
159 | return m_GridService.GetNeighbours(scopeID, regionID); | 161 | return m_GridService.GetNeighbours(scopeID, regionID); |
160 | } | 162 | } |
161 | 163 | ||
162 | public SimpleRegionInfo GetRegionByUUID(UUID scopeID, UUID regionID) | 164 | public GridRegion GetRegionByUUID(UUID scopeID, UUID regionID) |
163 | { | 165 | { |
164 | return m_GridService.GetRegionByUUID(scopeID, regionID); | 166 | return m_GridService.GetRegionByUUID(scopeID, regionID); |
165 | } | 167 | } |
166 | 168 | ||
167 | public SimpleRegionInfo GetRegionByPosition(UUID scopeID, int x, int y) | 169 | public GridRegion GetRegionByPosition(UUID scopeID, int x, int y) |
168 | { | 170 | { |
169 | return m_GridService.GetRegionByPosition(scopeID, x, y); | 171 | return m_GridService.GetRegionByPosition(scopeID, x, y); |
170 | } | 172 | } |
171 | 173 | ||
172 | public SimpleRegionInfo GetRegionByName(UUID scopeID, string regionName) | 174 | public GridRegion GetRegionByName(UUID scopeID, string regionName) |
173 | { | 175 | { |
174 | return m_GridService.GetRegionByName(scopeID, regionName); | 176 | return m_GridService.GetRegionByName(scopeID, regionName); |
175 | } | 177 | } |
176 | 178 | ||
177 | public List<SimpleRegionInfo> GetRegionsByName(UUID scopeID, string name, int maxNumber) | 179 | public List<GridRegion> GetRegionsByName(UUID scopeID, string name, int maxNumber) |
178 | { | 180 | { |
179 | return m_GridService.GetRegionsByName(scopeID, name, maxNumber); | 181 | return m_GridService.GetRegionsByName(scopeID, name, maxNumber); |
180 | } | 182 | } |
181 | 183 | ||
182 | public List<SimpleRegionInfo> GetRegionRange(UUID scopeID, int xmin, int xmax, int ymin, int ymax) | 184 | public List<GridRegion> GetRegionRange(UUID scopeID, int xmin, int xmax, int ymin, int ymax) |
183 | { | 185 | { |
184 | return m_GridService.GetRegionRange(scopeID, xmin, xmax, ymin, ymax); | 186 | return m_GridService.GetRegionRange(scopeID, xmin, xmax, ymin, ymax); |
185 | } | 187 | } |