From 20a9bf08f51351e1e0a9de94f184ff56cd572665 Mon Sep 17 00:00:00 2001
From: Adam Frisby
Date: Thu, 1 May 2008 18:04:42 +0000
Subject: * Rolled back a few changes.

---
 OpenSim/Grid/AssetServer/Main.cs | 81 +++++++++++++++++++---------------------
 1 file changed, 39 insertions(+), 42 deletions(-)

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

diff --git a/OpenSim/Grid/AssetServer/Main.cs b/OpenSim/Grid/AssetServer/Main.cs
index c26c506..26f4bc8 100644
--- a/OpenSim/Grid/AssetServer/Main.cs
+++ b/OpenSim/Grid/AssetServer/Main.cs
@@ -46,48 +46,14 @@ namespace OpenSim.Grid.AssetServer
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        public static OpenAsset_Main assetserver;
+        public AssetConfig m_config;
 
+        public static OpenAsset_Main assetserver;   
+        
         // Temporarily hardcoded - should be a plugin
-        protected IAssetLoader assetLoader = new AssetLoaderFileSystem();
-
+        protected IAssetLoader assetLoader = new AssetLoaderFileSystem();        
+        
         private IAssetProvider m_assetProvider;
-        public AssetConfig m_config;
-
-        public OpenAsset_Main()
-        {
-            m_console = new ConsoleBase("OpenAsset", this);
-
-            MainConsole.Instance = m_console;
-        }
-
-        #region conscmd_callback Members
-
-        public override void RunCmd(string cmd, string[] cmdparams)
-        {
-            base.RunCmd(cmd, cmdparams);
-
-            switch (cmd)
-            {
-                case "help":
-                    m_console.Notice(
-                        @"shutdown - shutdown this asset server (USE CAUTION!)
-                 stats    - statistical information for this server");
-
-                    break;
-
-                case "stats":
-                    m_console.Notice("STATS", Environment.NewLine + StatsManager.AssetStats.Report());
-                    break;
-
-                case "shutdown":
-                    m_console.Close();
-                    Environment.Exit(0);
-                    break;
-            }
-        }
-
-        #endregion
 
         [STAThread]
         public static void Main(string[] args)
@@ -112,6 +78,13 @@ namespace OpenSim.Grid.AssetServer
             }
         }
 
+        public OpenAsset_Main()
+        {
+            m_console = new ConsoleBase("OpenAsset", this);
+            
+            MainConsole.Instance = m_console;
+        }
+
         public void Startup()
         {
             m_config = new AssetConfig("ASSET SERVER", (Path.Combine(Util.configDir(), "AssetServer_Config.xml")));
@@ -187,18 +160,42 @@ namespace OpenSim.Grid.AssetServer
             catch (Exception e)
             {
                 m_log.Warn("[ASSET]: setupDB() - Exception occured");
-                m_log.Warn("[ASSET]: " + e);
+                m_log.Warn("[ASSET]: " + e.ToString());
             }
         }
 
         public void LoadDefaultAssets()
         {
-            assetLoader.ForEachDefaultXmlAsset(StoreAsset);
+            assetLoader.ForEachDefaultXmlAsset(StoreAsset);            
         }
 
         protected void StoreAsset(AssetBase asset)
         {
             m_assetProvider.CreateAsset(asset);
         }
+
+        public override void RunCmd(string cmd, string[] cmdparams)
+        {
+            base.RunCmd(cmd, cmdparams);
+            
+            switch (cmd)
+            {
+                case "help":
+                    m_console.Notice(
+                        @"shutdown - shutdown this asset server (USE CAUTION!)
+                 stats    - statistical information for this server");                    
+                    
+                    break;                  
+                    
+                case "stats":
+                    m_console.Notice("STATS", Environment.NewLine + StatsManager.AssetStats.Report());
+                    break;
+
+                case "shutdown":
+                    m_console.Close();
+                    Environment.Exit(0);
+                    break;
+            }
+        }
     }
-}
\ No newline at end of file
+}
-- 
cgit v1.1