diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs index 4303fa8..91a808b 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs | |||
@@ -37,6 +37,7 @@ using OpenSim.Services.Connectors; | |||
37 | using OpenSim.Region.Framework.Interfaces; | 37 | using OpenSim.Region.Framework.Interfaces; |
38 | using OpenSim.Region.Framework.Scenes; | 38 | using OpenSim.Region.Framework.Scenes; |
39 | using OpenSim.Services.Interfaces; | 39 | using OpenSim.Services.Interfaces; |
40 | using GridRegion = OpenSim.Services.Interfaces.GridRegion; | ||
40 | 41 | ||
41 | namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | 42 | namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid |
42 | { | 43 | { |
@@ -129,7 +130,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
129 | 130 | ||
130 | #region IGridService | 131 | #region IGridService |
131 | 132 | ||
132 | public override bool RegisterRegion(UUID scopeID, SimpleRegionInfo regionInfo) | 133 | public override bool RegisterRegion(UUID scopeID, GridRegion regionInfo) |
133 | { | 134 | { |
134 | if (m_LocalGridService.RegisterRegion(scopeID, regionInfo)) | 135 | if (m_LocalGridService.RegisterRegion(scopeID, regionInfo)) |
135 | return base.RegisterRegion(scopeID, regionInfo); | 136 | return base.RegisterRegion(scopeID, regionInfo); |
@@ -147,27 +148,27 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
147 | 148 | ||
148 | // Let's not override GetNeighbours -- let's get them all from the grid server | 149 | // Let's not override GetNeighbours -- let's get them all from the grid server |
149 | 150 | ||
150 | public override SimpleRegionInfo GetRegionByUUID(UUID scopeID, UUID regionID) | 151 | public override GridRegion GetRegionByUUID(UUID scopeID, UUID regionID) |
151 | { | 152 | { |
152 | SimpleRegionInfo rinfo = m_LocalGridService.GetRegionByUUID(scopeID, regionID); | 153 | GridRegion rinfo = m_LocalGridService.GetRegionByUUID(scopeID, regionID); |
153 | if (rinfo == null) | 154 | if (rinfo == null) |
154 | rinfo = base.GetRegionByUUID(scopeID, regionID); | 155 | rinfo = base.GetRegionByUUID(scopeID, regionID); |
155 | 156 | ||
156 | return rinfo; | 157 | return rinfo; |
157 | } | 158 | } |
158 | 159 | ||
159 | public override SimpleRegionInfo GetRegionByPosition(UUID scopeID, int x, int y) | 160 | public override GridRegion GetRegionByPosition(UUID scopeID, int x, int y) |
160 | { | 161 | { |
161 | SimpleRegionInfo rinfo = m_LocalGridService.GetRegionByPosition(scopeID, x, y); | 162 | GridRegion rinfo = m_LocalGridService.GetRegionByPosition(scopeID, x, y); |
162 | if (rinfo == null) | 163 | if (rinfo == null) |
163 | rinfo = base.GetRegionByPosition(scopeID, x, y); | 164 | rinfo = base.GetRegionByPosition(scopeID, x, y); |
164 | 165 | ||
165 | return rinfo; | 166 | return rinfo; |
166 | } | 167 | } |
167 | 168 | ||
168 | public override SimpleRegionInfo GetRegionByName(UUID scopeID, string regionName) | 169 | public override GridRegion GetRegionByName(UUID scopeID, string regionName) |
169 | { | 170 | { |
170 | SimpleRegionInfo rinfo = m_LocalGridService.GetRegionByName(scopeID, regionName); | 171 | GridRegion rinfo = m_LocalGridService.GetRegionByName(scopeID, regionName); |
171 | if (rinfo == null) | 172 | if (rinfo == null) |
172 | rinfo = base.GetRegionByName(scopeID, regionName); | 173 | rinfo = base.GetRegionByName(scopeID, regionName); |
173 | 174 | ||