aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid/AssetServer
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Grid/AssetServer')
-rw-r--r--OpenSim/Grid/AssetServer/Main.cs8
1 files changed, 3 insertions, 5 deletions
diff --git a/OpenSim/Grid/AssetServer/Main.cs b/OpenSim/Grid/AssetServer/Main.cs
index 7c7e39b..9e69257 100644
--- a/OpenSim/Grid/AssetServer/Main.cs
+++ b/OpenSim/Grid/AssetServer/Main.cs
@@ -46,8 +46,6 @@ namespace OpenSim.Grid.AssetServer
46 { 46 {
47 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 47 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
48 48
49 public AssetConfig m_config;
50
51 public static OpenAsset_Main assetserver; 49 public static OpenAsset_Main assetserver;
52 50
53 // Temporarily hardcoded - should be a plugin 51 // Temporarily hardcoded - should be a plugin
@@ -87,16 +85,16 @@ namespace OpenSim.Grid.AssetServer
87 { 85 {
88 base.Startup(); 86 base.Startup();
89 87
90 m_config = new AssetConfig("ASSET SERVER", (Path.Combine(Util.configDir(), "AssetServer_Config.xml"))); 88 AssetConfig config = new AssetConfig("ASSET SERVER", (Path.Combine(Util.configDir(), "AssetServer_Config.xml")));
91 89
92 m_log.Info("[ASSET]: Setting up asset DB"); 90 m_log.Info("[ASSET]: Setting up asset DB");
93 setupDB(m_config); 91 setupDB(config);
94 92
95 m_log.Info("[ASSET]: Loading default asset set.."); 93 m_log.Info("[ASSET]: Loading default asset set..");
96 LoadDefaultAssets(); 94 LoadDefaultAssets();
97 95
98 m_log.Info("[ASSET]: Starting HTTP process"); 96 m_log.Info("[ASSET]: Starting HTTP process");
99 m_httpServer = new BaseHttpServer(m_config.HttpPort); 97 m_httpServer = new BaseHttpServer(config.HttpPort);
100 98
101 m_stats = StatsManager.StartCollectingAssetStats(); 99 m_stats = StatsManager.StartCollectingAssetStats();
102 100