From 2681bc46c4196a3d1f61e993a609b53650ab9028 Mon Sep 17 00:00:00 2001
From: Tleiades Hax
Date: Fri, 19 Oct 2007 07:43:10 +0000
Subject: Fix for assetserver crashing (Thank you Chi11ken)

---
 OpenSim/Grid/AssetServer/Main.cs | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'OpenSim/Grid/AssetServer/Main.cs')

diff --git a/OpenSim/Grid/AssetServer/Main.cs b/OpenSim/Grid/AssetServer/Main.cs
index 1fa27ef..7a7c843 100644
--- a/OpenSim/Grid/AssetServer/Main.cs
+++ b/OpenSim/Grid/AssetServer/Main.cs
@@ -51,12 +51,11 @@ namespace OpenSim.Grid.AssetServer
     /// </summary>
     public class OpenAsset_Main : conscmd_callback
     {
-        public AssetConfig Cfg;
+        public AssetConfig m_config;
 
         public static OpenAsset_Main assetserver;
 
         private LogBase m_console;
-        private AssetConfig m_config;
         private IAssetServer m_assetServer;
 
         [STAThread]
@@ -98,13 +97,12 @@ namespace OpenSim.Grid.AssetServer
             setupDB(m_config);
 
             m_console.Verbose("ASSET", "Starting HTTP process");
-            BaseHttpServer httpServer = new BaseHttpServer((int)Cfg.HttpPort);
+            BaseHttpServer httpServer = new BaseHttpServer((int)m_config.HttpPort);
 
-            httpServer.AddStreamHandler( new GetAssetStreamHandler(this));
+            httpServer.AddStreamHandler(new GetAssetStreamHandler(this));
             httpServer.AddStreamHandler(new PostAssetStreamHandler( this ));
 
             httpServer.Start();
-
         }
 
         public byte[] GetAssetData(LLUUID assetID, bool isTexture)
@@ -125,7 +123,6 @@ namespace OpenSim.Grid.AssetServer
             }
         }
 
-        
         public void RunCmd(string cmd, string[] cmdparams)
         {
             switch (cmd)
@@ -165,7 +162,7 @@ namespace OpenSim.Grid.AssetServer
             }
         }
 
-        public GetAssetStreamHandler(OpenAsset_Main assetManager):base( "/assets/", "GET")
+        public GetAssetStreamHandler(OpenAsset_Main assetManager) : base("/assets/", "GET")
         {
             m_assetManager = assetManager;
         }
-- 
cgit v1.1