diff options
Diffstat (limited to 'OpenSim/Services/GridService/HypergridLinker.cs')
-rw-r--r-- | OpenSim/Services/GridService/HypergridLinker.cs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Services/GridService/HypergridLinker.cs b/OpenSim/Services/GridService/HypergridLinker.cs index aa394ce..dabfd3b 100644 --- a/OpenSim/Services/GridService/HypergridLinker.cs +++ b/OpenSim/Services/GridService/HypergridLinker.cs | |||
@@ -196,7 +196,7 @@ namespace OpenSim.Services.GridService | |||
196 | { | 196 | { |
197 | return TryLinkRegionToCoords(scopeID, mapName, xloc, yloc, UUID.Zero, out reason); | 197 | return TryLinkRegionToCoords(scopeID, mapName, xloc, yloc, UUID.Zero, out reason); |
198 | } | 198 | } |
199 | 199 | ||
200 | public bool IsLocalGrid(string serverURI) | 200 | public bool IsLocalGrid(string serverURI) |
201 | { | 201 | { |
202 | return serverURI == m_ThisGatekeeper; | 202 | return serverURI == m_ThisGatekeeper; |
@@ -240,7 +240,7 @@ namespace OpenSim.Services.GridService | |||
240 | 240 | ||
241 | private bool TryCreateLinkImpl(UUID scopeID, int xloc, int yloc, string remoteRegionName, uint externalPort, string externalHostName, string serverURI, UUID ownerID, out GridRegion regInfo, out string reason) | 241 | private bool TryCreateLinkImpl(UUID scopeID, int xloc, int yloc, string remoteRegionName, uint externalPort, string externalHostName, string serverURI, UUID ownerID, out GridRegion regInfo, out string reason) |
242 | { | 242 | { |
243 | m_log.InfoFormat("[HYPERGRID LINKER]: Link to {0} {1}, in <{2},{3}>", | 243 | m_log.InfoFormat("[HYPERGRID LINKER]: Link to {0} {1}, in <{2},{3}>", |
244 | ((serverURI == null) ? (externalHostName + ":" + externalPort) : serverURI), | 244 | ((serverURI == null) ? (externalHostName + ":" + externalPort) : serverURI), |
245 | remoteRegionName, Util.WorldToRegionLoc((uint)xloc), Util.WorldToRegionLoc((uint)yloc)); | 245 | remoteRegionName, Util.WorldToRegionLoc((uint)xloc), Util.WorldToRegionLoc((uint)yloc)); |
246 | 246 | ||
@@ -270,7 +270,7 @@ namespace OpenSim.Services.GridService | |||
270 | 270 | ||
271 | if (remoteRegionName != string.Empty) | 271 | if (remoteRegionName != string.Empty) |
272 | regInfo.RegionName = remoteRegionName; | 272 | regInfo.RegionName = remoteRegionName; |
273 | 273 | ||
274 | regInfo.RegionLocX = xloc; | 274 | regInfo.RegionLocX = xloc; |
275 | regInfo.RegionLocY = yloc; | 275 | regInfo.RegionLocY = yloc; |
276 | regInfo.ScopeID = scopeID; | 276 | regInfo.ScopeID = scopeID; |
@@ -359,7 +359,7 @@ namespace OpenSim.Services.GridService | |||
359 | regInfo.RegionName = externalName; | 359 | regInfo.RegionName = externalName; |
360 | 360 | ||
361 | m_log.DebugFormat("[HYPERGRID LINKER]: naming linked region {0}, handle {1}", regInfo.RegionName, handle.ToString()); | 361 | m_log.DebugFormat("[HYPERGRID LINKER]: naming linked region {0}, handle {1}", regInfo.RegionName, handle.ToString()); |
362 | 362 | ||
363 | // Get the map image | 363 | // Get the map image |
364 | regInfo.TerrainImage = GetMapImage(regionID, imageURL); | 364 | regInfo.TerrainImage = GetMapImage(regionID, imageURL); |
365 | 365 | ||
@@ -383,7 +383,7 @@ namespace OpenSim.Services.GridService | |||
383 | OpenSim.Framework.RegionFlags rflags = (OpenSim.Framework.RegionFlags)Convert.ToInt32(regions[0].Data["flags"]); | 383 | OpenSim.Framework.RegionFlags rflags = (OpenSim.Framework.RegionFlags)Convert.ToInt32(regions[0].Data["flags"]); |
384 | if ((rflags & OpenSim.Framework.RegionFlags.Hyperlink) != 0) | 384 | if ((rflags & OpenSim.Framework.RegionFlags.Hyperlink) != 0) |
385 | { | 385 | { |
386 | regInfo = new GridRegion(); | 386 | regInfo = new GridRegion(); |
387 | regInfo.RegionID = regions[0].RegionID; | 387 | regInfo.RegionID = regions[0].RegionID; |
388 | regInfo.ScopeID = m_ScopeID; | 388 | regInfo.ScopeID = m_ScopeID; |
389 | } | 389 | } |
@@ -491,7 +491,7 @@ namespace OpenSim.Services.GridService | |||
491 | { | 491 | { |
492 | MainConsole.Instance.Output( | 492 | MainConsole.Instance.Output( |
493 | String.Format("{0}\n{2,-32} {1}\n", | 493 | String.Format("{0}\n{2,-32} {1}\n", |
494 | r.RegionName, r.RegionID, | 494 | r.RegionName, r.RegionID, |
495 | String.Format("{0},{1} ({2},{3})", r.posX, r.posY, | 495 | String.Format("{0},{1} ({2},{3})", r.posX, r.posY, |
496 | Util.WorldToRegionLoc((uint)r.posX), Util.WorldToRegionLoc((uint)r.posY) | 496 | Util.WorldToRegionLoc((uint)r.posX), Util.WorldToRegionLoc((uint)r.posY) |
497 | ) | 497 | ) |
@@ -515,7 +515,7 @@ namespace OpenSim.Services.GridService | |||
515 | RunHGCommand(command, cmdparams); | 515 | RunHGCommand(command, cmdparams); |
516 | 516 | ||
517 | } | 517 | } |
518 | 518 | ||
519 | private void RunLinkRegionCommand(string[] cmdparams) | 519 | private void RunLinkRegionCommand(string[] cmdparams) |
520 | { | 520 | { |
521 | int xloc, yloc; | 521 | int xloc, yloc; |
@@ -573,7 +573,7 @@ namespace OpenSim.Services.GridService | |||
573 | if (cmdparams[2].StartsWith("http")) | 573 | if (cmdparams[2].StartsWith("http")) |
574 | { | 574 | { |
575 | RunLinkRegionCommand(cmdparams); | 575 | RunLinkRegionCommand(cmdparams); |
576 | } | 576 | } |
577 | else if (cmdparams[2].Contains(":")) | 577 | else if (cmdparams[2].Contains(":")) |
578 | { | 578 | { |
579 | // New format | 579 | // New format |