OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

another try on jenkins

LSLKeyTest
UbitUmarov 2016-07-30 23:56:54 +01:00
parent 78d9312fc8
commit 0509badcc1
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs
View File

@ -51,7 +51,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
private static string LogHeader = "[LOCAL GRID SERVICE CONNECTOR]"; private static string LogHeader = "[LOCAL GRID SERVICE CONNECTOR]";
private IGridService m_GridService; private IGridService m_GridService;
static private RegionInfoCache m_RegionInfoCache; private RegionInfoCache m_RegionInfoCache;
private bool m_Enabled; private bool m_Enabled;
@ -155,11 +155,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
scene.RegisterModuleInterface<IGridService>(this); scene.RegisterModuleInterface<IGridService>(this);
// tests seem not to init this correctly, so brute force // tests seem not to init this correctly, so brute force
if( m_RegionInfoCache == null) // if( m_RegionInfoCache == null)
m_RegionInfoCache = new RegionInfoCache(); // m_RegionInfoCache = new RegionInfoCache();
GridRegion r = new GridRegion(scene.RegionInfo); GridRegion r = new GridRegion(scene.RegionInfo);
m_RegionInfoCache.CacheLocal(r); m_RegionInfoCache.CacheLocal(r);

2
OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs
View File

@ -56,7 +56,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
private IGridService m_LocalGridService; private IGridService m_LocalGridService;
private IGridService m_RemoteGridService; private IGridService m_RemoteGridService;
static private RegionInfoCache m_RegionInfoCache; private RegionInfoCache m_RegionInfoCache;
public RemoteGridServicesConnector() public RemoteGridServicesConnector()
{ {