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

test jenkins for error line number

LSLKeyTest
UbitUmarov 2016-07-30 22:05:55 +01:00
parent 2826f713d4
commit 4599b3ecfd
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -86,8 +86,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
string name = moduleConfig.GetString("GridServices", ""); string name = moduleConfig.GetString("GridServices", "");
if (name == Name) if (name == Name)
{ {
if(InitialiseService(source, null))
if(InitialiseService(source,null))
m_log.Info("[LOCAL GRID SERVICE CONNECTOR]: Local grid connector enabled"); m_log.Info("[LOCAL GRID SERVICE CONNECTOR]: Local grid connector enabled");
} }
} }
@ -151,7 +150,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
scene.RegisterModuleInterface<IGridService>(this); scene.RegisterModuleInterface<IGridService>(this);
m_RegionInfoCache.CacheLocal(new GridRegion(scene.RegionInfo)); m_RegionInfoCache.CacheLocal(new GridRegion(scene.RegionInfo));
scene.EventManager.OnRegionUp += OnRegionUp; // scene.EventManager.OnRegionUp += OnRegionUp;
} }
public void RemoveRegion(Scene scene) public void RemoveRegion(Scene scene)
@ -160,7 +159,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
return; return;
m_RegionInfoCache.Remove(scene.RegionInfo.ScopeID, scene.RegionInfo.RegionID); m_RegionInfoCache.Remove(scene.RegionInfo.ScopeID, scene.RegionInfo.RegionID);
scene.EventManager.OnRegionUp -= OnRegionUp; // scene.EventManager.OnRegionUp -= OnRegionUp;
} }
public void RegionLoaded(Scene scene) public void RegionLoaded(Scene scene)

6
OpenSim/Tests/Common/Helpers/SceneHelpers.cs
View File

@ -156,6 +156,9 @@ namespace OpenSim.Tests.Common
TestScene testScene = new TestScene( TestScene testScene = new TestScene(
regInfo, m_acm, SimDataService, m_estateDataService, configSource, null); regInfo, m_acm, SimDataService, m_estateDataService, configSource, null);
testScene.RegionInfo.EstateSettings = new EstateSettings();
testScene.RegionInfo.EstateSettings.EstateOwner = UUID.Random();
INonSharedRegionModule godsModule = new GodsModule(); INonSharedRegionModule godsModule = new GodsModule();
godsModule.Initialise(new IniConfigSource()); godsModule.Initialise(new IniConfigSource());
godsModule.AddRegion(testScene); godsModule.AddRegion(testScene);
@ -197,13 +200,12 @@ namespace OpenSim.Tests.Common
m_presenceService.RegionLoaded(testScene); m_presenceService.RegionLoaded(testScene);
testScene.AddRegionModule(m_presenceService.Name, m_presenceService); testScene.AddRegionModule(m_presenceService.Name, m_presenceService);
testScene.RegionInfo.EstateSettings.EstateOwner = UUID.Random();
testScene.SetModuleInterfaces(); testScene.SetModuleInterfaces();
testScene.LandChannel = new TestLandChannel(testScene); testScene.LandChannel = new TestLandChannel(testScene);
testScene.LoadWorldMap(); testScene.LoadWorldMap();
testScene.RegionInfo.EstateSettings = new EstateSettings();
testScene.LoginsEnabled = true; testScene.LoginsEnabled = true;
testScene.RegisterRegionWithGrid(); testScene.RegisterRegionWithGrid();