Remove IRegionModule support from the test setup helper
parent
0d15a6a01f
commit
e41374dd01
|
@ -359,28 +359,10 @@ namespace OpenSim.Tests.Common
|
||||||
List<IRegionModuleBase> newModules = new List<IRegionModuleBase>();
|
List<IRegionModuleBase> newModules = new List<IRegionModuleBase>();
|
||||||
foreach (object module in modules)
|
foreach (object module in modules)
|
||||||
{
|
{
|
||||||
// Console.WriteLine("MODULE RAW {0}", module);
|
IRegionModuleBase m = (IRegionModuleBase)module;
|
||||||
if (module is IRegionModule)
|
// Console.WriteLine("MODULE {0}", m.Name);
|
||||||
{
|
m.Initialise(config);
|
||||||
IRegionModule m = (IRegionModule)module;
|
newModules.Add(m);
|
||||||
|
|
||||||
foreach (Scene scene in scenes)
|
|
||||||
{
|
|
||||||
m.Initialise(scene, config);
|
|
||||||
scene.AddModule(m.Name, m);
|
|
||||||
}
|
|
||||||
|
|
||||||
m.PostInitialise();
|
|
||||||
}
|
|
||||||
else if (module is IRegionModuleBase)
|
|
||||||
{
|
|
||||||
// for the new system, everything has to be initialised first,
|
|
||||||
// shared modules have to be post-initialised, then all get an AddRegion with the scene
|
|
||||||
IRegionModuleBase m = (IRegionModuleBase)module;
|
|
||||||
// Console.WriteLine("MODULE {0}", m.Name);
|
|
||||||
m.Initialise(config);
|
|
||||||
newModules.Add(m);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
foreach (IRegionModuleBase module in newModules)
|
foreach (IRegionModuleBase module in newModules)
|
||||||
|
@ -709,4 +691,4 @@ namespace OpenSim.Tests.Common
|
||||||
return sog;
|
return sog;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue