From 0d898d8d8a4dc5920dd17fbfd4f596da474862a6 Mon Sep 17 00:00:00 2001 From: Oren Hurvitz Date: Thu, 24 Apr 2014 19:08:50 +0300 Subject: [PATCH] Revert "When linking a Hypergrid region, set the region's flags on the in-memory GridRegion immediately." This reverts commit 463d0b2f8f0cd5f02c14391b763680b23c16e438. --- OpenSim/Services/GridService/HypergridLinker.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/OpenSim/Services/GridService/HypergridLinker.cs b/OpenSim/Services/GridService/HypergridLinker.cs index 8a60264e80..c6d2ee32ca 100644 --- a/OpenSim/Services/GridService/HypergridLinker.cs +++ b/OpenSim/Services/GridService/HypergridLinker.cs @@ -405,7 +405,7 @@ namespace OpenSim.Services.GridService // Store the origin's coordinates somewhere regInfo.RegionSecret = handle.ToString(); - AddHyperlinkRegion(ref regInfo, handle); + AddHyperlinkRegion(regInfo, handle); m_log.InfoFormat("[HYPERGRID LINKER]: Successfully linked to region {0} with image {1}", regInfo.RegionName, regInfo.TerrainImage); return true; } @@ -485,11 +485,11 @@ namespace OpenSim.Services.GridService // return true; // } - private void AddHyperlinkRegion(ref GridRegion regionInfo, ulong regionHandle) + private void AddHyperlinkRegion(GridRegion regionInfo, ulong regionHandle) { RegionData rdata = m_GridService.RegionInfo2RegionData(regionInfo); - regionInfo.Flags = OpenSim.Framework.RegionFlags.Hyperlink | OpenSim.Framework.RegionFlags.NoDirectLogin | OpenSim.Framework.RegionFlags.RegionOnline; - rdata.Data["flags"] = ((int)regionInfo.Flags).ToString(); + int flags = (int)OpenSim.Framework.RegionFlags.Hyperlink + (int)OpenSim.Framework.RegionFlags.NoDirectLogin + (int)OpenSim.Framework.RegionFlags.RegionOnline; + rdata.Data["flags"] = flags.ToString(); m_Database.Store(rdata); }