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