diff options
author | Melanie | 2012-11-23 03:42:04 +0000 |
---|---|---|
committer | Melanie | 2012-11-23 03:42:04 +0000 |
commit | 01f06b90dd5d76833e8f2b4709d901e128a1667b (patch) | |
tree | bcd34a45717cfe725a99317135ec754dadb1093c /OpenSim/Region/Application/OpenSimBase.cs | |
parent | Fix new command console code to match the output of the original while keeping (diff) | |
parent | Merge branch 'master' into careminster (diff) | |
download | opensim-SC_OLD-01f06b90dd5d76833e8f2b4709d901e128a1667b.zip opensim-SC_OLD-01f06b90dd5d76833e8f2b4709d901e128a1667b.tar.gz opensim-SC_OLD-01f06b90dd5d76833e8f2b4709d901e128a1667b.tar.bz2 opensim-SC_OLD-01f06b90dd5d76833e8f2b4709d901e128a1667b.tar.xz |
Merge branch 'careminster' into avination
Diffstat (limited to 'OpenSim/Region/Application/OpenSimBase.cs')
-rw-r--r-- | OpenSim/Region/Application/OpenSimBase.cs | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index 33680b5..bed9a49 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs | |||
@@ -314,7 +314,7 @@ namespace OpenSim | |||
314 | // Called from base.StartUp() | 314 | // Called from base.StartUp() |
315 | 315 | ||
316 | m_httpServerPort = m_networkServersInfo.HttpListenerPort; | 316 | m_httpServerPort = m_networkServersInfo.HttpListenerPort; |
317 | SceneManager.OnRestartSim += handleRestartRegion; | 317 | SceneManager.OnRestartSim += HandleRestartRegion; |
318 | 318 | ||
319 | // Only enable the watchdogs when all regions are ready. Otherwise we get false positives when cpu is | 319 | // Only enable the watchdogs when all regions are ready. Otherwise we get false positives when cpu is |
320 | // heavily used during initial startup. | 320 | // heavily used during initial startup. |
@@ -819,9 +819,11 @@ namespace OpenSim | |||
819 | } | 819 | } |
820 | } | 820 | } |
821 | 821 | ||
822 | public void handleRestartRegion(RegionInfo whichRegion) | 822 | protected virtual void HandleRestartRegion(RegionInfo whichRegion) |
823 | { | 823 | { |
824 | m_log.Info("[OPENSIM]: Got restart signal from SceneManager"); | 824 | m_log.InfoFormat( |
825 | "[OPENSIM]: Got restart signal from SceneManager for region {0} ({1},{2})", | ||
826 | whichRegion.RegionName, whichRegion.RegionLocX, whichRegion.RegionLocY); | ||
825 | 827 | ||
826 | ShutdownClientServer(whichRegion); | 828 | ShutdownClientServer(whichRegion); |
827 | IScene scene; | 829 | IScene scene; |
@@ -967,7 +969,6 @@ namespace OpenSim | |||
967 | m_log.Info("[SHUTDOWN]: Closing all threads"); | 969 | m_log.Info("[SHUTDOWN]: Closing all threads"); |
968 | m_log.Info("[SHUTDOWN]: Killing listener thread"); | 970 | m_log.Info("[SHUTDOWN]: Killing listener thread"); |
969 | m_log.Info("[SHUTDOWN]: Killing clients"); | 971 | m_log.Info("[SHUTDOWN]: Killing clients"); |
970 | // TODO: implement this | ||
971 | m_log.Info("[SHUTDOWN]: Closing console and terminating"); | 972 | m_log.Info("[SHUTDOWN]: Closing console and terminating"); |
972 | 973 | ||
973 | try | 974 | try |
@@ -976,7 +977,7 @@ namespace OpenSim | |||
976 | } | 977 | } |
977 | catch (Exception e) | 978 | catch (Exception e) |
978 | { | 979 | { |
979 | m_log.ErrorFormat("[SHUTDOWN]: Ignoring failure during shutdown - {0}", e); | 980 | m_log.Error("[SHUTDOWN]: Ignoring failure during shutdown - ", e); |
980 | } | 981 | } |
981 | } | 982 | } |
982 | 983 | ||