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/Region/Application | |
parent | * Terrain Module code has been reformatted to comply with guidelines. (diff) | |
download | opensim-SC-fef3b3689492dea63693c964bcdbec9f5137eb5e.zip opensim-SC-fef3b3689492dea63693c964bcdbec9f5137eb5e.tar.gz opensim-SC-fef3b3689492dea63693c964bcdbec9f5137eb5e.tar.bz2 opensim-SC-fef3b3689492dea63693c964bcdbec9f5137eb5e.tar.xz |
* Optimised using statements and namespace references across entire project (this took a while to run).
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Application/Application.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/Application/OpenSimMain.cs | 17 |
2 files changed, 12 insertions, 9 deletions
diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs index ae299a4..eaa4788 100644 --- a/OpenSim/Region/Application/Application.cs +++ b/OpenSim/Region/Application/Application.cs | |||
@@ -26,7 +26,7 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Net; | 29 | using log4net.Config; |
30 | using Nini.Config; | 30 | using Nini.Config; |
31 | using OpenSim.Framework; | 31 | using OpenSim.Framework; |
32 | using OpenSim.Framework.Console; | 32 | using OpenSim.Framework.Console; |
@@ -44,7 +44,7 @@ namespace OpenSim | |||
44 | // First line | 44 | // First line |
45 | AppDomain.CurrentDomain.UnhandledException += new UnhandledExceptionEventHandler(CurrentDomain_UnhandledException); | 45 | AppDomain.CurrentDomain.UnhandledException += new UnhandledExceptionEventHandler(CurrentDomain_UnhandledException); |
46 | 46 | ||
47 | log4net.Config.XmlConfigurator.Configure(); | 47 | XmlConfigurator.Configure(); |
48 | 48 | ||
49 | Console.WriteLine("OpenSim " + VersionInfo.Version + "\n"); | 49 | Console.WriteLine("OpenSim " + VersionInfo.Version + "\n"); |
50 | 50 | ||
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs index 14cbe13..aa08f81 100644 --- a/OpenSim/Region/Application/OpenSimMain.cs +++ b/OpenSim/Region/Application/OpenSimMain.cs | |||
@@ -29,10 +29,13 @@ using System; | |||
29 | using System.Collections; | 29 | using System.Collections; |
30 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
31 | using System.IO; | 31 | using System.IO; |
32 | using System.Net; | ||
33 | using System.Reflection; | ||
32 | using System.Text; | 34 | using System.Text; |
33 | using System.Threading; | 35 | using System.Threading; |
34 | using System.Timers; | 36 | using System.Timers; |
35 | using libsecondlife; | 37 | using libsecondlife; |
38 | using log4net; | ||
36 | using Mono.Addins; | 39 | using Mono.Addins; |
37 | using Nini.Config; | 40 | using Nini.Config; |
38 | using OpenSim.Framework; | 41 | using OpenSim.Framework; |
@@ -47,7 +50,7 @@ using OpenSim.Region.Environment; | |||
47 | using OpenSim.Region.Environment.Interfaces; | 50 | using OpenSim.Region.Environment.Interfaces; |
48 | using OpenSim.Region.Environment.Scenes; | 51 | using OpenSim.Region.Environment.Scenes; |
49 | using OpenSim.Region.Physics.Manager; | 52 | using OpenSim.Region.Physics.Manager; |
50 | using Timer = System.Timers.Timer; | 53 | using Timer=System.Timers.Timer; |
51 | 54 | ||
52 | namespace OpenSim | 55 | namespace OpenSim |
53 | { | 56 | { |
@@ -55,7 +58,7 @@ namespace OpenSim | |||
55 | 58 | ||
56 | public class OpenSimMain : RegionApplicationBase, conscmd_callback | 59 | public class OpenSimMain : RegionApplicationBase, conscmd_callback |
57 | { | 60 | { |
58 | private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | 61 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
59 | private string proxyUrl; | 62 | private string proxyUrl; |
60 | private int proxyOffset = 0; | 63 | private int proxyOffset = 0; |
61 | 64 | ||
@@ -757,7 +760,7 @@ namespace OpenSim | |||
757 | } | 760 | } |
758 | else | 761 | else |
759 | { | 762 | { |
760 | m_sceneManager.CurrentScene.SetSceneCoreDebug(!System.Convert.ToBoolean(cmdparams[0]), !System.Convert.ToBoolean(cmdparams[1]), !System.Convert.ToBoolean(cmdparams[2])); | 763 | m_sceneManager.CurrentScene.SetSceneCoreDebug(!Convert.ToBoolean(cmdparams[0]), !Convert.ToBoolean(cmdparams[1]), !Convert.ToBoolean(cmdparams[2])); |
761 | } | 764 | } |
762 | } | 765 | } |
763 | else | 766 | else |
@@ -813,7 +816,7 @@ namespace OpenSim | |||
813 | // m_console.Notice("THREAD", _tc + ": ID: " + pt.Id + ", Started: " + pt.StartTime.ToString() + ", CPU time: " + pt.TotalProcessorTime + ", Pri: " + pt.BasePriority.ToString() + ", State: " + pt.ThreadState.ToString()); | 816 | // m_console.Notice("THREAD", _tc + ": ID: " + pt.Id + ", Started: " + pt.StartTime.ToString() + ", CPU time: " + pt.TotalProcessorTime + ", Pri: " + pt.BasePriority.ToString() + ", State: " + pt.ThreadState.ToString()); |
814 | // } | 817 | // } |
815 | 818 | ||
816 | List<Thread> threads = OpenSim.Framework.ThreadTracker.GetThreads(); | 819 | List<Thread> threads = ThreadTracker.GetThreads(); |
817 | if (threads == null) | 820 | if (threads == null) |
818 | { | 821 | { |
819 | m_console.Notice("THREAD", "Thread tracking is only enabled in DEBUG mode."); | 822 | m_console.Notice("THREAD", "Thread tracking is only enabled in DEBUG mode."); |
@@ -1056,7 +1059,7 @@ namespace OpenSim | |||
1056 | case "unload": | 1059 | case "unload": |
1057 | if (cmdparams.Length > 1) | 1060 | if (cmdparams.Length > 1) |
1058 | { | 1061 | { |
1059 | foreach (IRegionModule rm in new System.Collections.ArrayList(m_moduleLoader.GetLoadedSharedModules)) | 1062 | foreach (IRegionModule rm in new ArrayList(m_moduleLoader.GetLoadedSharedModules)) |
1060 | { | 1063 | { |
1061 | if (rm.Name.ToLower() == cmdparams[1].ToLower()) | 1064 | if (rm.Name.ToLower() == cmdparams[1].ToLower()) |
1062 | { | 1065 | { |
@@ -1069,7 +1072,7 @@ namespace OpenSim | |||
1069 | case "load": | 1072 | case "load": |
1070 | if (cmdparams.Length > 1) | 1073 | if (cmdparams.Length > 1) |
1071 | { | 1074 | { |
1072 | foreach (Scene s in new System.Collections.ArrayList(m_sceneManager.Scenes)) | 1075 | foreach (Scene s in new ArrayList(m_sceneManager.Scenes)) |
1073 | { | 1076 | { |
1074 | 1077 | ||
1075 | m_console.Notice("Loading module: " + cmdparams[1]); | 1078 | m_console.Notice("Loading module: " + cmdparams[1]); |
@@ -1142,7 +1145,7 @@ namespace OpenSim | |||
1142 | { | 1145 | { |
1143 | RegionInfo regionInfo = m_sceneManager.GetRegionInfo(presence.RegionHandle); | 1146 | RegionInfo regionInfo = m_sceneManager.GetRegionInfo(presence.RegionHandle); |
1144 | string regionName; | 1147 | string regionName; |
1145 | System.Net.EndPoint ep = null; | 1148 | EndPoint ep = null; |
1146 | 1149 | ||
1147 | if (regionInfo == null) | 1150 | if (regionInfo == null) |
1148 | { | 1151 | { |