diff options
author | Melanie Thielker | 2017-01-05 19:07:37 +0000 |
---|---|---|
committer | Melanie Thielker | 2017-01-05 19:07:37 +0000 |
commit | b16abc8166c29585cb76cc55c3bdd76e5833cb4f (patch) | |
tree | 6a34f465a74b7a3a6dc00a3d7aa8dcc25ac3e3a5 /OpenSim/Region/Application/OpenSim.cs | |
parent | Make it possible to disable the bakes module in the way it is described in co... (diff) | |
download | opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.zip opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.gz opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.bz2 opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.xz |
Massive tab and trailing space cleanup
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Application/OpenSim.cs | 76 |
1 files changed, 38 insertions, 38 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index d9fdcde..8022b1e 100644 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs | |||
@@ -135,7 +135,7 @@ namespace OpenSim | |||
135 | { | 135 | { |
136 | // Wait for a signal to be delivered | 136 | // Wait for a signal to be delivered |
137 | int index = Mono.Unix.UnixSignal.WaitAny (signals, -1); | 137 | int index = Mono.Unix.UnixSignal.WaitAny (signals, -1); |
138 | 138 | ||
139 | //Mono.Unix.Native.Signum signal = signals [index].Signum; | 139 | //Mono.Unix.Native.Signum signal = signals [index].Signum; |
140 | MainConsole.Instance.RunCommand("shutdown"); | 140 | MainConsole.Instance.RunCommand("shutdown"); |
141 | } | 141 | } |
@@ -273,17 +273,17 @@ namespace OpenSim | |||
273 | 273 | ||
274 | m_console.Commands.AddCommand("General", false, "change region", | 274 | m_console.Commands.AddCommand("General", false, "change region", |
275 | "change region <region name>", | 275 | "change region <region name>", |
276 | "Change current console region", | 276 | "Change current console region", |
277 | ChangeSelectedRegion); | 277 | ChangeSelectedRegion); |
278 | 278 | ||
279 | m_console.Commands.AddCommand("Archiving", false, "save xml", | 279 | m_console.Commands.AddCommand("Archiving", false, "save xml", |
280 | "save xml [<file name>]", | 280 | "save xml [<file name>]", |
281 | "Save a region's data in XML format", | 281 | "Save a region's data in XML format", |
282 | SaveXml); | 282 | SaveXml); |
283 | 283 | ||
284 | m_console.Commands.AddCommand("Archiving", false, "save xml2", | 284 | m_console.Commands.AddCommand("Archiving", false, "save xml2", |
285 | "save xml2 [<file name>]", | 285 | "save xml2 [<file name>]", |
286 | "Save a region's data in XML2 format", | 286 | "Save a region's data in XML2 format", |
287 | SaveXml2); | 287 | SaveXml2); |
288 | 288 | ||
289 | m_console.Commands.AddCommand("Archiving", false, "load xml", | 289 | m_console.Commands.AddCommand("Archiving", false, "load xml", |
@@ -293,12 +293,12 @@ namespace OpenSim | |||
293 | 293 | ||
294 | m_console.Commands.AddCommand("Archiving", false, "load xml2", | 294 | m_console.Commands.AddCommand("Archiving", false, "load xml2", |
295 | "load xml2 [<file name>]", | 295 | "load xml2 [<file name>]", |
296 | "Load a region's data from XML2 format", | 296 | "Load a region's data from XML2 format", |
297 | LoadXml2); | 297 | LoadXml2); |
298 | 298 | ||
299 | m_console.Commands.AddCommand("Archiving", false, "save prims xml2", | 299 | m_console.Commands.AddCommand("Archiving", false, "save prims xml2", |
300 | "save prims xml2 [<prim name> <file name>]", | 300 | "save prims xml2 [<prim name> <file name>]", |
301 | "Save named prim to XML2", | 301 | "Save named prim to XML2", |
302 | SavePrimsXml2); | 302 | SavePrimsXml2); |
303 | 303 | ||
304 | m_console.Commands.AddCommand("Archiving", false, "load oar", | 304 | m_console.Commands.AddCommand("Archiving", false, "load oar", |
@@ -352,7 +352,7 @@ namespace OpenSim | |||
352 | 352 | ||
353 | m_console.Commands.AddCommand("Objects", false, "edit scale", | 353 | m_console.Commands.AddCommand("Objects", false, "edit scale", |
354 | "edit scale <name> <x> <y> <z>", | 354 | "edit scale <name> <x> <y> <z>", |
355 | "Change the scale of a named prim", | 355 | "Change the scale of a named prim", |
356 | HandleEditScale); | 356 | HandleEditScale); |
357 | 357 | ||
358 | m_console.Commands.AddCommand("Objects", false, "rotate scene", | 358 | m_console.Commands.AddCommand("Objects", false, "rotate scene", |
@@ -379,44 +379,44 @@ namespace OpenSim | |||
379 | 379 | ||
380 | m_console.Commands.AddCommand("Users", false, "show users", | 380 | m_console.Commands.AddCommand("Users", false, "show users", |
381 | "show users [full]", | 381 | "show users [full]", |
382 | "Show user data for users currently on the region", | 382 | "Show user data for users currently on the region", |
383 | "Without the 'full' option, only users actually on the region are shown." | 383 | "Without the 'full' option, only users actually on the region are shown." |
384 | + " With the 'full' option child agents of users in neighbouring regions are also shown.", | 384 | + " With the 'full' option child agents of users in neighbouring regions are also shown.", |
385 | HandleShow); | 385 | HandleShow); |
386 | 386 | ||
387 | m_console.Commands.AddCommand("Comms", false, "show connections", | 387 | m_console.Commands.AddCommand("Comms", false, "show connections", |
388 | "show connections", | 388 | "show connections", |
389 | "Show connection data", | 389 | "Show connection data", |
390 | HandleShow); | 390 | HandleShow); |
391 | 391 | ||
392 | m_console.Commands.AddCommand("Comms", false, "show circuits", | 392 | m_console.Commands.AddCommand("Comms", false, "show circuits", |
393 | "show circuits", | 393 | "show circuits", |
394 | "Show agent circuit data", | 394 | "Show agent circuit data", |
395 | HandleShow); | 395 | HandleShow); |
396 | 396 | ||
397 | m_console.Commands.AddCommand("Comms", false, "show pending-objects", | 397 | m_console.Commands.AddCommand("Comms", false, "show pending-objects", |
398 | "show pending-objects", | 398 | "show pending-objects", |
399 | "Show # of objects on the pending queues of all scene viewers", | 399 | "Show # of objects on the pending queues of all scene viewers", |
400 | HandleShow); | 400 | HandleShow); |
401 | 401 | ||
402 | m_console.Commands.AddCommand("General", false, "show modules", | 402 | m_console.Commands.AddCommand("General", false, "show modules", |
403 | "show modules", | 403 | "show modules", |
404 | "Show module data", | 404 | "Show module data", |
405 | HandleShow); | 405 | HandleShow); |
406 | 406 | ||
407 | m_console.Commands.AddCommand("Regions", false, "show regions", | 407 | m_console.Commands.AddCommand("Regions", false, "show regions", |
408 | "show regions", | 408 | "show regions", |
409 | "Show region data", | 409 | "Show region data", |
410 | HandleShow); | 410 | HandleShow); |
411 | 411 | ||
412 | m_console.Commands.AddCommand("Regions", false, "show ratings", | 412 | m_console.Commands.AddCommand("Regions", false, "show ratings", |
413 | "show ratings", | 413 | "show ratings", |
414 | "Show rating data", | 414 | "Show rating data", |
415 | HandleShow); | 415 | HandleShow); |
416 | 416 | ||
417 | m_console.Commands.AddCommand("Objects", false, "backup", | 417 | m_console.Commands.AddCommand("Objects", false, "backup", |
418 | "backup", | 418 | "backup", |
419 | "Persist currently unsaved object changes immediately instead of waiting for the normal persistence call.", | 419 | "Persist currently unsaved object changes immediately instead of waiting for the normal persistence call.", |
420 | RunCommand); | 420 | RunCommand); |
421 | 421 | ||
422 | m_console.Commands.AddCommand("Regions", false, "create region", | 422 | m_console.Commands.AddCommand("Regions", false, "create region", |
@@ -430,22 +430,22 @@ namespace OpenSim | |||
430 | 430 | ||
431 | m_console.Commands.AddCommand("Regions", false, "restart", | 431 | m_console.Commands.AddCommand("Regions", false, "restart", |
432 | "restart", | 432 | "restart", |
433 | "Restart the currently selected region(s) in this instance", | 433 | "Restart the currently selected region(s) in this instance", |
434 | RunCommand); | 434 | RunCommand); |
435 | 435 | ||
436 | m_console.Commands.AddCommand("General", false, "command-script", | 436 | m_console.Commands.AddCommand("General", false, "command-script", |
437 | "command-script <script>", | 437 | "command-script <script>", |
438 | "Run a command script from file", | 438 | "Run a command script from file", |
439 | RunCommand); | 439 | RunCommand); |
440 | 440 | ||
441 | m_console.Commands.AddCommand("Regions", false, "remove-region", | 441 | m_console.Commands.AddCommand("Regions", false, "remove-region", |
442 | "remove-region <name>", | 442 | "remove-region <name>", |
443 | "Remove a region from this simulator", | 443 | "Remove a region from this simulator", |
444 | RunCommand); | 444 | RunCommand); |
445 | 445 | ||
446 | m_console.Commands.AddCommand("Regions", false, "delete-region", | 446 | m_console.Commands.AddCommand("Regions", false, "delete-region", |
447 | "delete-region <name>", | 447 | "delete-region <name>", |
448 | "Delete a region from disk", | 448 | "Delete a region from disk", |
449 | RunCommand); | 449 | RunCommand); |
450 | 450 | ||
451 | m_console.Commands.AddCommand("Estates", false, "estate create", | 451 | m_console.Commands.AddCommand("Estates", false, "estate create", |
@@ -476,7 +476,7 @@ namespace OpenSim | |||
476 | { | 476 | { |
477 | RunCommandScript(m_shutdownCommandsFile); | 477 | RunCommandScript(m_shutdownCommandsFile); |
478 | } | 478 | } |
479 | 479 | ||
480 | base.ShutdownSpecific(); | 480 | base.ShutdownSpecific(); |
481 | } | 481 | } |
482 | 482 | ||
@@ -515,7 +515,7 @@ namespace OpenSim | |||
515 | private void KickUserCommand(string module, string[] cmdparams) | 515 | private void KickUserCommand(string module, string[] cmdparams) |
516 | { | 516 | { |
517 | bool force = false; | 517 | bool force = false; |
518 | 518 | ||
519 | OptionSet options = new OptionSet().Add("f|force", delegate (string v) { force = v != null; }); | 519 | OptionSet options = new OptionSet().Add("f|force", delegate (string v) { force = v != null; }); |
520 | 520 | ||
521 | List<string> mainParams = options.Parse(cmdparams); | 521 | List<string> mainParams = options.Parse(cmdparams); |
@@ -612,7 +612,7 @@ namespace OpenSim | |||
612 | MainConsole.Instance.Output(usage); | 612 | MainConsole.Instance.Output(usage); |
613 | return; | 613 | return; |
614 | } | 614 | } |
615 | 615 | ||
616 | float angle = (float)(Convert.ToSingle(args[2]) / 180.0 * Math.PI); | 616 | float angle = (float)(Convert.ToSingle(args[2]) / 180.0 * Math.PI); |
617 | OpenMetaverse.Quaternion rot = OpenMetaverse.Quaternion.CreateFromAxisAngle(0, 0, 1, angle); | 617 | OpenMetaverse.Quaternion rot = OpenMetaverse.Quaternion.CreateFromAxisAngle(0, 0, 1, angle); |
618 | 618 | ||
@@ -624,7 +624,7 @@ namespace OpenSim | |||
624 | 624 | ||
625 | Vector3 center = new Vector3(centerX, centerY, 0.0f); | 625 | Vector3 center = new Vector3(centerX, centerY, 0.0f); |
626 | 626 | ||
627 | SceneManager.ForEachSelectedScene(delegate(Scene scene) | 627 | SceneManager.ForEachSelectedScene(delegate(Scene scene) |
628 | { | 628 | { |
629 | scene.ForEachSOG(delegate(SceneObjectGroup sog) | 629 | scene.ForEachSOG(delegate(SceneObjectGroup sog) |
630 | { | 630 | { |
@@ -776,8 +776,8 @@ namespace OpenSim | |||
776 | CreateRegion(regInfo, true, out scene); | 776 | CreateRegion(regInfo, true, out scene); |
777 | 777 | ||
778 | if (changed) | 778 | if (changed) |
779 | m_estateDataService.StoreEstateSettings(regInfo.EstateSettings); | 779 | m_estateDataService.StoreEstateSettings(regInfo.EstateSettings); |
780 | 780 | ||
781 | scene.Start(); | 781 | scene.Start(); |
782 | } | 782 | } |
783 | 783 | ||
@@ -880,8 +880,8 @@ namespace OpenSim | |||
880 | protected override void HandleRestartRegion(RegionInfo whichRegion) | 880 | protected override void HandleRestartRegion(RegionInfo whichRegion) |
881 | { | 881 | { |
882 | base.HandleRestartRegion(whichRegion); | 882 | base.HandleRestartRegion(whichRegion); |
883 | 883 | ||
884 | // Where we are restarting multiple scenes at once, a previous call to RefreshPrompt may have set the | 884 | // Where we are restarting multiple scenes at once, a previous call to RefreshPrompt may have set the |
885 | // m_console.ConsoleScene to null (indicating all scenes). | 885 | // m_console.ConsoleScene to null (indicating all scenes). |
886 | if (m_console.ConsoleScene != null && whichRegion.RegionName == ((Scene)m_console.ConsoleScene).Name) | 886 | if (m_console.ConsoleScene != null && whichRegion.RegionName == ((Scene)m_console.ConsoleScene).Name) |
887 | SceneManager.TrySetCurrentScene(whichRegion.RegionName); | 887 | SceneManager.TrySetCurrentScene(whichRegion.RegionName); |
@@ -914,7 +914,7 @@ namespace OpenSim | |||
914 | { | 914 | { |
915 | agents = SceneManager.GetCurrentSceneAvatars(); | 915 | agents = SceneManager.GetCurrentSceneAvatars(); |
916 | } | 916 | } |
917 | 917 | ||
918 | MainConsole.Instance.Output(String.Format("\nAgents connected: {0}\n", agents.Count)); | 918 | MainConsole.Instance.Output(String.Format("\nAgents connected: {0}\n", agents.Count)); |
919 | 919 | ||
920 | MainConsole.Instance.Output( | 920 | MainConsole.Instance.Output( |
@@ -960,7 +960,7 @@ namespace OpenSim | |||
960 | 960 | ||
961 | case "modules": | 961 | case "modules": |
962 | SceneManager.ForEachSelectedScene( | 962 | SceneManager.ForEachSelectedScene( |
963 | scene => | 963 | scene => |
964 | { | 964 | { |
965 | MainConsole.Instance.OutputFormat("Loaded region modules in {0} are:", scene.Name); | 965 | MainConsole.Instance.OutputFormat("Loaded region modules in {0} are:", scene.Name); |
966 | 966 | ||
@@ -996,16 +996,16 @@ namespace OpenSim | |||
996 | cdt.AddColumn("Ready?", 6); | 996 | cdt.AddColumn("Ready?", 6); |
997 | cdt.AddColumn("Estate", ConsoleDisplayUtil.EstateNameSize); | 997 | cdt.AddColumn("Estate", ConsoleDisplayUtil.EstateNameSize); |
998 | SceneManager.ForEachScene( | 998 | SceneManager.ForEachScene( |
999 | scene => | 999 | scene => |
1000 | { | 1000 | { |
1001 | RegionInfo ri = scene.RegionInfo; | 1001 | RegionInfo ri = scene.RegionInfo; |
1002 | cdt.AddRow( | 1002 | cdt.AddRow( |
1003 | ri.RegionName, | 1003 | ri.RegionName, |
1004 | ri.RegionID, | 1004 | ri.RegionID, |
1005 | string.Format("{0},{1}", ri.RegionLocX, ri.RegionLocY), | 1005 | string.Format("{0},{1}", ri.RegionLocX, ri.RegionLocY), |
1006 | string.Format("{0}x{1}", ri.RegionSizeX, ri.RegionSizeY), | 1006 | string.Format("{0}x{1}", ri.RegionSizeX, ri.RegionSizeY), |
1007 | ri.InternalEndPoint.Port, | 1007 | ri.InternalEndPoint.Port, |
1008 | scene.Ready ? "Yes" : "No", | 1008 | scene.Ready ? "Yes" : "No", |
1009 | ri.EstateSettings.EstateName); | 1009 | ri.EstateSettings.EstateName); |
1010 | } | 1010 | } |
1011 | ); | 1011 | ); |