3 files changed, 22 insertions, 13 deletions

diff --git a/OpenSim/Framework/Console/LogBase.cs b/OpenSim/Framework/Console/LogBase.cs
index a090377..2b831fe 100644
--- a/OpenSim/Framework/Console/LogBase.cs
+++ b/OpenSim/Framework/Console/LogBase.cs
@@ -177,7 +177,7 @@ namespace OpenSim.Framework.Console
         public void Error(string sender, string format, params object[] args)
         {
             WritePrefixLine(DeriveColor(sender), sender);
-            WriteNewLine(ConsoleColor.Red, format, args);
+            Error( format, args);
             return;
         }
 
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index cf3ed85..e57ba27 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -277,32 +277,32 @@ namespace OpenSim
 
                 case "terrain":
                     string result = "";
-                    for (int i = 0; i < m_localScenes.Count; i++)
+                    foreach(Scene scene in m_localScenes)
                     {
-                        if (!((Scene)m_localScenes[i]).Terrain.RunTerrainCmd(cmdparams, ref result, m_localScenes[i].RegionInfo.RegionName))
+                        if (!scene.Terrain.RunTerrainCmd(cmdparams, ref result, scene.RegionInfo.RegionName))
                         {
                             m_log.Error(result);
                         }
                     }
                     break;
                 case "script":
-                    for (int i = 0; i < m_localScenes.Count; i++)
+                    foreach(Scene scene in m_localScenes )
                     {
-                        ((Scene)m_localScenes[i]).SendCommandToScripts(cmdparams);
+                        scene.SendCommandToScripts(cmdparams);
                     }
                     break;
 
                 case "backup":
-                    for (int i = 0; i < m_localScenes.Count; i++)
+                    foreach(Scene scene in m_localScenes )
                     {
-                        ((Scene)m_localScenes[i]).Backup();
+                        scene.Backup();
                     }
                     break;
 
                 case "alert":
-                    for (int i = 0; i < m_localScenes.Count; i++)
+                    foreach(Scene scene in m_localScenes)
                     {
-                        ((Scene)m_localScenes[i]).HandleAlertCommand(cmdparams);
+                        scene.HandleAlertCommand(cmdparams);
                     }
                     break;
 
@@ -333,12 +333,21 @@ namespace OpenSim
                     m_log.Error(String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16}{5,-16}{6,-16}", "Firstname", "Lastname", "Agent ID", "Session ID", "Circuit", "IP", "World"));
                     for (int i = 0; i < m_localScenes.Count; i++)
                     {
-                        foreach (Entity entity in m_localScenes[i].Entities.Values )
+                        Scene scene = m_localScenes[i];
+                        foreach (Entity entity in scene.Entities.Values )
                         {
                             if ( entity is ScenePresence )
                             {
                                 ScenePresence scenePrescence = entity as ScenePresence;
-                                m_log.Error(String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16},{5,-16}{6,-16}", scenePrescence.Firstname, scenePrescence.Lastname, scenePrescence.UUID, scenePrescence.ControllingClient.AgentId, "Unknown", "Unknown"), ((Scene)m_localScenes[i]).RegionInfo.RegionName);
+                                m_log.Error(
+                                    String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16},{5,-16}{6,-16}", 
+                                                  scenePrescence.Firstname,
+                                                  scenePrescence.Lastname,
+                                                  scenePrescence.UUID, 
+                                                  scenePrescence.ControllingClient.AgentId,
+                                                  "Unknown", 
+                                                  "Unknown", 
+                                                  scene.RegionInfo.RegionName));
                             }
                         }
                     }
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 203f831..e05ea90 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -299,7 +299,7 @@ namespace OpenSim.Region.Environment.Scenes
             }
             catch (Exception e)
             {
-                MainLog.Instance.Error("Scene", "Update() - Failed with exception " + e.ToString());
+                MainLog.Instance.Error("Scene", "Failed with exception " + e.ToString());
             }
             updateLock.ReleaseMutex();
         }
@@ -346,7 +346,7 @@ namespace OpenSim.Region.Environment.Scenes
             }
             catch (Exception e)
             {
-                MainLog.Instance.Warn("terrain", "World.cs: RegenerateTerrain() - Failed with exception " + e.ToString());
+                MainLog.Instance.Error("terrain", "Failed with exception " + e.ToString());
             }
         }