diff options
author | UbitUmarov | 2016-07-30 22:05:55 +0100 |
---|---|---|
committer | UbitUmarov | 2016-07-30 22:05:55 +0100 |
commit | 4599b3ecfdde9cf6e5d2b87da9824c114a9822a0 (patch) | |
tree | 3a076590cefdca41c59a44df340060966e54446a /OpenSim | |
parent | stop creating caches on all standalone regions on a single instance ( why ar... (diff) | |
download | opensim-SC_OLD-4599b3ecfdde9cf6e5d2b87da9824c114a9822a0.zip opensim-SC_OLD-4599b3ecfdde9cf6e5d2b87da9824c114a9822a0.tar.gz opensim-SC_OLD-4599b3ecfdde9cf6e5d2b87da9824c114a9822a0.tar.bz2 opensim-SC_OLD-4599b3ecfdde9cf6e5d2b87da9824c114a9822a0.tar.xz |
test jenkins for error line number
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs | 9 | ||||
-rw-r--r-- | OpenSim/Tests/Common/Helpers/SceneHelpers.cs | 8 |
2 files changed, 9 insertions, 8 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs index 47792a2..3900e7b 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs | |||
@@ -85,9 +85,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
85 | { | 85 | { |
86 | string name = moduleConfig.GetString("GridServices", ""); | 86 | string name = moduleConfig.GetString("GridServices", ""); |
87 | if (name == Name) | 87 | if (name == Name) |
88 | { | 88 | { |
89 | 89 | if(InitialiseService(source, null)) | |
90 | if(InitialiseService(source,null)) | ||
91 | m_log.Info("[LOCAL GRID SERVICE CONNECTOR]: Local grid connector enabled"); | 90 | m_log.Info("[LOCAL GRID SERVICE CONNECTOR]: Local grid connector enabled"); |
92 | } | 91 | } |
93 | } | 92 | } |
@@ -151,7 +150,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
151 | scene.RegisterModuleInterface<IGridService>(this); | 150 | scene.RegisterModuleInterface<IGridService>(this); |
152 | 151 | ||
153 | m_RegionInfoCache.CacheLocal(new GridRegion(scene.RegionInfo)); | 152 | m_RegionInfoCache.CacheLocal(new GridRegion(scene.RegionInfo)); |
154 | scene.EventManager.OnRegionUp += OnRegionUp; | 153 | // scene.EventManager.OnRegionUp += OnRegionUp; |
155 | } | 154 | } |
156 | 155 | ||
157 | public void RemoveRegion(Scene scene) | 156 | public void RemoveRegion(Scene scene) |
@@ -160,7 +159,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
160 | return; | 159 | return; |
161 | 160 | ||
162 | m_RegionInfoCache.Remove(scene.RegionInfo.ScopeID, scene.RegionInfo.RegionID); | 161 | m_RegionInfoCache.Remove(scene.RegionInfo.ScopeID, scene.RegionInfo.RegionID); |
163 | scene.EventManager.OnRegionUp -= OnRegionUp; | 162 | // scene.EventManager.OnRegionUp -= OnRegionUp; |
164 | } | 163 | } |
165 | 164 | ||
166 | public void RegionLoaded(Scene scene) | 165 | public void RegionLoaded(Scene scene) |
diff --git a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs index bdf217c..f8485e0 100644 --- a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs +++ b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs | |||
@@ -156,6 +156,9 @@ namespace OpenSim.Tests.Common | |||
156 | TestScene testScene = new TestScene( | 156 | TestScene testScene = new TestScene( |
157 | regInfo, m_acm, SimDataService, m_estateDataService, configSource, null); | 157 | regInfo, m_acm, SimDataService, m_estateDataService, configSource, null); |
158 | 158 | ||
159 | testScene.RegionInfo.EstateSettings = new EstateSettings(); | ||
160 | testScene.RegionInfo.EstateSettings.EstateOwner = UUID.Random(); | ||
161 | |||
159 | INonSharedRegionModule godsModule = new GodsModule(); | 162 | INonSharedRegionModule godsModule = new GodsModule(); |
160 | godsModule.Initialise(new IniConfigSource()); | 163 | godsModule.Initialise(new IniConfigSource()); |
161 | godsModule.AddRegion(testScene); | 164 | godsModule.AddRegion(testScene); |
@@ -197,13 +200,12 @@ namespace OpenSim.Tests.Common | |||
197 | m_presenceService.RegionLoaded(testScene); | 200 | m_presenceService.RegionLoaded(testScene); |
198 | testScene.AddRegionModule(m_presenceService.Name, m_presenceService); | 201 | testScene.AddRegionModule(m_presenceService.Name, m_presenceService); |
199 | 202 | ||
200 | testScene.RegionInfo.EstateSettings.EstateOwner = UUID.Random(); | 203 | |
201 | testScene.SetModuleInterfaces(); | 204 | testScene.SetModuleInterfaces(); |
202 | 205 | ||
203 | testScene.LandChannel = new TestLandChannel(testScene); | 206 | testScene.LandChannel = new TestLandChannel(testScene); |
204 | testScene.LoadWorldMap(); | 207 | testScene.LoadWorldMap(); |
205 | 208 | ||
206 | testScene.RegionInfo.EstateSettings = new EstateSettings(); | ||
207 | testScene.LoginsEnabled = true; | 209 | testScene.LoginsEnabled = true; |
208 | testScene.RegisterRegionWithGrid(); | 210 | testScene.RegisterRegionWithGrid(); |
209 | 211 | ||