From c35f974637e9e28a3f5f1267412393a5c5f4403f Mon Sep 17 00:00:00 2001
From: "Justin Clark-Casey (justincc)" <jjustincc@googlemail.com>
Date: Fri, 23 Nov 2012 03:05:30 +0000
Subject: [PATCH] minor: Add some console feedback on region restart and log
 who requested a region restart if done from the viewer.

---
 .../CoreModules/World/Estate/EstateManagementModule.cs      | 4 ++++
 OpenSim/Region/CoreModules/World/Region/RestartModule.cs    | 6 +++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
index 58bbd2405a..ed05644c55 100644
--- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
@@ -270,6 +270,10 @@ namespace OpenSim.Region.CoreModules.World.Estate
                 }
 
                 restartModule.ScheduleRestart(UUID.Zero, "Region will restart in {0}", times.ToArray(), true);
+
+                m_log.InfoFormat(
+                    "User {0} requested restart of region {1} in {2} seconds", 
+                    remoteClient.Name, Scene.Name, times.Count != 0 ? times[0] : 0);
             }
         }
 
diff --git a/OpenSim/Region/CoreModules/World/Region/RestartModule.cs b/OpenSim/Region/CoreModules/World/Region/RestartModule.cs
index fea4de04dd..249a40db9e 100644
--- a/OpenSim/Region/CoreModules/World/Region/RestartModule.cs
+++ b/OpenSim/Region/CoreModules/World/Region/RestartModule.cs
@@ -26,6 +26,7 @@
  */
 
 using System;
+using System.Linq;
 using System.Reflection;
 using System.Timers;
 using System.Threading;
@@ -264,7 +265,10 @@ namespace OpenSim.Region.CoreModules.World.Region
             for (int i = 4 ; i < args.Length ; i++)
                 times.Add(Convert.ToInt32(args[i]));
 
+            MainConsole.Instance.OutputFormat(
+                "Region {0} scheduled for restart in {1} seconds", m_Scene.Name, times.Sum());
+
             ScheduleRestart(UUID.Zero, args[3], times.ToArray(), notice);
         }
     }
-}
+}
\ No newline at end of file