aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-11-23 03:05:30 +0000
committerJustin Clark-Casey (justincc)2012-11-23 03:05:30 +0000
commit9b60c14bb10301db9a3333ca815afd3296b981a8 (patch)
tree89d38282cc3c7c7b892d460073d82c762f3d7051 /OpenSim/Region/CoreModules
parentFix problem where restarting the currently selected region would stop various... (diff)
downloadopensim-SC_OLD-9b60c14bb10301db9a3333ca815afd3296b981a8.zip
opensim-SC_OLD-9b60c14bb10301db9a3333ca815afd3296b981a8.tar.gz
opensim-SC_OLD-9b60c14bb10301db9a3333ca815afd3296b981a8.tar.bz2
opensim-SC_OLD-9b60c14bb10301db9a3333ca815afd3296b981a8.tar.xz
minor: Add some console feedback on region restart and log who requested a region restart if done from the viewer.
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r--OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs4
-rw-r--r--OpenSim/Region/CoreModules/World/Region/RestartModule.cs6
2 files changed, 9 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
index 39cc93d..757e5d4 100644
--- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
@@ -271,6 +271,10 @@ namespace OpenSim.Region.CoreModules.World.Estate
271 } 271 }
272 272
273 restartModule.ScheduleRestart(UUID.Zero, "Region will restart in {0}", times.ToArray(), true); 273 restartModule.ScheduleRestart(UUID.Zero, "Region will restart in {0}", times.ToArray(), true);
274
275 m_log.InfoFormat(
276 "User {0} requested restart of region {1} in {2} seconds",
277 remoteClient.Name, Scene.Name, times.Count != 0 ? times[0] : 0);
274 } 278 }
275 } 279 }
276 280
diff --git a/OpenSim/Region/CoreModules/World/Region/RestartModule.cs b/OpenSim/Region/CoreModules/World/Region/RestartModule.cs
index fea4de0..249a40d 100644
--- a/OpenSim/Region/CoreModules/World/Region/RestartModule.cs
+++ b/OpenSim/Region/CoreModules/World/Region/RestartModule.cs
@@ -26,6 +26,7 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Linq;
29using System.Reflection; 30using System.Reflection;
30using System.Timers; 31using System.Timers;
31using System.Threading; 32using System.Threading;
@@ -264,7 +265,10 @@ namespace OpenSim.Region.CoreModules.World.Region
264 for (int i = 4 ; i < args.Length ; i++) 265 for (int i = 4 ; i < args.Length ; i++)
265 times.Add(Convert.ToInt32(args[i])); 266 times.Add(Convert.ToInt32(args[i]));
266 267
268 MainConsole.Instance.OutputFormat(
269 "Region {0} scheduled for restart in {1} seconds", m_Scene.Name, times.Sum());
270
267 ScheduleRestart(UUID.Zero, args[3], times.ToArray(), notice); 271 ScheduleRestart(UUID.Zero, args[3], times.ToArray(), notice);
268 } 272 }
269 } 273 }
270} 274} \ No newline at end of file