aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/Scene.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Scene.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs10
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 575fe01..43486e8 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -389,7 +389,7 @@ namespace OpenSim.Region.Environment.Scenes
389 m_restartTimer.Elapsed += new ElapsedEventHandler(RestartTimer_Elapsed); 389 m_restartTimer.Elapsed += new ElapsedEventHandler(RestartTimer_Elapsed);
390 MainLog.Instance.Error("REGION", "Restarting Region in " + (seconds/60) + " minutes"); 390 MainLog.Instance.Error("REGION", "Restarting Region in " + (seconds/60) + " minutes");
391 m_restartTimer.Start(); 391 m_restartTimer.Start();
392 SendRegionMessageFromEstateTools(LLUUID.Random(), LLUUID.Random(), "", RegionInfo.RegionName + ": Restarting in 2 Minutes"); 392 SendRegionMessageFromEstateTools(LLUUID.Random(), LLUUID.Random(), String.Empty, RegionInfo.RegionName + ": Restarting in 2 Minutes");
393 //SendGeneralAlert(RegionInfo.RegionName + ": Restarting in 2 Minutes"); 393 //SendGeneralAlert(RegionInfo.RegionName + ": Restarting in 2 Minutes");
394 } 394 }
395 } 395 }
@@ -404,7 +404,7 @@ namespace OpenSim.Region.Environment.Scenes
404 if (m_RestartTimerCounter <= m_incrementsof15seconds) 404 if (m_RestartTimerCounter <= m_incrementsof15seconds)
405 { 405 {
406 if (m_RestartTimerCounter == 4 || m_RestartTimerCounter == 6 || m_RestartTimerCounter == 7) 406 if (m_RestartTimerCounter == 4 || m_RestartTimerCounter == 6 || m_RestartTimerCounter == 7)
407 SendRegionMessageFromEstateTools(LLUUID.Random(), LLUUID.Random(), "", RegionInfo.RegionName + ": Restarting in " + 407 SendRegionMessageFromEstateTools(LLUUID.Random(), LLUUID.Random(), String.Empty, RegionInfo.RegionName + ": Restarting in " +
408 ((8 - m_RestartTimerCounter) * 15) + " seconds"); 408 ((8 - m_RestartTimerCounter) * 15) + " seconds");
409 409
410 // SendGeneralAlert(RegionInfo.RegionName + ": Restarting in " + ((8 - m_RestartTimerCounter)*15) + 410 // SendGeneralAlert(RegionInfo.RegionName + ": Restarting in " + ((8 - m_RestartTimerCounter)*15) +
@@ -1408,7 +1408,7 @@ namespace OpenSim.Region.Environment.Scenes
1408 { 1408 {
1409 if (regionHandle == m_regInfo.RegionHandle) 1409 if (regionHandle == m_regInfo.RegionHandle)
1410 { 1410 {
1411 if (agent.CapsPath != "") 1411 if (agent.CapsPath != String.Empty)
1412 { 1412 {
1413 Caps cap = 1413 Caps cap =
1414 new Caps(AssetCache, httpListener, m_regInfo.ExternalHostName, httpListener.Port, 1414 new Caps(AssetCache, httpListener, m_regInfo.ExternalHostName, httpListener.Port,
@@ -2004,7 +2004,7 @@ namespace OpenSim.Region.Environment.Scenes
2004 2004
2005 private string CombineParams(string[] commandParams, int pos) 2005 private string CombineParams(string[] commandParams, int pos)
2006 { 2006 {
2007 string result = ""; 2007 string result = String.Empty;
2008 for (int i = pos; i < commandParams.Length; i++) 2008 for (int i = pos; i < commandParams.Length; i++)
2009 { 2009 {
2010 result += commandParams[i] + " "; 2010 result += commandParams[i] + " ";
@@ -2253,7 +2253,7 @@ namespace OpenSim.Region.Environment.Scenes
2253 /// </summary> 2253 /// </summary>
2254 /// <param name="avatarID">AvatarID to lookup</param> 2254 /// <param name="avatarID">AvatarID to lookup</param>
2255 /// <returns></returns> 2255 /// <returns></returns>
2256 public bool PresenceChildStatus(LLUUID avatarID) 2256 public override bool PresenceChildStatus(LLUUID avatarID)
2257 { 2257 {
2258 ScenePresence cp = GetScenePresence(avatarID); 2258 ScenePresence cp = GetScenePresence(avatarID);
2259 return cp.IsChildAgent; 2259 return cp.IsChildAgent;