diff options
author | Oren Hurvitz | 2014-04-24 19:08:50 +0300 |
---|---|---|
committer | Oren Hurvitz | 2014-04-24 19:08:50 +0300 |
commit | 0d898d8d8a4dc5920dd17fbfd4f596da474862a6 (patch) | |
tree | 8918e6d05b97280c04483d0a670bd4fcf607f6ad | |
parent | When linking a Hypergrid region, set the region's flags on the in-memory Grid... (diff) | |
download | opensim-SC_OLD-0d898d8d8a4dc5920dd17fbfd4f596da474862a6.zip opensim-SC_OLD-0d898d8d8a4dc5920dd17fbfd4f596da474862a6.tar.gz opensim-SC_OLD-0d898d8d8a4dc5920dd17fbfd4f596da474862a6.tar.bz2 opensim-SC_OLD-0d898d8d8a4dc5920dd17fbfd4f596da474862a6.tar.xz |
Revert "When linking a Hypergrid region, set the region's flags on the in-memory GridRegion immediately."
This reverts commit 463d0b2f8f0cd5f02c14391b763680b23c16e438.
-rw-r--r-- | OpenSim/Services/GridService/HypergridLinker.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Services/GridService/HypergridLinker.cs b/OpenSim/Services/GridService/HypergridLinker.cs index 8a60264..c6d2ee3 100644 --- a/OpenSim/Services/GridService/HypergridLinker.cs +++ b/OpenSim/Services/GridService/HypergridLinker.cs | |||
@@ -405,7 +405,7 @@ namespace OpenSim.Services.GridService | |||
405 | // Store the origin's coordinates somewhere | 405 | // Store the origin's coordinates somewhere |
406 | regInfo.RegionSecret = handle.ToString(); | 406 | regInfo.RegionSecret = handle.ToString(); |
407 | 407 | ||
408 | AddHyperlinkRegion(ref regInfo, handle); | 408 | AddHyperlinkRegion(regInfo, handle); |
409 | 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); |
410 | return true; | 410 | return true; |
411 | } | 411 | } |
@@ -485,11 +485,11 @@ namespace OpenSim.Services.GridService | |||
485 | // return true; | 485 | // return true; |
486 | // } | 486 | // } |
487 | 487 | ||
488 | private void AddHyperlinkRegion(ref GridRegion regionInfo, ulong regionHandle) | 488 | private void AddHyperlinkRegion(GridRegion regionInfo, ulong regionHandle) |
489 | { | 489 | { |
490 | RegionData rdata = m_GridService.RegionInfo2RegionData(regionInfo); | 490 | RegionData rdata = m_GridService.RegionInfo2RegionData(regionInfo); |
491 | regionInfo.Flags = OpenSim.Framework.RegionFlags.Hyperlink | OpenSim.Framework.RegionFlags.NoDirectLogin | OpenSim.Framework.RegionFlags.RegionOnline; | 491 | int flags = (int)OpenSim.Framework.RegionFlags.Hyperlink + (int)OpenSim.Framework.RegionFlags.NoDirectLogin + (int)OpenSim.Framework.RegionFlags.RegionOnline; |
492 | rdata.Data["flags"] = ((int)regionInfo.Flags).ToString(); | 492 | rdata.Data["flags"] = flags.ToString(); |
493 | 493 | ||
494 | m_Database.Store(rdata); | 494 | m_Database.Store(rdata); |
495 | } | 495 | } |