* Refactor: Break out permissions code into a separate region PermissionsModule

2 files changed, 7 insertions, 7 deletions

diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
index ca94dd7..54c26d9 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
@@ -180,8 +180,8 @@ namespace OpenSim.Region.ScriptEngine.Common
         {
             m_host.AddScriptLPS(1);
             //Check to make sure that the script's owner is the estate manager/master
-            //World.PermissionsMngr.GenericEstatePermission(
-            if (World.PermissionsMngr.GenericEstatePermission(m_host.OwnerID))
+            //World.Permissions.GenericEstatePermission(
+            if (World.Permissions.GenericEstatePermission(m_host.OwnerID))
             {
                 World.EventManager.TriggerRequestChangeWaterHeight((float)height);
             }
@@ -2616,7 +2616,7 @@ namespace OpenSim.Region.ScriptEngine.Common
         public void llModifyLand(int action, int brush)
         {
             m_host.AddScriptLPS(1);
-            if (World.PermissionsMngr.CanTerraform(m_host.OwnerID, new LLVector3(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y, 0)))
+            if (World.Permissions.CanTerraform(m_host.OwnerID, new LLVector3(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y, 0)))
             {
                 NotImplemented("llModifyLand");
             }
@@ -3869,7 +3869,7 @@ namespace OpenSim.Region.ScriptEngine.Common
                         {
                             if (m_host.ObjectOwner == parcel.landData.ownerID || 
                                 (m_host.OwnerID == m_host.GroupID && m_host.GroupID == parcel.landData.groupID 
-                                && parcel.landData.isGroupOwned) || World.PermissionsMngr.GenericEstatePermission(m_host.OwnerID))
+                                && parcel.landData.isGroupOwned) || World.Permissions.GenericEstatePermission(m_host.OwnerID))
                             {
                                 av.StandUp();
                             }
diff --git a/OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands.cs
index 731168d..ddca617 100644
--- a/OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands.cs
@@ -258,7 +258,7 @@ namespace OpenSim.Region.ScriptEngine.Common
             if (x > 255 || x < 0 || y > 255 || y < 0)
                 LSLError("osTerrainSetHeight: Coordinate out of bounds");
 
-            if (World.PermissionsMngr.CanTerraform(m_host.OwnerID, new LLVector3(x, y, 0)))
+            if (World.Permissions.CanTerraform(m_host.OwnerID, new LLVector3(x, y, 0)))
             {
                 World.Heightmap[x, y] = val;
                 return 1;
@@ -281,7 +281,7 @@ namespace OpenSim.Region.ScriptEngine.Common
         public int osRegionRestart(double seconds)
         {
             m_host.AddScriptLPS(1);
-            if (World.PermissionsMngr.CanRestartSim(m_host.OwnerID))
+            if (World.Permissions.CanRestartSim(m_host.OwnerID))
             {
                 World.Restart((float)seconds);
                 return 1;
@@ -406,7 +406,7 @@ namespace OpenSim.Region.ScriptEngine.Common
 
             if (config.Configs["LL-Functions"].GetBoolean("AllowosConsoleCommand", false))
             {
-                if (World.PermissionsMngr.CanRunConsoleCommand(m_host.OwnerID))
+                if (World.Permissions.CanRunConsoleCommand(m_host.OwnerID))
                 {
                     MainConsole.Instance.RunCommand(command);
                     return true;