aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application
diff options
context:
space:
mode:
authorAdam Frisby2008-05-01 14:45:56 +0000
committerAdam Frisby2008-05-01 14:45:56 +0000
commit4692e92312ceacf414629eb78f6d0725a2eb2ca5 (patch)
tree34da13ca5f7f19fc447f4fd341a43703183cfd55 /OpenSim/Region/Application
parentUpdate svn properties. Minor formatting cleanup. (diff)
downloadopensim-SC_OLD-4692e92312ceacf414629eb78f6d0725a2eb2ca5.zip
opensim-SC_OLD-4692e92312ceacf414629eb78f6d0725a2eb2ca5.tar.gz
opensim-SC_OLD-4692e92312ceacf414629eb78f6d0725a2eb2ca5.tar.bz2
opensim-SC_OLD-4692e92312ceacf414629eb78f6d0725a2eb2ca5.tar.xz
* Assorted spring cleanings.
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs5
-rw-r--r--OpenSim/Region/Application/OpenSimMainConsole.cs32
2 files changed, 11 insertions, 26 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index cad0380..e89db3d 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -26,21 +26,17 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections;
30using System.Collections.Generic; 29using System.Collections.Generic;
31using System.IO; 30using System.IO;
32using System.Net;
33using System.Reflection; 31using System.Reflection;
34using System.Text; 32using System.Text;
35using System.Threading; 33using System.Threading;
36using System.Timers;
37using libsecondlife; 34using libsecondlife;
38using log4net; 35using log4net;
39using Mono.Addins; 36using Mono.Addins;
40using Nini.Config; 37using Nini.Config;
41using OpenSim.Framework; 38using OpenSim.Framework;
42using OpenSim.Framework.Communications.Cache; 39using OpenSim.Framework.Communications.Cache;
43using OpenSim.Framework.Console;
44using OpenSim.Framework.Servers; 40using OpenSim.Framework.Servers;
45using OpenSim.Framework.Statistics; 41using OpenSim.Framework.Statistics;
46using OpenSim.Region.ClientStack; 42using OpenSim.Region.ClientStack;
@@ -50,7 +46,6 @@ using OpenSim.Region.Environment;
50using OpenSim.Region.Environment.Interfaces; 46using OpenSim.Region.Environment.Interfaces;
51using OpenSim.Region.Environment.Scenes; 47using OpenSim.Region.Environment.Scenes;
52using OpenSim.Region.Physics.Manager; 48using OpenSim.Region.Physics.Manager;
53using Timer=System.Timers.Timer;
54 49
55namespace OpenSim 50namespace OpenSim
56{ 51{
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
28using System; 28using System;
29using System.Collections;
29using System.Collections.Generic; 30using System.Collections.Generic;
30using System.Diagnostics;
31using System.IO; 31using System.IO;
32using System.Text; 32using System.Net;
33using System.Reflection;
33using System.Threading; 34using System.Threading;
34using System.Timers; 35using System.Timers;
36using libsecondlife;
37using log4net;
35using Nini.Config; 38using Nini.Config;
36using OpenSim.Framework; 39using OpenSim.Framework;
37using OpenSim.Framework.Communications.Cache;
38using OpenSim.Framework.Console; 40using OpenSim.Framework.Console;
39using OpenSim.Framework.Servers;
40using OpenSim.Framework.Statistics; 41using OpenSim.Framework.Statistics;
41using OpenSim.Region.ClientStack; 42using OpenSim.Region.ClientStack;
42using OpenSim.Region.Communications.Local;
43using OpenSim.Region.Communications.OGS1;
44using OpenSim.Region.Environment;
45using OpenSim.Region.Environment.Interfaces; 43using OpenSim.Region.Environment.Interfaces;
46using OpenSim.Region.Environment.Scenes; 44using OpenSim.Region.Environment.Scenes;
47using OpenSim.Region.Physics.Manager;
48using Timer=System.Timers.Timer; 45using Timer=System.Timers.Timer;
49using System.Net;
50using Nwc.XmlRpc;
51using System.Collections;
52using System.Reflection;
53using libsecondlife;
54using Mono.Addins;
55using Mono.Addins.Description;
56 46
57namespace OpenSim 47namespace 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 {