aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/Console/LogBase.cs2
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs29
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs4
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
177 public void Error(string sender, string format, params object[] args) 177 public void Error(string sender, string format, params object[] args)
178 { 178 {
179 WritePrefixLine(DeriveColor(sender), sender); 179 WritePrefixLine(DeriveColor(sender), sender);
180 WriteNewLine(ConsoleColor.Red, format, args); 180 Error( format, args);
181 return; 181 return;
182 } 182 }
183 183
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
277 277
278 case "terrain": 278 case "terrain":
279 string result = ""; 279 string result = "";
280 for (int i = 0; i < m_localScenes.Count; i++) 280 foreach(Scene scene in m_localScenes)
281 { 281 {
282 if (!((Scene)m_localScenes[i]).Terrain.RunTerrainCmd(cmdparams, ref result, m_localScenes[i].RegionInfo.RegionName)) 282 if (!scene.Terrain.RunTerrainCmd(cmdparams, ref result, scene.RegionInfo.RegionName))
283 { 283 {
284 m_log.Error(result); 284 m_log.Error(result);
285 } 285 }
286 } 286 }
287 break; 287 break;
288 case "script": 288 case "script":
289 for (int i = 0; i < m_localScenes.Count; i++) 289 foreach(Scene scene in m_localScenes )
290 { 290 {
291 ((Scene)m_localScenes[i]).SendCommandToScripts(cmdparams); 291 scene.SendCommandToScripts(cmdparams);
292 } 292 }
293 break; 293 break;
294 294
295 case "backup": 295 case "backup":
296 for (int i = 0; i < m_localScenes.Count; i++) 296 foreach(Scene scene in m_localScenes )
297 { 297 {
298 ((Scene)m_localScenes[i]).Backup(); 298 scene.Backup();
299 } 299 }
300 break; 300 break;
301 301
302 case "alert": 302 case "alert":
303 for (int i = 0; i < m_localScenes.Count; i++) 303 foreach(Scene scene in m_localScenes)
304 { 304 {
305 ((Scene)m_localScenes[i]).HandleAlertCommand(cmdparams); 305 scene.HandleAlertCommand(cmdparams);
306 } 306 }
307 break; 307 break;
308 308
@@ -333,12 +333,21 @@ namespace OpenSim
333 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")); 333 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"));
334 for (int i = 0; i < m_localScenes.Count; i++) 334 for (int i = 0; i < m_localScenes.Count; i++)
335 { 335 {
336 foreach (Entity entity in m_localScenes[i].Entities.Values ) 336 Scene scene = m_localScenes[i];
337 foreach (Entity entity in scene.Entities.Values )
337 { 338 {
338 if ( entity is ScenePresence ) 339 if ( entity is ScenePresence )
339 { 340 {
340 ScenePresence scenePrescence = entity as ScenePresence; 341 ScenePresence scenePrescence = entity as ScenePresence;
341 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); 342 m_log.Error(
343 String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16},{5,-16}{6,-16}",
344 scenePrescence.Firstname,
345 scenePrescence.Lastname,
346 scenePrescence.UUID,
347 scenePrescence.ControllingClient.AgentId,
348 "Unknown",
349 "Unknown",
350 scene.RegionInfo.RegionName));
342 } 351 }
343 } 352 }
344 } 353 }
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
299 } 299 }
300 catch (Exception e) 300 catch (Exception e)
301 { 301 {
302 MainLog.Instance.Error("Scene", "Update() - Failed with exception " + e.ToString()); 302 MainLog.Instance.Error("Scene", "Failed with exception " + e.ToString());
303 } 303 }
304 updateLock.ReleaseMutex(); 304 updateLock.ReleaseMutex();
305 } 305 }
@@ -346,7 +346,7 @@ namespace OpenSim.Region.Environment.Scenes
346 } 346 }
347 catch (Exception e) 347 catch (Exception e)
348 { 348 {
349 MainLog.Instance.Warn("terrain", "World.cs: RegenerateTerrain() - Failed with exception " + e.ToString()); 349 MainLog.Instance.Error("terrain", "Failed with exception " + e.ToString());
350 } 350 }
351 } 351 }
352 352