aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/Scene.cs
diff options
context:
space:
mode:
authorTeravus Ovares2007-11-28 06:31:27 +0000
committerTeravus Ovares2007-11-28 06:31:27 +0000
commitc021bfe191c3ab34982f46dac8a4b1ca7eb626a8 (patch)
tree3f0015bbd887fd4338815f7774692347d0ab42ec /OpenSim/Region/Environment/Scenes/Scene.cs
parent* Restaring the sim works fine in grid mode now. Sims announce themselves to... (diff)
downloadopensim-SC_OLD-c021bfe191c3ab34982f46dac8a4b1ca7eb626a8.zip
opensim-SC_OLD-c021bfe191c3ab34982f46dac8a4b1ca7eb626a8.tar.gz
opensim-SC_OLD-c021bfe191c3ab34982f46dac8a4b1ca7eb626a8.tar.bz2
opensim-SC_OLD-c021bfe191c3ab34982f46dac8a4b1ca7eb626a8.tar.xz
* Disambiguation in the 'sim is restarting message' that tells you 'which' sim is restarting in the area.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Scene.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 1359bd2..ef08486 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -307,7 +307,7 @@ namespace OpenSim.Region.Environment.Scenes
307 t_restartTimer.Elapsed += new ElapsedEventHandler(restartTimer_Elapsed); 307 t_restartTimer.Elapsed += new ElapsedEventHandler(restartTimer_Elapsed);
308 MainLog.Instance.Error("REGION", "Restarting Region in " + (seconds / 60) + " minutes"); 308 MainLog.Instance.Error("REGION", "Restarting Region in " + (seconds / 60) + " minutes");
309 t_restartTimer.Start(); 309 t_restartTimer.Start();
310 SendGeneralAlert("Restarting in 2 Minutes"); 310 SendGeneralAlert(RegionInfo.RegionName + ": Restarting in 2 Minutes");
311 } 311 }
312 312
313 313
@@ -318,7 +318,7 @@ namespace OpenSim.Region.Environment.Scenes
318 if (m_RestartTimerCounter <= m_incrementsof15seconds) 318 if (m_RestartTimerCounter <= m_incrementsof15seconds)
319 { 319 {
320 if (m_RestartTimerCounter == 4 || m_RestartTimerCounter == 6 || m_RestartTimerCounter == 7) 320 if (m_RestartTimerCounter == 4 || m_RestartTimerCounter == 6 || m_RestartTimerCounter == 7)
321 SendGeneralAlert("Restarting in " + ((8-m_RestartTimerCounter) * 15) + " seconds"); 321 SendGeneralAlert(RegionInfo.RegionName + ": Restarting in " + ((8 - m_RestartTimerCounter) * 15) + " seconds");
322 } 322 }
323 else 323 else
324 { 324 {