Revert "Updates all IRegionModules to the new style region modules."

This reverts commit ec3c31e61e5e540f822891110df9bc978655bbaf.

1 files changed, 76 insertions, 136 deletions

diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
index 5b15065..1533462 100644
--- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
+++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
@@ -29,7 +29,6 @@ using System;
 using System.Collections.Generic;
 using System.Reflection;
 using log4net;
-using Mono.Addins;
 using Nini.Config;
 using OpenMetaverse;
 using OpenSim.Framework;
@@ -90,8 +89,7 @@ enum GroupPowers : long
 
 namespace OpenSim.Region.CoreModules.World.Permissions
 {
-    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
-    public class PermissionsModule : INonSharedRegionModule
+    public class PermissionsModule : IRegionModule
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
                 
@@ -151,10 +149,12 @@ namespace OpenSim.Region.CoreModules.World.Permissions
 
         #endregion
 
-        #region INonSharedRegionModule Members
+        #region IRegionModule Members
 
-        public void Initialise(IConfigSource config)
+        public void Initialise(Scene scene, IConfigSource config)
         {
+            m_scene = scene;
+
             IConfig myConfig = config.Configs["Startup"];
 
             string permissionModules = myConfig.GetString("permissionmodules", "DefaultPermissionsModule");
@@ -179,57 +179,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
             if (m_bypassPermissions)
                 m_log.Info("[PERMISSIONS]: serviceside_object_permissions = false in ini file so disabling all region service permission checks");
             else
-                m_log.Debug("[PERMISSIONS]: Enabling all region service permission checks");     
-                    
-            string grant = myConfig.GetString("GrantLSL","");
-            if (grant.Length > 0) {
-                foreach (string uuidl in grant.Split(',')) {
-                    string uuid = uuidl.Trim(" \t".ToCharArray());
-                    GrantLSL.Add(uuid, true);
-                }
-            }
-
-            grant = myConfig.GetString("GrantCS","");
-            if (grant.Length > 0) {
-                foreach (string uuidl in grant.Split(',')) {
-                    string uuid = uuidl.Trim(" \t".ToCharArray());
-                    GrantCS.Add(uuid, true);
-                }
-            }
-
-            grant = myConfig.GetString("GrantVB","");
-            if (grant.Length > 0) {
-                foreach (string uuidl in grant.Split(',')) {
-                    string uuid = uuidl.Trim(" \t".ToCharArray());
-                    GrantVB.Add(uuid, true);
-                }
-            }
-
-            grant = myConfig.GetString("GrantJS", "");
-            if (grant.Length > 0)
-            {
-                foreach (string uuidl in grant.Split(','))
-                {
-                    string uuid = uuidl.Trim(" \t".ToCharArray());
-                    GrantJS.Add(uuid, true);
-                }
-            }
-
-            grant = myConfig.GetString("GrantYP", "");
-            if (grant.Length > 0)
-            {
-                foreach (string uuidl in grant.Split(','))
-                {
-                    string uuid = uuidl.Trim(" \t".ToCharArray());
-                    GrantYP.Add(uuid, true);
-                }
-            }
-
-        }
-
-        public void AddRegion(Scene scene)
-        {
-            m_scene = scene;
+                m_log.Debug("[PERMISSIONS]: Enabling all region service permission checks");
 
             //Register functions with Scene External Checks!
             m_scene.Permissions.OnBypassPermissions += BypassPermissions;
@@ -262,23 +212,23 @@ namespace OpenSim.Region.CoreModules.World.Permissions
             m_scene.Permissions.OnLinkObject += CanLinkObject; //NOT YET IMPLEMENTED
             m_scene.Permissions.OnDelinkObject += CanDelinkObject; //NOT YET IMPLEMENTED
             m_scene.Permissions.OnBuyLand += CanBuyLand; //NOT YET IMPLEMENTED
-
+            
             m_scene.Permissions.OnViewNotecard += CanViewNotecard; //NOT YET IMPLEMENTED
             m_scene.Permissions.OnViewScript += CanViewScript; //NOT YET IMPLEMENTED
             m_scene.Permissions.OnEditNotecard += CanEditNotecard; //NOT YET IMPLEMENTED
             m_scene.Permissions.OnEditScript += CanEditScript; //NOT YET IMPLEMENTED
-
+            
             m_scene.Permissions.OnCreateObjectInventory += CanCreateObjectInventory; //NOT IMPLEMENTED HERE 
             m_scene.Permissions.OnEditObjectInventory += CanEditObjectInventory;//MAYBE FULLY IMPLEMENTED
             m_scene.Permissions.OnCopyObjectInventory += CanCopyObjectInventory; //NOT YET IMPLEMENTED
             m_scene.Permissions.OnDeleteObjectInventory += CanDeleteObjectInventory; //NOT YET IMPLEMENTED
             m_scene.Permissions.OnResetScript += CanResetScript;
-
+            
             m_scene.Permissions.OnCreateUserInventory += CanCreateUserInventory; //NOT YET IMPLEMENTED
             m_scene.Permissions.OnCopyUserInventory += CanCopyUserInventory; //NOT YET IMPLEMENTED
             m_scene.Permissions.OnEditUserInventory += CanEditUserInventory; //NOT YET IMPLEMENTED
             m_scene.Permissions.OnDeleteUserInventory += CanDeleteUserInventory; //NOT YET IMPLEMENTED
-
+            
             m_scene.Permissions.OnTeleport += CanTeleport; //NOT YET IMPLEMENTED
             m_scene.Permissions.OnUseObjectReturn += CanUseObjectReturn; //NOT YET IMPLEMENTED
 
@@ -296,87 +246,52 @@ namespace OpenSim.Region.CoreModules.World.Permissions
                     "debug permissions <true / false>",
                     "Enable permissions debugging",
                     HandleDebugPermissions);
-        }
-
-        public Type ReplaceableInterface
-        {
-            get { return null; }
-        }
-
-        public void RegionLoaded(Scene scene)
-        {
-            m_friendsModule = m_scene.RequestModuleInterface<IFriendsModule>();
+                    
+                    
+            string grant = myConfig.GetString("GrantLSL","");
+            if (grant.Length > 0) {
+                foreach (string uuidl in grant.Split(',')) {
+                    string uuid = uuidl.Trim(" \t".ToCharArray());
+                    GrantLSL.Add(uuid, true);
+                }
+            }
 
-            if (m_friendsModule == null)
-                m_log.Error("[PERMISSIONS]: Friends module not found, friend permissions will not work");
-            else
-                m_log.Info("[PERMISSIONS]: Friends module found, friend permissions enabled");
-        }
+            grant = myConfig.GetString("GrantCS","");
+            if (grant.Length > 0) {
+                foreach (string uuidl in grant.Split(',')) {
+                    string uuid = uuidl.Trim(" \t".ToCharArray());
+                    GrantCS.Add(uuid, true);
+                }
+            }
 
-        public void RemoveRegion(Scene scene)
-        {
-            scene.Permissions.OnBypassPermissions -= BypassPermissions;
-            scene.Permissions.OnSetBypassPermissions -= SetBypassPermissions;
-            scene.Permissions.OnPropagatePermissions -= PropagatePermissions;
-            scene.Permissions.OnGenerateClientFlags -= GenerateClientFlags;
-            scene.Permissions.OnAbandonParcel -= CanAbandonParcel;
-            scene.Permissions.OnReclaimParcel -= CanReclaimParcel;
-            scene.Permissions.OnDeedParcel -= CanDeedParcel;
-            scene.Permissions.OnDeedObject -= CanDeedObject;
-            scene.Permissions.OnIsGod -= IsGod;
-            scene.Permissions.OnDuplicateObject -= CanDuplicateObject;
-            scene.Permissions.OnDeleteObject -= CanDeleteObject; //MAYBE FULLY IMPLEMENTED
-            scene.Permissions.OnEditObject -= CanEditObject; //MAYBE FULLY IMPLEMENTED
-            scene.Permissions.OnEditParcel -= CanEditParcel; //MAYBE FULLY IMPLEMENTED
-            scene.Permissions.OnInstantMessage -= CanInstantMessage;
-            scene.Permissions.OnInventoryTransfer -= CanInventoryTransfer; //NOT YET IMPLEMENTED
-            scene.Permissions.OnIssueEstateCommand -= CanIssueEstateCommand; //FULLY IMPLEMENTED
-            scene.Permissions.OnMoveObject -= CanMoveObject; //MAYBE FULLY IMPLEMENTED
-            scene.Permissions.OnObjectEntry -= CanObjectEntry;
-            scene.Permissions.OnReturnObject -= CanReturnObject; //NOT YET IMPLEMENTED
-            scene.Permissions.OnRezObject -= CanRezObject; //MAYBE FULLY IMPLEMENTED
-            scene.Permissions.OnRunConsoleCommand -= CanRunConsoleCommand;
-            scene.Permissions.OnRunScript -= CanRunScript; //NOT YET IMPLEMENTED
-            scene.Permissions.OnCompileScript -= CanCompileScript;
-            scene.Permissions.OnSellParcel -= CanSellParcel;
-            scene.Permissions.OnTakeObject -= CanTakeObject;
-            scene.Permissions.OnTakeCopyObject -= CanTakeCopyObject;
-            scene.Permissions.OnTerraformLand -= CanTerraformLand;
-            scene.Permissions.OnLinkObject -= CanLinkObject; //NOT YET IMPLEMENTED
-            scene.Permissions.OnDelinkObject -= CanDelinkObject; //NOT YET IMPLEMENTED
-            scene.Permissions.OnBuyLand -= CanBuyLand; //NOT YET IMPLEMENTED
-
-            scene.Permissions.OnViewNotecard -= CanViewNotecard; //NOT YET IMPLEMENTED
-            scene.Permissions.OnViewScript -= CanViewScript; //NOT YET IMPLEMENTED
-            scene.Permissions.OnEditNotecard -= CanEditNotecard; //NOT YET IMPLEMENTED
-            scene.Permissions.OnEditScript -= CanEditScript; //NOT YET IMPLEMENTED
-
-            scene.Permissions.OnCreateObjectInventory -= CanCreateObjectInventory; //NOT IMPLEMENTED HERE 
-            scene.Permissions.OnEditObjectInventory -= CanEditObjectInventory;//MAYBE FULLY IMPLEMENTED
-            scene.Permissions.OnCopyObjectInventory -= CanCopyObjectInventory; //NOT YET IMPLEMENTED
-            scene.Permissions.OnDeleteObjectInventory -= CanDeleteObjectInventory; //NOT YET IMPLEMENTED
-            scene.Permissions.OnResetScript -= CanResetScript;
-
-            scene.Permissions.OnCreateUserInventory -= CanCreateUserInventory; //NOT YET IMPLEMENTED
-            scene.Permissions.OnCopyUserInventory -= CanCopyUserInventory; //NOT YET IMPLEMENTED
-            scene.Permissions.OnEditUserInventory -= CanEditUserInventory; //NOT YET IMPLEMENTED
-            scene.Permissions.OnDeleteUserInventory -= CanDeleteUserInventory; //NOT YET IMPLEMENTED
-
-            scene.Permissions.OnTeleport -= CanTeleport; //NOT YET IMPLEMENTED
-            scene.Permissions.OnUseObjectReturn -= CanUseObjectReturn; //NOT YET IMPLEMENTED
-        }
+            grant = myConfig.GetString("GrantVB","");
+            if (grant.Length > 0) {
+                foreach (string uuidl in grant.Split(',')) {
+                    string uuid = uuidl.Trim(" \t".ToCharArray());
+                    GrantVB.Add(uuid, true);
+                }
+            }
 
-        public void PostInitialise()
-        {
-        }
+            grant = myConfig.GetString("GrantJS", "");
+            if (grant.Length > 0)
+            {
+                foreach (string uuidl in grant.Split(','))
+                {
+                    string uuid = uuidl.Trim(" \t".ToCharArray());
+                    GrantJS.Add(uuid, true);
+                }
+            }
 
-        public void Close()
-        {
-        }
+            grant = myConfig.GetString("GrantYP", "");
+            if (grant.Length > 0)
+            {
+                foreach (string uuidl in grant.Split(','))
+                {
+                    string uuid = uuidl.Trim(" \t".ToCharArray());
+                    GrantYP.Add(uuid, true);
+                }
+            }
 
-        public string Name
-        {
-            get { return "PermissionsModule"; }
         }
 
         public void HandleBypassPermissions(string module, string[] args)
@@ -449,6 +364,31 @@ namespace OpenSim.Region.CoreModules.World.Permissions
                 m_log.InfoFormat("[PERMISSIONS] Set permissions debugging to {0} in {1}", m_debugPermissions, m_scene.RegionInfo.RegionName);
             }
         }
+
+        public void PostInitialise()
+        {
+            m_friendsModule = m_scene.RequestModuleInterface<IFriendsModule>();
+
+            if (m_friendsModule == null)
+                m_log.Error("[PERMISSIONS]: Friends module not found, friend permissions will not work");
+            else
+                m_log.Info("[PERMISSIONS]: Friends module found, friend permissions enabled");
+        }
+
+        public void Close()
+        {
+        }
+
+        public string Name
+        {
+            get { return "PermissionsModule"; }
+        }
+
+        public bool IsSharedModule
+        {
+            get { return false; }
+        }
+
         #endregion
 
         #region Helper Functions