diff options
author | UbitUmarov | 2016-07-30 23:56:54 +0100 |
---|---|---|
committer | UbitUmarov | 2016-07-30 23:56:54 +0100 |
commit | 0509badcc164a3850935682e452ce99491d0f006 (patch) | |
tree | 2d707522ed567734b37095d356626325009f3052 /OpenSim/Region/CoreModules/ServiceConnectorsOut | |
parent | move some code back to AddRegion because some tests dont issue RegionLoaded (diff) | |
download | opensim-SC_OLD-0509badcc164a3850935682e452ce99491d0f006.zip opensim-SC_OLD-0509badcc164a3850935682e452ce99491d0f006.tar.gz opensim-SC_OLD-0509badcc164a3850935682e452ce99491d0f006.tar.bz2 opensim-SC_OLD-0509badcc164a3850935682e452ce99491d0f006.tar.xz |
another try on jenkins
Diffstat (limited to 'OpenSim/Region/CoreModules/ServiceConnectorsOut')
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs | 8 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/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 bf211ce..95a4f66 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 | |||
51 | private static string LogHeader = "[LOCAL GRID SERVICE CONNECTOR]"; | 51 | private static string LogHeader = "[LOCAL GRID SERVICE CONNECTOR]"; |
52 | 52 | ||
53 | private IGridService m_GridService; | 53 | private IGridService m_GridService; |
54 | static private RegionInfoCache m_RegionInfoCache; | 54 | private RegionInfoCache m_RegionInfoCache; |
55 | 55 | ||
56 | private bool m_Enabled; | 56 | private bool m_Enabled; |
57 | 57 | ||
@@ -155,11 +155,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
155 | 155 | ||
156 | scene.RegisterModuleInterface<IGridService>(this); | 156 | scene.RegisterModuleInterface<IGridService>(this); |
157 | 157 | ||
158 | |||
159 | |||
160 | // tests seem not to init this correctly, so brute force | 158 | // tests seem not to init this correctly, so brute force |
161 | if( m_RegionInfoCache == null) | 159 | // if( m_RegionInfoCache == null) |
162 | m_RegionInfoCache = new RegionInfoCache(); | 160 | // m_RegionInfoCache = new RegionInfoCache(); |
163 | 161 | ||
164 | GridRegion r = new GridRegion(scene.RegionInfo); | 162 | GridRegion r = new GridRegion(scene.RegionInfo); |
165 | m_RegionInfoCache.CacheLocal(r); | 163 | m_RegionInfoCache.CacheLocal(r); |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs index 077eb97..96ff4b3 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 | |||
56 | private IGridService m_LocalGridService; | 56 | private IGridService m_LocalGridService; |
57 | private IGridService m_RemoteGridService; | 57 | private IGridService m_RemoteGridService; |
58 | 58 | ||
59 | static private RegionInfoCache m_RegionInfoCache; | 59 | private RegionInfoCache m_RegionInfoCache; |
60 | 60 | ||
61 | public RemoteGridServicesConnector() | 61 | public RemoteGridServicesConnector() |
62 | { | 62 | { |