diff options
author | Adam Frisby | 2008-04-21 07:09:17 +0000 |
---|---|---|
committer | Adam Frisby | 2008-04-21 07:09:17 +0000 |
commit | fef3b3689492dea63693c964bcdbec9f5137eb5e (patch) | |
tree | 7791eef001d85d3e1de863a68f26ff9434d062ca /OpenSim/Grid/UserServer/Main.cs | |
parent | * Terrain Module code has been reformatted to comply with guidelines. (diff) | |
download | opensim-SC_OLD-fef3b3689492dea63693c964bcdbec9f5137eb5e.zip opensim-SC_OLD-fef3b3689492dea63693c964bcdbec9f5137eb5e.tar.gz opensim-SC_OLD-fef3b3689492dea63693c964bcdbec9f5137eb5e.tar.bz2 opensim-SC_OLD-fef3b3689492dea63693c964bcdbec9f5137eb5e.tar.xz |
* Optimised using statements and namespace references across entire project (this took a while to run).
Diffstat (limited to 'OpenSim/Grid/UserServer/Main.cs')
-rw-r--r-- | OpenSim/Grid/UserServer/Main.cs | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs index 0f0104e..0534e3b 100644 --- a/OpenSim/Grid/UserServer/Main.cs +++ b/OpenSim/Grid/UserServer/Main.cs | |||
@@ -28,7 +28,11 @@ | |||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.IO; | 30 | using System.IO; |
31 | using System.Net; | ||
32 | using System.Reflection; | ||
31 | using libsecondlife; | 33 | using libsecondlife; |
34 | using log4net; | ||
35 | using log4net.Config; | ||
32 | using OpenSim.Framework; | 36 | using OpenSim.Framework; |
33 | using OpenSim.Framework.Communications.Cache; | 37 | using OpenSim.Framework.Communications.Cache; |
34 | using OpenSim.Framework.Console; | 38 | using OpenSim.Framework.Console; |
@@ -41,7 +45,7 @@ namespace OpenSim.Grid.UserServer | |||
41 | /// </summary> | 45 | /// </summary> |
42 | public class OpenUser_Main : BaseOpenSimServer, conscmd_callback | 46 | public class OpenUser_Main : BaseOpenSimServer, conscmd_callback |
43 | { | 47 | { |
44 | private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | 48 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
45 | 49 | ||
46 | private UserConfig Cfg; | 50 | private UserConfig Cfg; |
47 | 51 | ||
@@ -54,7 +58,7 @@ namespace OpenSim.Grid.UserServer | |||
54 | [STAThread] | 58 | [STAThread] |
55 | public static void Main(string[] args) | 59 | public static void Main(string[] args) |
56 | { | 60 | { |
57 | log4net.Config.XmlConfigurator.Configure(); | 61 | XmlConfigurator.Configure(); |
58 | 62 | ||
59 | m_log.Info("Launching UserServer..."); | 63 | m_log.Info("Launching UserServer..."); |
60 | 64 | ||
@@ -191,7 +195,7 @@ namespace OpenSim.Grid.UserServer | |||
191 | } | 195 | } |
192 | 196 | ||
193 | } | 197 | } |
194 | catch (System.Net.WebException e) | 198 | catch (WebException e) |
195 | { | 199 | { |
196 | m_log.ErrorFormat( | 200 | m_log.ErrorFormat( |
197 | "[USERS]: Could not contact the inventory service at {0} to create an inventory for {1}", | 201 | "[USERS]: Could not contact the inventory service at {0} to create an inventory for {1}", |