OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* commands are done foreach instead of by [i] 

* fixed 'show users' format bug.
afrisby
lbsa71 2007-08-06 14:14:43 +00:00
parent 07b011af3a
commit fdbb891659
3 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Framework/Console/LogBase.cs
View File

@ -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;
}

29
OpenSim/Region/Application/OpenSimMain.cs
View File

@ -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));
}
}
}

4
OpenSim/Region/Environment/Scenes/Scene.cs
View File

@ -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());
}
}