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

bug fix: wrong enabled check

httptests
UbitUmarov 2017-01-27 13:10:57 +00:00
parent 56e3aaefde
commit 4b9c94a3aa
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
View File

@ -349,9 +349,6 @@ namespace OpenSim.Region.CoreModules.World.Permissions
if (!m_Enabled) if (!m_Enabled)
return; return;
if(scene != m_scene)
return;
m_scene.UnregisterModuleInterface<IPermissionsModule>(this); m_scene.UnregisterModuleInterface<IPermissionsModule>(this);
scenePermissions.OnBypassPermissions -= BypassPermissions; scenePermissions.OnBypassPermissions -= BypassPermissions;

7
OpenSim/Region/OptionalModules/PrimLimitsModule/PrimLimitsModule.cs
View File

@ -78,9 +78,8 @@ namespace OpenSim.Region.OptionalModules
public void AddRegion(Scene scene) public void AddRegion(Scene scene)
{ {
if (!m_enabled) if (!m_enabled)
{
return; return;
}
m_scene = scene; m_scene = scene;
scene.Permissions.OnRezObject += CanRezObject; scene.Permissions.OnRezObject += CanRezObject;
scene.Permissions.OnObjectEntry += CanObjectEnter; scene.Permissions.OnObjectEntry += CanObjectEnter;
@ -91,10 +90,8 @@ namespace OpenSim.Region.OptionalModules
public void RemoveRegion(Scene scene) public void RemoveRegion(Scene scene)
{ {
if (m_enabled) if (!m_enabled)
{
return; return;
}
m_scene.Permissions.OnRezObject -= CanRezObject; m_scene.Permissions.OnRezObject -= CanRezObject;
m_scene.Permissions.OnObjectEntry -= CanObjectEnter; m_scene.Permissions.OnObjectEntry -= CanObjectEnter;