From fef3b3689492dea63693c964bcdbec9f5137eb5e Mon Sep 17 00:00:00 2001 From: Adam Frisby Date: Mon, 21 Apr 2008 07:09:17 +0000 Subject: * Optimised using statements and namespace references across entire project (this took a while to run). --- OpenSim/Grid/AssetServer/Main.cs | 6 ++++-- OpenSim/Grid/AssetServer/RestService.cs | 7 ++++--- 2 files changed, 8 insertions(+), 5 deletions(-) (limited to 'OpenSim/Grid/AssetServer') diff --git a/OpenSim/Grid/AssetServer/Main.cs b/OpenSim/Grid/AssetServer/Main.cs index 3a38e85..5a013b9 100644 --- a/OpenSim/Grid/AssetServer/Main.cs +++ b/OpenSim/Grid/AssetServer/Main.cs @@ -29,6 +29,8 @@ using System; using System.IO; using System.Reflection; using libsecondlife; +using log4net; +using log4net.Config; using OpenSim.Framework; using OpenSim.Framework.AssetLoader.Filesystem; using OpenSim.Framework.Console; @@ -42,7 +44,7 @@ namespace OpenSim.Grid.AssetServer /// public class OpenAsset_Main : BaseOpenSimServer, conscmd_callback { - private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); + private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); public AssetConfig m_config; @@ -56,7 +58,7 @@ namespace OpenSim.Grid.AssetServer [STAThread] public static void Main(string[] args) { - log4net.Config.XmlConfigurator.Configure(); + XmlConfigurator.Configure(); m_log.Info("Starting...\n"); diff --git a/OpenSim/Grid/AssetServer/RestService.cs b/OpenSim/Grid/AssetServer/RestService.cs index ae56a68..ece826e 100644 --- a/OpenSim/Grid/AssetServer/RestService.cs +++ b/OpenSim/Grid/AssetServer/RestService.cs @@ -27,12 +27,13 @@ using System; using System.IO; +using System.Reflection; using System.Text; using System.Xml; using System.Xml.Serialization; using libsecondlife; +using log4net; using OpenSim.Framework; -using OpenSim.Framework.Console; using OpenSim.Framework.Servers; using OpenSim.Framework.Statistics; @@ -40,7 +41,7 @@ namespace OpenSim.Grid.AssetServer { public class GetAssetStreamHandler : BaseStreamHandler { - private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); + private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); private OpenAsset_Main m_assetManager; private IAssetProvider m_assetProvider; @@ -115,7 +116,7 @@ namespace OpenSim.Grid.AssetServer public class PostAssetStreamHandler : BaseStreamHandler { - private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); + private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); private OpenAsset_Main m_assetManager; private IAssetProvider m_assetProvider; -- cgit v1.1