aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid/UserServer
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/UserServer
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/UserServer')
-rw-r--r--OpenSim/Grid/UserServer/Main.cs4
1 files changed, 3 insertions, 1 deletions
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();