OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Allow re-setting the region restart timer. Also move restart notifications to 

upper right corner again.
avinationmerge
Melanie Thielker 2015-03-23 22:19:33 +01:00
parent a2676388f4
commit 65c0c4be78
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Region/CoreModules/World/Region/RestartModule.cs
View File

@ -131,7 +131,10 @@ namespace OpenSim.Region.CoreModules.World.Region
public void ScheduleRestart(UUID initiator, string message, int[] alerts, bool notice) public void ScheduleRestart(UUID initiator, string message, int[] alerts, bool notice)
{ {
if (m_CountdownTimer != null) if (m_CountdownTimer != null)
return; {
m_CountdownTimer.Stop();
m_CountdownTimer = null;
}
if (alerts == null) if (alerts == null)
{ {
@ -276,7 +279,8 @@ namespace OpenSim.Region.CoreModules.World.Region
m_CountdownTimer.Stop(); m_CountdownTimer.Stop();
m_CountdownTimer = null; m_CountdownTimer = null;
if (m_DialogModule != null && message != String.Empty) if (m_DialogModule != null && message != String.Empty)
m_DialogModule.SendGeneralAlert(message); m_DialogModule.SendNotificationToUsersInRegion(UUID.Zero, "System", message);
//m_DialogModule.SendGeneralAlert(message);
} }
if (m_MarkerPath != String.Empty) if (m_MarkerPath != String.Empty)
File.Delete(Path.Combine(m_MarkerPath, File.Delete(Path.Combine(m_MarkerPath,