aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs2
-rw-r--r--OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs8
2 files changed, 8 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs b/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
index dfd6c06..9601ffc 100644
--- a/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
@@ -34,7 +34,7 @@ using OpenSim.Region.Framework.Interfaces;
34 34
35namespace OpenSim.Region.CoreModules.Avatar.Gods 35namespace OpenSim.Region.CoreModules.Avatar.Gods
36{ 36{
37 public class GodsModules : IRegionModule, IGodsModule 37 public class GodsModule : IRegionModule, IGodsModule
38 { 38 {
39 protected Scene m_scene; 39 protected Scene m_scene;
40 protected IDialogModule m_dialogModule; 40 protected IDialogModule m_dialogModule;
diff --git a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
index 5d35e35..d4c2daa 100644
--- a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
+++ b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
@@ -38,6 +38,7 @@ using OpenSim.Region.Framework;
38using OpenSim.Region.Framework.Interfaces; 38using OpenSim.Region.Framework.Interfaces;
39using OpenSim.Region.Framework.Scenes; 39using OpenSim.Region.Framework.Scenes;
40using OpenSim.Region.CoreModules.Agent.Capabilities; 40using OpenSim.Region.CoreModules.Agent.Capabilities;
41using OpenSim.Region.CoreModules.Avatar.Gods;
41using OpenSim.Tests.Common.Mock; 42using OpenSim.Tests.Common.Mock;
42 43
43namespace OpenSim.Tests.Common.Setup 44namespace OpenSim.Tests.Common.Setup
@@ -82,9 +83,14 @@ namespace OpenSim.Tests.Common.Setup
82 TestScene testScene = new TestScene( 83 TestScene testScene = new TestScene(
83 regInfo, acm, cm, scs, sm, null, false, false, false, configSource, null); 84 regInfo, acm, cm, scs, sm, null, false, false, false, configSource, null);
84 85
85 IRegionModule capsModule = new CapabilitiesModule(); 86 IRegionModule capsModule = new CapabilitiesModule();
86 capsModule.Initialise(testScene, new IniConfigSource()); 87 capsModule.Initialise(testScene, new IniConfigSource());
87 testScene.AddModule(capsModule.Name, capsModule); 88 testScene.AddModule(capsModule.Name, capsModule);
89
90 IRegionModule godsModule = new GodsModule();
91 godsModule.Initialise(testScene, new IniConfigSource());
92 testScene.AddModule(godsModule.Name, godsModule);
93
88 testScene.SetModuleInterfaces(); 94 testScene.SetModuleInterfaces();
89 95
90 testScene.LandChannel = new TestLandChannel(); 96 testScene.LandChannel = new TestLandChannel();