diff options
author | Melanie Thielker | 2015-03-23 22:19:33 +0100 |
---|---|---|
committer | Melanie Thielker | 2015-03-23 22:19:33 +0100 |
commit | 65c0c4be7863a25719e6e404b0d5a002829f8caf (patch) | |
tree | abaa96b624fcbf8c6b348e33ae593c8f2be20dc6 | |
parent | Make the scripted dialogs and restart message appear in the top right corner (diff) | |
download | opensim-SC-65c0c4be7863a25719e6e404b0d5a002829f8caf.zip opensim-SC-65c0c4be7863a25719e6e404b0d5a002829f8caf.tar.gz opensim-SC-65c0c4be7863a25719e6e404b0d5a002829f8caf.tar.bz2 opensim-SC-65c0c4be7863a25719e6e404b0d5a002829f8caf.tar.xz |
Allow re-setting the region restart timer. Also move restart notifications to
upper right corner again.
-rw-r--r-- | OpenSim/Region/CoreModules/World/Region/RestartModule.cs | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/World/Region/RestartModule.cs b/OpenSim/Region/CoreModules/World/Region/RestartModule.cs index 0c74b49..e6a0205 100644 --- a/OpenSim/Region/CoreModules/World/Region/RestartModule.cs +++ b/OpenSim/Region/CoreModules/World/Region/RestartModule.cs | |||
@@ -131,7 +131,10 @@ namespace OpenSim.Region.CoreModules.World.Region | |||
131 | public void ScheduleRestart(UUID initiator, string message, int[] alerts, bool notice) | 131 | public void ScheduleRestart(UUID initiator, string message, int[] alerts, bool notice) |
132 | { | 132 | { |
133 | if (m_CountdownTimer != null) | 133 | if (m_CountdownTimer != null) |
134 | return; | 134 | { |
135 | m_CountdownTimer.Stop(); | ||
136 | m_CountdownTimer = null; | ||
137 | } | ||
135 | 138 | ||
136 | if (alerts == null) | 139 | if (alerts == null) |
137 | { | 140 | { |
@@ -276,7 +279,8 @@ namespace OpenSim.Region.CoreModules.World.Region | |||
276 | m_CountdownTimer.Stop(); | 279 | m_CountdownTimer.Stop(); |
277 | m_CountdownTimer = null; | 280 | m_CountdownTimer = null; |
278 | if (m_DialogModule != null && message != String.Empty) | 281 | if (m_DialogModule != null && message != String.Empty) |
279 | m_DialogModule.SendGeneralAlert(message); | 282 | m_DialogModule.SendNotificationToUsersInRegion(UUID.Zero, "System", message); |
283 | //m_DialogModule.SendGeneralAlert(message); | ||
280 | } | 284 | } |
281 | if (m_MarkerPath != String.Empty) | 285 | if (m_MarkerPath != String.Empty) |
282 | File.Delete(Path.Combine(m_MarkerPath, | 286 | File.Delete(Path.Combine(m_MarkerPath, |