12 files changed, 26 insertions, 21 deletions

diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
index c2633f8..dfc9c0a 100644
--- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs
+++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
@@ -73,7 +73,7 @@ namespace OpenSim.Framework.Servers
         /// <summary>
         /// Performs initialisation of the scene, such as loading configuration from disk.
         /// </summary>
-        public virtual void StartUp()
+        public virtual void Startup()
         {                                
             EnhanceVersionInformation();
             
diff --git a/OpenSim/Grid/AssetServer/Main.cs b/OpenSim/Grid/AssetServer/Main.cs
index 83a6c89..a118a90 100644
--- a/OpenSim/Grid/AssetServer/Main.cs
+++ b/OpenSim/Grid/AssetServer/Main.cs
@@ -85,8 +85,10 @@ namespace OpenSim.Grid.AssetServer
             MainConsole.Instance = m_console;
         }
 
-        public void Startup()
+        public override void Startup()
         {
+            base.Startup();
+            
             m_config = new AssetConfig("ASSET SERVER", (Path.Combine(Util.configDir(), "AssetServer_Config.xml")));
 
             m_log.Info("[ASSET]: Setting up asset DB");
diff --git a/OpenSim/Grid/GridServer/GridServerBase.cs b/OpenSim/Grid/GridServer/GridServerBase.cs
index a22f685..8ca4296 100644
--- a/OpenSim/Grid/GridServer/GridServerBase.cs
+++ b/OpenSim/Grid/GridServer/GridServerBase.cs
@@ -74,9 +74,9 @@ namespace OpenSim.Grid.GridServer
             }
         }
 
-        public void Startup()
+        public override void Startup()
         {
-            m_log.Info("[GRID]: Starting...");
+            base.Startup();
 
             Config();
 
diff --git a/OpenSim/Grid/InventoryServer/Main.cs b/OpenSim/Grid/InventoryServer/Main.cs
index ae76cd4..4300554 100644
--- a/OpenSim/Grid/InventoryServer/Main.cs
+++ b/OpenSim/Grid/InventoryServer/Main.cs
@@ -64,9 +64,10 @@ namespace OpenSim.Grid.InventoryServer
             MainConsole.Instance = m_console;
         }
 
-        public void Startup()
+        public override void Startup()
         {
-            m_log.Info("Initialising inventory manager...");
+            base.Startup();
+            
             m_config = new InventoryConfig(LogName, (Path.Combine(Util.configDir(), "InventoryServer_Config.xml")));
 
             m_inventoryService = new GridInventoryService();
diff --git a/OpenSim/Grid/MessagingServer/Main.cs b/OpenSim/Grid/MessagingServer/Main.cs
index 5c1fb19..d2fa659 100644
--- a/OpenSim/Grid/MessagingServer/Main.cs
+++ b/OpenSim/Grid/MessagingServer/Main.cs
@@ -79,8 +79,10 @@ namespace OpenSim.Grid.MessagingServer
             }
         }
 
-        public void Startup()
+        public override void Startup()
         {
+            base.Startup();
+            
             Cfg = new MessageServerConfig("MESSAGING SERVER", (Path.Combine(Util.configDir(), "MessagingServer_Config.xml")));
 
             m_log.Info("[REGION]: Starting HTTP process");
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs
index 9d7421c..2695ff4 100644
--- a/OpenSim/Grid/UserServer/Main.cs
+++ b/OpenSim/Grid/UserServer/Main.cs
@@ -84,8 +84,10 @@ namespace OpenSim.Grid.UserServer
             }
         }
 
-        public void Startup()
+        public override void Startup()
         {
+            base.Startup();
+            
             Cfg = new UserConfig("USER SERVER", (Path.Combine(Util.configDir(), "UserServer_Config.xml")));
 
             m_stats = StatsManager.StartCollectingUserStats();
diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs
index 72fdf10..9be30e9 100644
--- a/OpenSim/Region/Application/Application.cs
+++ b/OpenSim/Region/Application/Application.cs
@@ -83,12 +83,12 @@ namespace OpenSim
             if (background)
             {
                 OpenSimBase sim = new OpenSimBackground(configSource);
-                sim.StartUp();
+                sim.Startup();
             }
             else
             {
                 OpenSimBase sim = new OpenSim(configSource);
-                sim.StartUp();
+                sim.Startup();
 
                 while (true)
                 {
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 1996182..b020a6c 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -80,7 +80,7 @@ namespace OpenSim
         /// <summary>
         /// Performs initialisation of the scene, such as loading configuration from disk.
         /// </summary>
-        public override void StartUp()
+        public override void Startup()
         {
             m_log.Info("====================================================================");
             m_log.Info("========================= STARTING OPENSIM =========================");
@@ -90,7 +90,7 @@ namespace OpenSim
             m_console = CreateConsole();
             MainConsole.Instance = m_console;
             
-            base.StartUp();
+            base.Startup();
 
             //Run Startup Commands
             if (m_startupCommandsFile != String.Empty)
diff --git a/OpenSim/Region/Application/OpenSimBackground.cs b/OpenSim/Region/Application/OpenSimBackground.cs
index dd618f0..51a5b67 100644
--- a/OpenSim/Region/Application/OpenSimBackground.cs
+++ b/OpenSim/Region/Application/OpenSimBackground.cs
@@ -48,7 +48,7 @@ namespace OpenSim
         /// <summary>
         /// Performs initialisation of the scene, such as loading configuration from disk.
         /// </summary>
-        public override void StartUp()
+        public override void Startup()
         {
             //
             // Called from app startup (OpenSim.Application)
@@ -58,7 +58,7 @@ namespace OpenSim
             m_log.Info("====================================================================");
             m_log.InfoFormat("[OPENSIM MAIN]: Running in background {0} mode", m_sandbox ? "sandbox" : "grid");
 
-            base.StartUp();
+            base.Startup();
 
             // We are done with startup
             m_log.InfoFormat("[OPENSIM MAIN]: Startup complete, serving {0} region{1}",
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 3e4db41..f96c29b 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -330,9 +330,9 @@ namespace OpenSim
         /// <summary>
         /// Performs initialisation of the scene, such as loading configuration from disk.
         /// </summary>
-        public override void StartUp()
+        public override void Startup()
         {
-            base.StartUp();
+            base.Startup();
             
             m_stats = StatsManager.StartCollectingSimExtraStats();
 
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
index 19d14ad..d96336a 100644
--- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs
+++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
@@ -73,9 +73,9 @@ namespace OpenSim.Region.ClientStack
             get { return m_sceneManager; }
         }
 
-        public override void StartUp()
+        public override void Startup()
         {
-            base.StartUp();
+            base.Startup();
             
             LLClientView.TerrainManager = new TerrainManager(new SecondLife());
 
diff --git a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
index 50257d6..eccaa78 100644
--- a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
@@ -39,7 +39,7 @@ using OpenSim.Region.Environment.Scenes;
 
 namespace OpenSim.Region.Environment.Modules.World.Permissions
 {
-    public class PermissionsModule : IRegionModule, IScenePermissions, ICommandableModule
+    public class PermissionsModule : IRegionModule, ICommandableModule
     {
         protected Scene m_scene;
         private readonly Commander m_commander = new Commander("Permissions");
@@ -138,8 +138,6 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
 
             m_bypassPermissions = !myConfig.GetBoolean("serverside_object_permissions", true);
 
-            m_scene.RegisterModuleInterface<IScenePermissions>(this);
-
             //Register functions with Scene External Checks!
             m_scene.ExternalChecks.addBypassPermissions(BypassPermissions); //FULLY IMPLEMENTED
             m_scene.ExternalChecks.addSetBypassPermissions(SetBypassPermissions); //FULLY IMPLEMENTED