aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application/OpenSimMainConsole.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Application/OpenSimMainConsole.cs24
1 files changed, 12 insertions, 12 deletions
diff --git a/OpenSim/Region/Application/OpenSimMainConsole.cs b/OpenSim/Region/Application/OpenSimMainConsole.cs
index 2381f57..1b2600c 100644
--- a/OpenSim/Region/Application/OpenSimMainConsole.cs
+++ b/OpenSim/Region/Application/OpenSimMainConsole.cs
@@ -47,7 +47,7 @@ namespace OpenSim
47 public delegate void ConsoleCommand(string[] comParams); 47 public delegate void ConsoleCommand(string[] comParams);
48 48
49 public class OpenSimMainConsole : OpenSimMain, conscmd_callback 49 public class OpenSimMainConsole : OpenSimMain, conscmd_callback
50 { 50 {
51 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 51 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
52 52
53 protected string m_startupCommandsFile; 53 protected string m_startupCommandsFile;
@@ -83,12 +83,12 @@ namespace OpenSim
83 // 83 //
84 // Called from app startup (OpenSim.Application) 84 // Called from app startup (OpenSim.Application)
85 // 85 //
86 86
87 m_log.Info("===================================================================="); 87 m_log.Info("====================================================================");
88 m_log.Info("========================= STARTING OPENSIM ========================="); 88 m_log.Info("========================= STARTING OPENSIM =========================");
89 m_log.Info("===================================================================="); 89 m_log.Info("====================================================================");
90 m_log.InfoFormat("[OPENSIM MAIN]: Running in {0} mode", (m_sandbox ? "sandbox" : "grid")); 90 m_log.InfoFormat("[OPENSIM MAIN]: Running in {0} mode", (m_sandbox ? "sandbox" : "grid"));
91 91
92 m_console = CreateConsole(); 92 m_console = CreateConsole();
93 MainConsole.Instance = m_console; 93 MainConsole.Instance = m_console;
94 InternalStartUp(); 94 InternalStartUp();
@@ -111,7 +111,7 @@ namespace OpenSim
111 m_scriptTimer.Interval = 1200 * 1000; 111 m_scriptTimer.Interval = 1200 * 1000;
112 m_scriptTimer.Elapsed += RunAutoTimerScript; 112 m_scriptTimer.Elapsed += RunAutoTimerScript;
113 } 113 }
114 114
115 PrintFileToConsole("startuplogo.txt"); 115 PrintFileToConsole("startuplogo.txt");
116 } 116 }
117 117
@@ -131,7 +131,7 @@ namespace OpenSim
131 #region Console Commands 131 #region Console Commands
132 132
133 /// <summary> 133 /// <summary>
134 /// 134 ///
135 /// </summary> 135 /// </summary>
136 /// <param name="fileName"></param> 136 /// <param name="fileName"></param>
137 private void RunCommandScript(string fileName) 137 private void RunCommandScript(string fileName)
@@ -178,7 +178,7 @@ namespace OpenSim
178 public override void RunCmd(string command, string[] cmdparams) 178 public override void RunCmd(string command, string[] cmdparams)
179 { 179 {
180 base.RunCmd(command, cmdparams); 180 base.RunCmd(command, cmdparams);
181 181
182 switch (command) 182 switch (command)
183 { 183 {
184 case "clear-assets": 184 case "clear-assets":
@@ -252,7 +252,7 @@ namespace OpenSim
252 m_console.Notice("set-time [x] - set the current scene time phase"); 252 m_console.Notice("set-time [x] - set the current scene time phase");
253 m_console.Notice("show assets - show state of asset cache."); 253 m_console.Notice("show assets - show state of asset cache.");
254 m_console.Notice("show users - show info about connected users."); 254 m_console.Notice("show users - show info about connected users.");
255 m_console.Notice("show modules - shows info about loaded modules."); 255 m_console.Notice("show modules - shows info about loaded modules.");
256 m_console.Notice("show version - show the running build version."); 256 m_console.Notice("show version - show the running build version.");
257 m_console.Notice("threads - list threads"); 257 m_console.Notice("threads - list threads");
258 m_console.Notice("config set section field value - set a config value"); 258 m_console.Notice("config set section field value - set a config value");
@@ -264,7 +264,7 @@ namespace OpenSim
264 case "threads": 264 case "threads":
265// m_console.Notice("THREAD", Process.GetCurrentProcess().Threads.Count + " threads running:"); 265// m_console.Notice("THREAD", Process.GetCurrentProcess().Threads.Count + " threads running:");
266// int _tc = 0; 266// int _tc = 0;
267 267
268// foreach (ProcessThread pt in Process.GetCurrentProcess().Threads) 268// foreach (ProcessThread pt in Process.GetCurrentProcess().Threads)
269// { 269// {
270// _tc++; 270// _tc++;
@@ -388,7 +388,7 @@ namespace OpenSim
388 if (m_sceneManager.TryGetScene(regName, out killScene)) 388 if (m_sceneManager.TryGetScene(regName, out killScene))
389 { 389 {
390 // only need to check this if we are not at the 390 // only need to check this if we are not at the
391 // root level 391 // root level
392 if ((m_sceneManager.CurrentScene != null) && 392 if ((m_sceneManager.CurrentScene != null) &&
393 (m_sceneManager.CurrentScene.RegionInfo.RegionID == killScene.RegionInfo.RegionID)) 393 (m_sceneManager.CurrentScene.RegionInfo.RegionID == killScene.RegionInfo.RegionID))
394 { 394 {
@@ -520,7 +520,7 @@ namespace OpenSim
520 { 520 {
521 foreach (Scene s in new ArrayList(m_sceneManager.Scenes)) 521 foreach (Scene s in new ArrayList(m_sceneManager.Scenes))
522 { 522 {
523 523
524 m_console.Notice("Loading module: " + cmdparams[1]); 524 m_console.Notice("Loading module: " + cmdparams[1]);
525 m_moduleLoader.LoadRegionModules(cmdparams[1], s); 525 m_moduleLoader.LoadRegionModules(cmdparams[1], s);
526 } 526 }
@@ -529,7 +529,7 @@ namespace OpenSim
529 } 529 }
530 } 530 }
531 531
532 break; 532 break;
533 default: 533 default:
534 string[] tmpPluginArgs = new string[cmdparams.Length + 1]; 534 string[] tmpPluginArgs = new string[cmdparams.Length + 1];
535 cmdparams.CopyTo(tmpPluginArgs, 1); 535 cmdparams.CopyTo(tmpPluginArgs, 1);
@@ -570,7 +570,7 @@ namespace OpenSim
570 public override void Show(string ShowWhat) 570 public override void Show(string ShowWhat)
571 { 571 {
572 base.Show(ShowWhat); 572 base.Show(ShowWhat);
573 573
574 switch (ShowWhat) 574 switch (ShowWhat)
575 { 575 {
576 case "assets": 576 case "assets":