From 0509badcc164a3850935682e452ce99491d0f006 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Sat, 30 Jul 2016 23:56:54 +0100 Subject: [PATCH] another try on jenkins --- .../Grid/LocalGridServiceConnector.cs | 8 +++----- .../Grid/RemoteGridServiceConnector.cs | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs index bf211ce7e5..95a4f66241 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs @@ -51,7 +51,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid private static string LogHeader = "[LOCAL GRID SERVICE CONNECTOR]"; private IGridService m_GridService; - static private RegionInfoCache m_RegionInfoCache; + private RegionInfoCache m_RegionInfoCache; private bool m_Enabled; @@ -155,11 +155,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid scene.RegisterModuleInterface(this); - - // tests seem not to init this correctly, so brute force - if( m_RegionInfoCache == null) - m_RegionInfoCache = new RegionInfoCache(); +// if( m_RegionInfoCache == null) +// m_RegionInfoCache = new RegionInfoCache(); GridRegion r = new GridRegion(scene.RegionInfo); m_RegionInfoCache.CacheLocal(r); diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs index 077eb979ce..96ff4b3bc4 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs @@ -56,7 +56,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid private IGridService m_LocalGridService; private IGridService m_RemoteGridService; - static private RegionInfoCache m_RegionInfoCache; + private RegionInfoCache m_RegionInfoCache; public RemoteGridServicesConnector() {