From 908b5e852667cd8e7cef71dd83ed89db9aa50e0f Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Tue, 2 Aug 2016 01:37:47 +0100 Subject: revert that and actually don't loose the estates :) --- OpenSim/Services/Connectors/Estate/EstateDataConnector.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'OpenSim/Services/Connectors') diff --git a/OpenSim/Services/Connectors/Estate/EstateDataConnector.cs b/OpenSim/Services/Connectors/Estate/EstateDataConnector.cs index eed25cc..74935f3 100644 --- a/OpenSim/Services/Connectors/Estate/EstateDataConnector.cs +++ b/OpenSim/Services/Connectors/Estate/EstateDataConnector.cs @@ -119,8 +119,8 @@ namespace OpenSim.Services.Connectors List eids = new List(); // If we don't have them, load them from the server List estates = null; - if (!m_EstateCache.TryGetValue("estates", out estates) || estates == null) - LoadEstateSettingsAll(); + if (!m_EstateCache.TryGetValue("estates", out estates)) + estates = LoadEstateSettingsAll(); foreach (EstateSettings es in estates) eids.Add((int)es.EstateID); @@ -132,8 +132,8 @@ namespace OpenSim.Services.Connectors { // If we don't have them, load them from the server List estates = null; - if (!m_EstateCache.TryGetValue("estates", out estates) || estates == null) - LoadEstateSettingsAll(); + if (!m_EstateCache.TryGetValue("estates", out estates)) + estates = LoadEstateSettingsAll(); List eids = new List(); foreach (EstateSettings es in estates) @@ -147,8 +147,8 @@ namespace OpenSim.Services.Connectors { // If we don't have them, load them from the server List estates = null; - if (!m_EstateCache.TryGetValue("estates", out estates) || estates == null) - LoadEstateSettingsAll(); + if (!m_EstateCache.TryGetValue("estates", out estates)) + estates = LoadEstateSettingsAll(); List eids = new List(); foreach (EstateSettings es in estates) -- cgit v1.1