aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs3
-rw-r--r--OpenSim/Region/OptionalModules/PrimLimitsModule/PrimLimitsModule.cs7
2 files changed, 2 insertions, 8 deletions
diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
index a369c30..c00112b 100644
--- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
+++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
@@ -349,9 +349,6 @@ namespace OpenSim.Region.CoreModules.World.Permissions
349 if (!m_Enabled) 349 if (!m_Enabled)
350 return; 350 return;
351 351
352 if(scene != m_scene)
353 return;
354
355 m_scene.UnregisterModuleInterface<IPermissionsModule>(this); 352 m_scene.UnregisterModuleInterface<IPermissionsModule>(this);
356 353
357 scenePermissions.OnBypassPermissions -= BypassPermissions; 354 scenePermissions.OnBypassPermissions -= BypassPermissions;
diff --git a/OpenSim/Region/OptionalModules/PrimLimitsModule/PrimLimitsModule.cs b/OpenSim/Region/OptionalModules/PrimLimitsModule/PrimLimitsModule.cs
index 6f2eedc..af32d05 100644
--- a/OpenSim/Region/OptionalModules/PrimLimitsModule/PrimLimitsModule.cs
+++ b/OpenSim/Region/OptionalModules/PrimLimitsModule/PrimLimitsModule.cs
@@ -78,9 +78,8 @@ namespace OpenSim.Region.OptionalModules
78 public void AddRegion(Scene scene) 78 public void AddRegion(Scene scene)
79 { 79 {
80 if (!m_enabled) 80 if (!m_enabled)
81 {
82 return; 81 return;
83 } 82
84 m_scene = scene; 83 m_scene = scene;
85 scene.Permissions.OnRezObject += CanRezObject; 84 scene.Permissions.OnRezObject += CanRezObject;
86 scene.Permissions.OnObjectEntry += CanObjectEnter; 85 scene.Permissions.OnObjectEntry += CanObjectEnter;
@@ -91,10 +90,8 @@ namespace OpenSim.Region.OptionalModules
91 90
92 public void RemoveRegion(Scene scene) 91 public void RemoveRegion(Scene scene)
93 { 92 {
94 if (m_enabled) 93 if (!m_enabled)
95 {
96 return; 94 return;
97 }
98 95
99 m_scene.Permissions.OnRezObject -= CanRezObject; 96 m_scene.Permissions.OnRezObject -= CanRezObject;
100 m_scene.Permissions.OnObjectEntry -= CanObjectEnter; 97 m_scene.Permissions.OnObjectEntry -= CanObjectEnter;