diff options
author | UbitUmarov | 2016-12-16 03:38:20 +0000 |
---|---|---|
committer | UbitUmarov | 2016-12-16 03:38:20 +0000 |
commit | e2d46c060c4b9557cf596d6d828ddd296fa0af70 (patch) | |
tree | c2c44730340c9785b9b373c937a2a54b2e6ec34e /OpenSim/Region/CoreModules/ServiceConnectorsOut | |
parent | reserve constant OBJECT_ATTACHED_SLOTS_AVAILABLE from mantis 8096. But do not... (diff) | |
download | opensim-SC_OLD-e2d46c060c4b9557cf596d6d828ddd296fa0af70.zip opensim-SC_OLD-e2d46c060c4b9557cf596d6d828ddd296fa0af70.tar.gz opensim-SC_OLD-e2d46c060c4b9557cf596d6d828ddd296fa0af70.tar.bz2 opensim-SC_OLD-e2d46c060c4b9557cf596d6d828ddd296fa0af70.tar.xz |
ok.. another try on the HG uri
Diffstat (limited to 'OpenSim/Region/CoreModules/ServiceConnectorsOut')
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs | 27 |
1 files changed, 24 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs index e6e3abb..f9ce5e1 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs | |||
@@ -227,11 +227,20 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
227 | return rinfo; | 227 | return rinfo; |
228 | } | 228 | } |
229 | 229 | ||
230 | public GridRegion GetRegionByName(UUID scopeID, string regionName) | 230 | public GridRegion GetRegionByName(UUID scopeID, string name) |
231 | { | 231 | { |
232 | GridRegion rinfo = m_LocalGridService.GetRegionByName(scopeID, regionName); | 232 | GridRegion rinfo = m_LocalGridService.GetRegionByName(scopeID, name); |
233 | if (rinfo != null) | 233 | if (rinfo != null) |
234 | return rinfo; | 234 | return rinfo; |
235 | |||
236 | // HG urls should not get here, strip them | ||
237 | string regionName = name; | ||
238 | if(name.Contains(".")) | ||
239 | { | ||
240 | string regionURI = ""; | ||
241 | if(!Util.buildHGRegionURI(name, out regionURI, out regionName)) | ||
242 | return rinfo; | ||
243 | } | ||
235 | 244 | ||
236 | rinfo = m_RemoteGridService.GetRegionByName(scopeID, regionName); | 245 | rinfo = m_RemoteGridService.GetRegionByName(scopeID, regionName); |
237 | m_RegionInfoCache.Cache(scopeID, rinfo); | 246 | m_RegionInfoCache.Cache(scopeID, rinfo); |
@@ -242,7 +251,19 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
242 | { | 251 | { |
243 | List<GridRegion> rinfo = m_LocalGridService.GetRegionsByName(scopeID, name, maxNumber); | 252 | List<GridRegion> rinfo = m_LocalGridService.GetRegionsByName(scopeID, name, maxNumber); |
244 | //m_log.DebugFormat("[REMOTE GRID CONNECTOR]: Local GetRegionsByName {0} found {1} regions", name, rinfo.Count); | 253 | //m_log.DebugFormat("[REMOTE GRID CONNECTOR]: Local GetRegionsByName {0} found {1} regions", name, rinfo.Count); |
245 | List<GridRegion> grinfo = m_RemoteGridService.GetRegionsByName(scopeID, name, maxNumber); | 254 | |
255 | // HG urls should not get here, strip them | ||
256 | // side effect is that local regions with same name as HG may also be found | ||
257 | // this mb good or bad | ||
258 | string regionName = name; | ||
259 | if(name.Contains(".")) | ||
260 | { | ||
261 | string regionURI = ""; | ||
262 | if(!Util.buildHGRegionURI(name, out regionURI, out regionName)) | ||
263 | return rinfo; | ||
264 | } | ||
265 | |||
266 | List<GridRegion> grinfo = m_RemoteGridService.GetRegionsByName(scopeID, regionName, maxNumber); | ||
246 | 267 | ||
247 | if (grinfo != null) | 268 | if (grinfo != null) |
248 | { | 269 | { |