aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r--OpenSim/Region/Application/IApplicationPlugin.cs31
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs27
2 files changed, 40 insertions, 18 deletions
diff --git a/OpenSim/Region/Application/IApplicationPlugin.cs b/OpenSim/Region/Application/IApplicationPlugin.cs
index adbc625..0e66330 100644
--- a/OpenSim/Region/Application/IApplicationPlugin.cs
+++ b/OpenSim/Region/Application/IApplicationPlugin.cs
@@ -1,4 +1,32 @@
1using System; 1/*
2* Copyright (c) Contributors, http://opensimulator.org/
3* See CONTRIBUTORS.TXT for a full list of copyright holders.
4*
5* Redistribution and use in source and binary forms, with or without
6* modification, are permitted provided that the following conditions are met:
7* * Redistributions of source code must retain the above copyright
8* notice, this list of conditions and the following disclaimer.
9* * Redistributions in binary form must reproduce the above copyright
10* notice, this list of conditions and the following disclaimer in the
11* documentation and/or other materials provided with the distribution.
12* * Neither the name of the OpenSim Project nor the
13* names of its contributors may be used to endorse or promote products
14* derived from this software without specific prior written permission.
15*
16* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
17* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26*
27*/
28
29using System;
2using System.Collections.Generic; 30using System.Collections.Generic;
3using System.Text; 31using System.Text;
4using Mono.Addins; 32using Mono.Addins;
@@ -14,4 +42,3 @@ namespace OpenSim
14 void Close(); 42 void Close();
15 } 43 }
16} 44}
17
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: