diff options
Diffstat (limited to 'OpenSim/Grid/AssetServer')
-rw-r--r-- | OpenSim/Grid/AssetServer/Main.cs | 6 | ||||
-rw-r--r-- | OpenSim/Grid/AssetServer/RestService.cs | 7 |
2 files changed, 8 insertions, 5 deletions
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; | |||
29 | using System.IO; | 29 | using System.IO; |
30 | using System.Reflection; | 30 | using System.Reflection; |
31 | using libsecondlife; | 31 | using libsecondlife; |
32 | using log4net; | ||
33 | using log4net.Config; | ||
32 | using OpenSim.Framework; | 34 | using OpenSim.Framework; |
33 | using OpenSim.Framework.AssetLoader.Filesystem; | 35 | using OpenSim.Framework.AssetLoader.Filesystem; |
34 | using OpenSim.Framework.Console; | 36 | using OpenSim.Framework.Console; |
@@ -42,7 +44,7 @@ namespace OpenSim.Grid.AssetServer | |||
42 | /// </summary> | 44 | /// </summary> |
43 | public class OpenAsset_Main : BaseOpenSimServer, conscmd_callback | 45 | public class OpenAsset_Main : BaseOpenSimServer, conscmd_callback |
44 | { | 46 | { |
45 | private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | 47 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
46 | 48 | ||
47 | public AssetConfig m_config; | 49 | public AssetConfig m_config; |
48 | 50 | ||
@@ -56,7 +58,7 @@ namespace OpenSim.Grid.AssetServer | |||
56 | [STAThread] | 58 | [STAThread] |
57 | public static void Main(string[] args) | 59 | public static void Main(string[] args) |
58 | { | 60 | { |
59 | log4net.Config.XmlConfigurator.Configure(); | 61 | XmlConfigurator.Configure(); |
60 | 62 | ||
61 | m_log.Info("Starting...\n"); | 63 | m_log.Info("Starting...\n"); |
62 | 64 | ||
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 @@ | |||
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.IO; | 29 | using System.IO; |
30 | using System.Reflection; | ||
30 | using System.Text; | 31 | using System.Text; |
31 | using System.Xml; | 32 | using System.Xml; |
32 | using System.Xml.Serialization; | 33 | using System.Xml.Serialization; |
33 | using libsecondlife; | 34 | using libsecondlife; |
35 | using log4net; | ||
34 | using OpenSim.Framework; | 36 | using OpenSim.Framework; |
35 | using OpenSim.Framework.Console; | ||
36 | using OpenSim.Framework.Servers; | 37 | using OpenSim.Framework.Servers; |
37 | using OpenSim.Framework.Statistics; | 38 | using OpenSim.Framework.Statistics; |
38 | 39 | ||
@@ -40,7 +41,7 @@ namespace OpenSim.Grid.AssetServer | |||
40 | { | 41 | { |
41 | public class GetAssetStreamHandler : BaseStreamHandler | 42 | public class GetAssetStreamHandler : BaseStreamHandler |
42 | { | 43 | { |
43 | private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | 44 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
44 | 45 | ||
45 | private OpenAsset_Main m_assetManager; | 46 | private OpenAsset_Main m_assetManager; |
46 | private IAssetProvider m_assetProvider; | 47 | private IAssetProvider m_assetProvider; |
@@ -115,7 +116,7 @@ namespace OpenSim.Grid.AssetServer | |||
115 | 116 | ||
116 | public class PostAssetStreamHandler : BaseStreamHandler | 117 | public class PostAssetStreamHandler : BaseStreamHandler |
117 | { | 118 | { |
118 | private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | 119 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
119 | 120 | ||
120 | private OpenAsset_Main m_assetManager; | 121 | private OpenAsset_Main m_assetManager; |
121 | private IAssetProvider m_assetProvider; | 122 | private IAssetProvider m_assetProvider; |