aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-06-01 01:34:46 +0000
committerJustin Clarke Casey2008-06-01 01:34:46 +0000
commit15d41c2fc279f369f1f95e886ebaada94f558dcc (patch)
treeb0265e63d29aeed628f6d44aff1e990188073af1 /OpenSim/Grid
parent* Put IScenePermissions out of its misery (diff)
downloadopensim-SC_OLD-15d41c2fc279f369f1f95e886ebaada94f558dcc.zip
opensim-SC_OLD-15d41c2fc279f369f1f95e886ebaada94f558dcc.tar.gz
opensim-SC_OLD-15d41c2fc279f369f1f95e886ebaada94f558dcc.tar.bz2
opensim-SC_OLD-15d41c2fc279f369f1f95e886ebaada94f558dcc.tar.xz
* Fix build break by eliminating remaining IScenePermissions references - must remember to nant clean
* Hook all server startups into base opensim server startup method
Diffstat (limited to 'OpenSim/Grid')
-rw-r--r--OpenSim/Grid/AssetServer/Main.cs4
-rw-r--r--OpenSim/Grid/GridServer/GridServerBase.cs4
-rw-r--r--OpenSim/Grid/InventoryServer/Main.cs5
-rw-r--r--OpenSim/Grid/MessagingServer/Main.cs4
-rw-r--r--OpenSim/Grid/UserServer/Main.cs4
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
85 MainConsole.Instance = m_console; 85 MainConsole.Instance = m_console;
86 } 86 }
87 87
88 public void Startup() 88 public override void Startup()
89 { 89 {
90 base.Startup();
91
90 m_config = new AssetConfig("ASSET SERVER", (Path.Combine(Util.configDir(), "AssetServer_Config.xml"))); 92 m_config = new AssetConfig("ASSET SERVER", (Path.Combine(Util.configDir(), "AssetServer_Config.xml")));
91 93
92 m_log.Info("[ASSET]: Setting up asset DB"); 94 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
74 } 74 }
75 } 75 }
76 76
77 public void Startup() 77 public override void Startup()
78 { 78 {
79 m_log.Info("[GRID]: Starting..."); 79 base.Startup();
80 80
81 Config(); 81 Config();
82 82
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
64 MainConsole.Instance = m_console; 64 MainConsole.Instance = m_console;
65 } 65 }
66 66
67 public void Startup() 67 public override void Startup()
68 { 68 {
69 m_log.Info("Initialising inventory manager..."); 69 base.Startup();
70
70 m_config = new InventoryConfig(LogName, (Path.Combine(Util.configDir(), "InventoryServer_Config.xml"))); 71 m_config = new InventoryConfig(LogName, (Path.Combine(Util.configDir(), "InventoryServer_Config.xml")));
71 72
72 m_inventoryService = new GridInventoryService(); 73 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
79 } 79 }
80 } 80 }
81 81
82 public void Startup() 82 public override void Startup()
83 { 83 {
84 base.Startup();
85
84 Cfg = new MessageServerConfig("MESSAGING SERVER", (Path.Combine(Util.configDir(), "MessagingServer_Config.xml"))); 86 Cfg = new MessageServerConfig("MESSAGING SERVER", (Path.Combine(Util.configDir(), "MessagingServer_Config.xml")));
85 87
86 m_log.Info("[REGION]: Starting HTTP process"); 88 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
84 } 84 }
85 } 85 }
86 86
87 public void Startup() 87 public override void Startup()
88 { 88 {
89 base.Startup();
90
89 Cfg = new UserConfig("USER SERVER", (Path.Combine(Util.configDir(), "UserServer_Config.xml"))); 91 Cfg = new UserConfig("USER SERVER", (Path.Combine(Util.configDir(), "UserServer_Config.xml")));
90 92
91 m_stats = StatsManager.StartCollectingUserStats(); 93 m_stats = StatsManager.StartCollectingUserStats();