diff options
Diffstat (limited to 'OpenSim/Region/Application/OpenSimMain.cs')
-rw-r--r-- | OpenSim/Region/Application/OpenSimMain.cs | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs index d6dc3ea..64fe8df 100644 --- a/OpenSim/Region/Application/OpenSimMain.cs +++ b/OpenSim/Region/Application/OpenSimMain.cs | |||
@@ -449,7 +449,7 @@ namespace OpenSim | |||
449 | 449 | ||
450 | public void handleRestartRegion(RegionInfo whichRegion) | 450 | public void handleRestartRegion(RegionInfo whichRegion) |
451 | { | 451 | { |
452 | MainLog.Instance.Error("MAIN", "Got Restart Singlal from SceneManager"); | 452 | MainLog.Instance.Error("MAIN", "Got restart signal from SceneManager"); |
453 | // Shutting down the UDP server | 453 | // Shutting down the UDP server |
454 | bool foundUDPServer = false; | 454 | bool foundUDPServer = false; |
455 | int UDPServerElement = 0; | 455 | int UDPServerElement = 0; |
@@ -543,7 +543,7 @@ namespace OpenSim | |||
543 | m_log.Verbose("SHUTDOWN", "Closing all threads"); | 543 | m_log.Verbose("SHUTDOWN", "Closing all threads"); |
544 | m_log.Verbose("SHUTDOWN", "Killing listener thread"); | 544 | m_log.Verbose("SHUTDOWN", "Killing listener thread"); |
545 | m_log.Verbose("SHUTDOWN", "Killing clients"); | 545 | m_log.Verbose("SHUTDOWN", "Killing clients"); |
546 | // IMPLEMENT THIS | 546 | // TODO: implement this |
547 | m_log.Verbose("SHUTDOWN", "Closing console and terminating"); | 547 | m_log.Verbose("SHUTDOWN", "Closing console and terminating"); |
548 | 548 | ||
549 | m_sceneManager.Close(); | 549 | m_sceneManager.Close(); |
@@ -789,10 +789,7 @@ namespace OpenSim | |||
789 | { | 789 | { |
790 | string regionName = CombineParams(cmdparams, 0); | 790 | string regionName = CombineParams(cmdparams, 0); |
791 | 791 | ||
792 | if (m_sceneManager.TrySetCurrentScene(regionName)) | 792 | if (!m_sceneManager.TrySetCurrentScene(regionName)) |
793 | { | ||
794 | } | ||
795 | else | ||
796 | { | 793 | { |
797 | MainLog.Instance.Error("Couldn't set current region to: " + regionName); | 794 | MainLog.Instance.Error("Couldn't set current region to: " + regionName); |
798 | } | 795 | } |
@@ -812,16 +809,14 @@ namespace OpenSim | |||
812 | break; | 809 | break; |
813 | 810 | ||
814 | case "export-map": | 811 | case "export-map": |
815 | 812 | if (cmdparams.Length > 0) | |
816 | if (cmdparams.Length > 0) | 813 | { |
817 | { | 814 | m_sceneManager.CurrentOrFirstScene.ExportWorldMap(cmdparams[0]); |
818 | m_sceneManager.CurrentOrFirstScene.ExportWorldMap(cmdparams[0]); | 815 | } |
819 | } | 816 | else |
820 | else | 817 | { |
821 | { | 818 | m_sceneManager.CurrentOrFirstScene.ExportWorldMap("exportmap.jpg"); |
822 | m_sceneManager.CurrentOrFirstScene.ExportWorldMap("exportmap.jpg"); | 819 | } |
823 | } | ||
824 | |||
825 | break; | 820 | break; |
826 | 821 | ||
827 | default: | 822 | default: |