* Fix build break by eliminating remaining IScenePermissions references - must remember to nant clean

* Hook all server startups into base opensim server startup method

5 files changed, 14 insertions, 7 deletions

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();