First, change DefaultPermissionsModule so it returns the correct name...
... Then, make sure we also check the old-style module stack before we throw a tantrumavinationmerge
parent
d5f497478a
commit
b860c8021e
|
@ -357,8 +357,19 @@ namespace OpenSim
|
||||||
{
|
{
|
||||||
if (!scene.RegionModules.ContainsKey(s))
|
if (!scene.RegionModules.ContainsKey(s))
|
||||||
{
|
{
|
||||||
m_log.Fatal("[MODULES]: Required module " + s + " not found.");
|
bool found = false;
|
||||||
Environment.Exit(0);
|
foreach (IRegionModule m in modules)
|
||||||
|
{
|
||||||
|
if (m.Name == s)
|
||||||
|
{
|
||||||
|
found = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (!found)
|
||||||
|
{
|
||||||
|
m_log.Fatal("[MODULES]: Required module " + s + " not found.");
|
||||||
|
Environment.Exit(0);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -402,7 +402,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
|
||||||
|
|
||||||
public string Name
|
public string Name
|
||||||
{
|
{
|
||||||
get { return "PermissionsModule"; }
|
get { return "DefaultPermissionsModule"; }
|
||||||
}
|
}
|
||||||
|
|
||||||
public bool IsSharedModule
|
public bool IsSharedModule
|
||||||
|
|
Loading…
Reference in New Issue