diff options
author | Adam Frisby | 2008-05-01 14:45:56 +0000 |
---|---|---|
committer | Adam Frisby | 2008-05-01 14:45:56 +0000 |
commit | 4692e92312ceacf414629eb78f6d0725a2eb2ca5 (patch) | |
tree | 34da13ca5f7f19fc447f4fd341a43703183cfd55 /OpenSim/Region/Application/OpenSimMainConsole.cs | |
parent | Update svn properties. Minor formatting cleanup. (diff) | |
download | opensim-SC-4692e92312ceacf414629eb78f6d0725a2eb2ca5.zip opensim-SC-4692e92312ceacf414629eb78f6d0725a2eb2ca5.tar.gz opensim-SC-4692e92312ceacf414629eb78f6d0725a2eb2ca5.tar.bz2 opensim-SC-4692e92312ceacf414629eb78f6d0725a2eb2ca5.tar.xz |
* Assorted spring cleanings.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Application/OpenSimMainConsole.cs | 32 |
1 files changed, 11 insertions, 21 deletions
diff --git a/OpenSim/Region/Application/OpenSimMainConsole.cs b/OpenSim/Region/Application/OpenSimMainConsole.cs index 53e3583..ac5a1ec 100644 --- a/OpenSim/Region/Application/OpenSimMainConsole.cs +++ b/OpenSim/Region/Application/OpenSimMainConsole.cs | |||
@@ -26,33 +26,23 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections; | ||
29 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
30 | using System.Diagnostics; | ||
31 | using System.IO; | 31 | using System.IO; |
32 | using System.Text; | 32 | using System.Net; |
33 | using System.Reflection; | ||
33 | using System.Threading; | 34 | using System.Threading; |
34 | using System.Timers; | 35 | using System.Timers; |
36 | using libsecondlife; | ||
37 | using log4net; | ||
35 | using Nini.Config; | 38 | using Nini.Config; |
36 | using OpenSim.Framework; | 39 | using OpenSim.Framework; |
37 | using OpenSim.Framework.Communications.Cache; | ||
38 | using OpenSim.Framework.Console; | 40 | using OpenSim.Framework.Console; |
39 | using OpenSim.Framework.Servers; | ||
40 | using OpenSim.Framework.Statistics; | 41 | using OpenSim.Framework.Statistics; |
41 | using OpenSim.Region.ClientStack; | 42 | using OpenSim.Region.ClientStack; |
42 | using OpenSim.Region.Communications.Local; | ||
43 | using OpenSim.Region.Communications.OGS1; | ||
44 | using OpenSim.Region.Environment; | ||
45 | using OpenSim.Region.Environment.Interfaces; | 43 | using OpenSim.Region.Environment.Interfaces; |
46 | using OpenSim.Region.Environment.Scenes; | 44 | using OpenSim.Region.Environment.Scenes; |
47 | using OpenSim.Region.Physics.Manager; | ||
48 | using Timer=System.Timers.Timer; | 45 | using Timer=System.Timers.Timer; |
49 | using System.Net; | ||
50 | using Nwc.XmlRpc; | ||
51 | using System.Collections; | ||
52 | using System.Reflection; | ||
53 | using libsecondlife; | ||
54 | using Mono.Addins; | ||
55 | using Mono.Addins.Description; | ||
56 | 46 | ||
57 | namespace OpenSim | 47 | namespace OpenSim |
58 | { | 48 | { |
@@ -60,7 +50,7 @@ namespace OpenSim | |||
60 | 50 | ||
61 | public class OpenSimMainConsole : OpenSimMain, conscmd_callback | 51 | public class OpenSimMainConsole : OpenSimMain, conscmd_callback |
62 | { | 52 | { |
63 | private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | 53 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
64 | 54 | ||
65 | protected string m_startupCommandsFile; | 55 | protected string m_startupCommandsFile; |
66 | protected string m_shutdownCommandsFile; | 56 | protected string m_shutdownCommandsFile; |
@@ -243,7 +233,7 @@ namespace OpenSim | |||
243 | } | 233 | } |
244 | else | 234 | else |
245 | { | 235 | { |
246 | m_sceneManager.CurrentScene.SetSceneCoreDebug(!System.Convert.ToBoolean(cmdparams[0]), !System.Convert.ToBoolean(cmdparams[1]), !System.Convert.ToBoolean(cmdparams[2])); | 236 | m_sceneManager.CurrentScene.SetSceneCoreDebug(!Convert.ToBoolean(cmdparams[0]), !Convert.ToBoolean(cmdparams[1]), !Convert.ToBoolean(cmdparams[2])); |
247 | } | 237 | } |
248 | } | 238 | } |
249 | else | 239 | else |
@@ -300,7 +290,7 @@ namespace OpenSim | |||
300 | // m_console.Notice("THREAD", _tc + ": ID: " + pt.Id + ", Started: " + pt.StartTime.ToString() + ", CPU time: " + pt.TotalProcessorTime + ", Pri: " + pt.BasePriority.ToString() + ", State: " + pt.ThreadState.ToString()); | 290 | // m_console.Notice("THREAD", _tc + ": ID: " + pt.Id + ", Started: " + pt.StartTime.ToString() + ", CPU time: " + pt.TotalProcessorTime + ", Pri: " + pt.BasePriority.ToString() + ", State: " + pt.ThreadState.ToString()); |
301 | // } | 291 | // } |
302 | 292 | ||
303 | List<Thread> threads = OpenSim.Framework.ThreadTracker.GetThreads(); | 293 | List<Thread> threads = ThreadTracker.GetThreads(); |
304 | if (threads == null) | 294 | if (threads == null) |
305 | { | 295 | { |
306 | m_console.Notice("THREAD", "Thread tracking is only enabled in DEBUG mode."); | 296 | m_console.Notice("THREAD", "Thread tracking is only enabled in DEBUG mode."); |
@@ -546,7 +536,7 @@ namespace OpenSim | |||
546 | case "unload": | 536 | case "unload": |
547 | if (cmdparams.Length > 1) | 537 | if (cmdparams.Length > 1) |
548 | { | 538 | { |
549 | foreach (IRegionModule rm in new System.Collections.ArrayList(m_moduleLoader.GetLoadedSharedModules)) | 539 | foreach (IRegionModule rm in new ArrayList(m_moduleLoader.GetLoadedSharedModules)) |
550 | { | 540 | { |
551 | if (rm.Name.ToLower() == cmdparams[1].ToLower()) | 541 | if (rm.Name.ToLower() == cmdparams[1].ToLower()) |
552 | { | 542 | { |
@@ -559,7 +549,7 @@ namespace OpenSim | |||
559 | case "load": | 549 | case "load": |
560 | if (cmdparams.Length > 1) | 550 | if (cmdparams.Length > 1) |
561 | { | 551 | { |
562 | foreach (Scene s in new System.Collections.ArrayList(m_sceneManager.Scenes)) | 552 | foreach (Scene s in new ArrayList(m_sceneManager.Scenes)) |
563 | { | 553 | { |
564 | 554 | ||
565 | m_console.Notice("Loading module: " + cmdparams[1]); | 555 | m_console.Notice("Loading module: " + cmdparams[1]); |
@@ -632,7 +622,7 @@ namespace OpenSim | |||
632 | { | 622 | { |
633 | RegionInfo regionInfo = m_sceneManager.GetRegionInfo(presence.RegionHandle); | 623 | RegionInfo regionInfo = m_sceneManager.GetRegionInfo(presence.RegionHandle); |
634 | string regionName; | 624 | string regionName; |
635 | System.Net.EndPoint ep = null; | 625 | EndPoint ep = null; |
636 | 626 | ||
637 | if (regionInfo == null) | 627 | if (regionInfo == null) |
638 | { | 628 | { |