aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application/OpenSim.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Application/OpenSim.cs')
-rw-r--r--OpenSim/Region/Application/OpenSim.cs47
1 files changed, 7 insertions, 40 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 6dd1f5b..a18a6fe 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -172,6 +172,13 @@ namespace OpenSim
172 if (userStatsURI != String.Empty) 172 if (userStatsURI != String.Empty)
173 MainServer.Instance.AddStreamHandler(new OpenSim.UXSimStatusHandler(this)); 173 MainServer.Instance.AddStreamHandler(new OpenSim.UXSimStatusHandler(this));
174 174
175 if (managedStatsURI != String.Empty)
176 {
177 string urlBase = String.Format("/{0}/", managedStatsURI);
178 MainServer.Instance.AddHTTPHandler(urlBase, StatsManager.HandleStatsRequest);
179 m_log.InfoFormat("[OPENSIM] Enabling remote managed stats fetch. URL = {0}", urlBase);
180 }
181
175 if (m_console is RemoteConsole) 182 if (m_console is RemoteConsole)
176 { 183 {
177 if (m_consolePort == 0) 184 if (m_consolePort == 0)
@@ -348,18 +355,6 @@ namespace OpenSim
348 m_console.Commands.AddCommand("Regions", false, "delete-region", 355 m_console.Commands.AddCommand("Regions", false, "delete-region",
349 "delete-region <name>", 356 "delete-region <name>",
350 "Delete a region from disk", RunCommand); 357 "Delete a region from disk", RunCommand);
351
352 m_console.Commands.AddCommand("General", false, "modules list",
353 "modules list",
354 "List modules", HandleModules);
355
356 m_console.Commands.AddCommand("General", false, "modules load",
357 "modules load <name>",
358 "Load a module", HandleModules);
359
360 m_console.Commands.AddCommand("General", false, "modules unload",
361 "modules unload <name>",
362 "Unload a module", HandleModules);
363 } 358 }
364 359
365 protected override void ShutdownSpecific() 360 protected override void ShutdownSpecific()
@@ -557,34 +552,6 @@ namespace OpenSim
557 } 552 }
558 553
559 /// <summary> 554 /// <summary>
560 /// Load, Unload, and list Region modules in use
561 /// </summary>
562 /// <param name="module"></param>
563 /// <param name="cmd"></param>
564 private void HandleModules(string module, string[] cmd)
565 {
566 List<string> args = new List<string>(cmd);
567 args.RemoveAt(0);
568 string[] cmdparams = args.ToArray();
569
570 if (cmdparams.Length > 0)
571 {
572 switch (cmdparams[0].ToLower())
573 {
574 case "list":
575 //TODO: Convert to new region modules
576 break;
577 case "unload":
578 //TODO: Convert to new region modules
579 break;
580 case "load":
581 //TODO: Convert to new region modules
582 break;
583 }
584 }
585 }
586
587 /// <summary>
588 /// Runs commands issued by the server console from the operator 555 /// Runs commands issued by the server console from the operator
589 /// </summary> 556 /// </summary>
590 /// <param name="command">The first argument of the parameter (the command)</param> 557 /// <param name="command">The first argument of the parameter (the command)</param>