diff options
author | Jeff Ames | 2007-12-06 17:41:21 +0000 |
---|---|---|
committer | Jeff Ames | 2007-12-06 17:41:21 +0000 |
commit | a47176ee9287cc2802007e9cd1eb15e2a0b04906 (patch) | |
tree | a0ebc88b9a87e7d39e9a315599eb3fdc4c149a93 /OpenSim/Region/Application | |
parent | * now the throttle timer is stopped whilst processing Queue so that it won't ... (diff) | |
download | opensim-SC-a47176ee9287cc2802007e9cd1eb15e2a0b04906.zip opensim-SC-a47176ee9287cc2802007e9cd1eb15e2a0b04906.tar.gz opensim-SC-a47176ee9287cc2802007e9cd1eb15e2a0b04906.tar.bz2 opensim-SC-a47176ee9287cc2802007e9cd1eb15e2a0b04906.tar.xz |
more minor cleanup. added some command descriptions to region server help.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Application/OpenSimMain.cs | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs index 9ad6c5f..d6dc3ea 100644 --- a/OpenSim/Region/Application/OpenSimMain.cs +++ b/OpenSim/Region/Application/OpenSimMain.cs | |||
@@ -443,10 +443,11 @@ namespace OpenSim | |||
443 | 443 | ||
444 | m_assetCache = new AssetCache(assetServer, m_log); | 444 | m_assetCache = new AssetCache(assetServer, m_log); |
445 | // m_assetCache = new assetCache("OpenSim.Region.GridInterfaces.Local.dll", m_networkServersInfo.AssetURL, m_networkServersInfo.AssetSendKey); | 445 | // m_assetCache = new assetCache("OpenSim.Region.GridInterfaces.Local.dll", m_networkServersInfo.AssetURL, m_networkServersInfo.AssetSendKey); |
446 | m_sceneManager.OnReStartSim += handleReStartRegion; | 446 | m_sceneManager.OnRestartSim += handleRestartRegion; |
447 | 447 | ||
448 | } | 448 | } |
449 | public void handleReStartRegion(RegionInfo whichRegion) | 449 | |
450 | public void handleRestartRegion(RegionInfo whichRegion) | ||
450 | { | 451 | { |
451 | MainLog.Instance.Error("MAIN", "Got Restart Singlal from SceneManager"); | 452 | MainLog.Instance.Error("MAIN", "Got Restart Singlal from SceneManager"); |
452 | // Shutting down the UDP server | 453 | // Shutting down the UDP server |
@@ -455,7 +456,6 @@ namespace OpenSim | |||
455 | 456 | ||
456 | for (int i = 0; i < m_udpServers.Count; i++) | 457 | for (int i = 0; i < m_udpServers.Count; i++) |
457 | { | 458 | { |
458 | |||
459 | if (m_udpServers[i].RegionHandle == whichRegion.RegionHandle) | 459 | if (m_udpServers[i].RegionHandle == whichRegion.RegionHandle) |
460 | { | 460 | { |
461 | UDPServerElement = i; | 461 | UDPServerElement = i; |
@@ -486,7 +486,6 @@ namespace OpenSim | |||
486 | UDPServer restartingRegion = CreateRegion(whichRegion); | 486 | UDPServer restartingRegion = CreateRegion(whichRegion); |
487 | restartingRegion.ServerListener(); | 487 | restartingRegion.ServerListener(); |
488 | //m_sceneManager.SendSimOnlineNotification(restartingRegion.RegionHandle); | 488 | //m_sceneManager.SendSimOnlineNotification(restartingRegion.RegionHandle); |
489 | |||
490 | } | 489 | } |
491 | 490 | ||
492 | protected override LogBase CreateLog() | 491 | protected override LogBase CreateLog() |
@@ -536,7 +535,6 @@ namespace OpenSim | |||
536 | /// </summary> | 535 | /// </summary> |
537 | public virtual void Shutdown() | 536 | public virtual void Shutdown() |
538 | { | 537 | { |
539 | |||
540 | if (m_startupCommandsFile != "") | 538 | if (m_startupCommandsFile != "") |
541 | { | 539 | { |
542 | RunCommandScript(m_shutdownCommandsFile); | 540 | RunCommandScript(m_shutdownCommandsFile); |
@@ -609,7 +607,6 @@ namespace OpenSim | |||
609 | m_sceneManager.ForceCurrentSceneClientUpdate(); | 607 | m_sceneManager.ForceCurrentSceneClientUpdate(); |
610 | break; | 608 | break; |
611 | 609 | ||
612 | |||
613 | case "edit-scale": | 610 | case "edit-scale": |
614 | if (cmdparams.Length == 4) | 611 | if (cmdparams.Length == 4) |
615 | { | 612 | { |
@@ -629,21 +626,27 @@ namespace OpenSim | |||
629 | m_log.Error(" alert [First] [Last] [Message] - send an alert to a user. Case sensitive."); | 626 | m_log.Error(" alert [First] [Last] [Message] - send an alert to a user. Case sensitive."); |
630 | m_log.Error(" alert general [Message] - send an alert to all users."); | 627 | m_log.Error(" alert general [Message] - send an alert to all users."); |
631 | m_log.Error("backup - trigger a simulator backup"); | 628 | m_log.Error("backup - trigger a simulator backup"); |
629 | m_log.Error("change-region - sets the region that many of these commands affect."); | ||
632 | m_log.Error("command-script [filename] - Execute command in a file."); | 630 | m_log.Error("command-script [filename] - Execute command in a file."); |
633 | m_log.Error("debug - debugging commands"); | 631 | m_log.Error("debug - debugging commands"); |
634 | m_log.Error(" packet 0..255 - print incoming/outgoing packets (0=off)"); | 632 | m_log.Error(" packet 0..255 - print incoming/outgoing packets (0=off)"); |
633 | m_log.Error("edit-scale [prim name] [x] [y] [z] - resize given prim"); | ||
634 | m_log.Error("export-map [filename] - save image of world map"); | ||
635 | m_log.Error("force-update - force an update of prims in the scene"); | 635 | m_log.Error("force-update - force an update of prims in the scene"); |
636 | m_log.Error("load-xml [filename] - load prims from XML"); | 636 | m_log.Error("load-xml [filename] - load prims from XML"); |
637 | m_log.Error("load-xml2 [filename] - load prims from XML using version 2 format"); | ||
638 | m_log.Error("permissions [true/false] - turn on/off permissions on the scene"); | ||
639 | m_log.Error("quit - equivalent to shutdown."); | ||
640 | m_log.Error("restart - disconnects all clients and restarts the sims in the instance."); | ||
637 | m_log.Error("save-xml [filename] - save prims to XML"); | 641 | m_log.Error("save-xml [filename] - save prims to XML"); |
642 | m_log.Error("save-xml2 [filename] - save prims to XML using version 2 format"); | ||
638 | m_log.Error("script - manually trigger scripts? or script commands?"); | 643 | m_log.Error("script - manually trigger scripts? or script commands?"); |
644 | m_log.Error("set-time [x] - set the current scene time phase"); | ||
639 | m_log.Error("show uptime - show simulator startup and uptime."); | 645 | m_log.Error("show uptime - show simulator startup and uptime."); |
640 | m_log.Error("show users - show info about connected users."); | 646 | m_log.Error("show users - show info about connected users."); |
641 | m_log.Error("show modules - shows info aboutloaded modules."); | 647 | m_log.Error("show modules - shows info aboutloaded modules."); |
642 | m_log.Error("change-region - sets the region that many of these commands affect."); | ||
643 | m_log.Error("restart - disconnects all clients and restarts the sims in the instance."); | ||
644 | m_log.Error("shutdown - disconnect all clients and shutdown."); | 648 | m_log.Error("shutdown - disconnect all clients and shutdown."); |
645 | m_log.Error("terrain help - show help for terrain commands."); | 649 | m_log.Error("terrain help - show help for terrain commands."); |
646 | m_log.Error("quit - equivalent to shutdown."); | ||
647 | break; | 650 | break; |
648 | 651 | ||
649 | case "show": | 652 | case "show": |
@@ -734,9 +737,7 @@ namespace OpenSim | |||
734 | case "permissions": | 737 | case "permissions": |
735 | // Treats each user as a super-admin when disabled | 738 | // Treats each user as a super-admin when disabled |
736 | bool permissions = Convert.ToBoolean(cmdparams[0]); | 739 | bool permissions = Convert.ToBoolean(cmdparams[0]); |
737 | |||
738 | m_sceneManager.SetBypassPermissionsOnCurrentScene(!permissions); | 740 | m_sceneManager.SetBypassPermissionsOnCurrentScene(!permissions); |
739 | |||
740 | break; | 741 | break; |
741 | 742 | ||
742 | case "backup": | 743 | case "backup": |
@@ -778,6 +779,7 @@ namespace OpenSim | |||
778 | case "shutdown": | 779 | case "shutdown": |
779 | Shutdown(); | 780 | Shutdown(); |
780 | break; | 781 | break; |
782 | |||
781 | case "restart": | 783 | case "restart": |
782 | m_sceneManager.RestartCurrentScene(); | 784 | m_sceneManager.RestartCurrentScene(); |
783 | break; | 785 | break; |