diff options
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Services/GridService/HypergridLinker.cs | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/OpenSim/Services/GridService/HypergridLinker.cs b/OpenSim/Services/GridService/HypergridLinker.cs index bf52660..8a60264 100644 --- a/OpenSim/Services/GridService/HypergridLinker.cs +++ b/OpenSim/Services/GridService/HypergridLinker.cs | |||
@@ -68,10 +68,6 @@ namespace OpenSim.Services.GridService | |||
68 | protected string m_ThisGatekeeper = string.Empty; | 68 | protected string m_ThisGatekeeper = string.Empty; |
69 | protected Uri m_ThisGatekeeperURI = null; | 69 | protected Uri m_ThisGatekeeperURI = null; |
70 | 70 | ||
71 | // Hyperlink regions are hyperlinks on the map | ||
72 | public readonly Dictionary<UUID, GridRegion> m_HyperlinkRegions = new Dictionary<UUID, GridRegion>(); | ||
73 | protected Dictionary<UUID, ulong> m_HyperlinkHandles = new Dictionary<UUID, ulong>(); | ||
74 | |||
75 | protected GridRegion m_DefaultRegion; | 71 | protected GridRegion m_DefaultRegion; |
76 | protected GridRegion DefaultRegion | 72 | protected GridRegion DefaultRegion |
77 | { | 73 | { |
@@ -409,7 +405,7 @@ namespace OpenSim.Services.GridService | |||
409 | // Store the origin's coordinates somewhere | 405 | // Store the origin's coordinates somewhere |
410 | regInfo.RegionSecret = handle.ToString(); | 406 | regInfo.RegionSecret = handle.ToString(); |
411 | 407 | ||
412 | AddHyperlinkRegion(regInfo, handle); | 408 | AddHyperlinkRegion(ref regInfo, handle); |
413 | m_log.InfoFormat("[HYPERGRID LINKER]: Successfully linked to region {0} with image {1}", regInfo.RegionName, regInfo.TerrainImage); | 409 | m_log.InfoFormat("[HYPERGRID LINKER]: Successfully linked to region {0} with image {1}", regInfo.RegionName, regInfo.TerrainImage); |
414 | return true; | 410 | return true; |
415 | } | 411 | } |
@@ -489,11 +485,11 @@ namespace OpenSim.Services.GridService | |||
489 | // return true; | 485 | // return true; |
490 | // } | 486 | // } |
491 | 487 | ||
492 | private void AddHyperlinkRegion(GridRegion regionInfo, ulong regionHandle) | 488 | private void AddHyperlinkRegion(ref GridRegion regionInfo, ulong regionHandle) |
493 | { | 489 | { |
494 | RegionData rdata = m_GridService.RegionInfo2RegionData(regionInfo); | 490 | RegionData rdata = m_GridService.RegionInfo2RegionData(regionInfo); |
495 | int flags = (int)OpenSim.Framework.RegionFlags.Hyperlink + (int)OpenSim.Framework.RegionFlags.NoDirectLogin + (int)OpenSim.Framework.RegionFlags.RegionOnline; | 491 | regionInfo.Flags = OpenSim.Framework.RegionFlags.Hyperlink | OpenSim.Framework.RegionFlags.NoDirectLogin | OpenSim.Framework.RegionFlags.RegionOnline; |
496 | rdata.Data["flags"] = flags.ToString(); | 492 | rdata.Data["flags"] = ((int)regionInfo.Flags).ToString(); |
497 | 493 | ||
498 | m_Database.Store(rdata); | 494 | m_Database.Store(rdata); |
499 | } | 495 | } |