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

Merge branch 'master' into careminster

avinationmerge
Melanie 2009-11-30 14:16:42 +00:00
parent 69d83e1548 9549a06ead
commit 8bbb88ea4e
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
OpenSim/Region/Application/OpenSim.cs
View File

@ -939,8 +939,8 @@ namespace OpenSim
m_log.Info(String.Format("\nAgents connected: {0}\n", agents.Count)); m_log.Info(String.Format("\nAgents connected: {0}\n", agents.Count));
m_log.Info( m_log.Info(
String.Format("{0,-16}{1,-16}{2,-37}{3,-11}{4,-16}", "Firstname", "Lastname", String.Format("{0,-16}{1,-16}{2,-37}{3,-11}{4,-16}{5,-30}", "Firstname", "Lastname",
"Agent ID", "Root/Child", "Region")); "Agent ID", "Root/Child", "Region", "Position"));
foreach (ScenePresence presence in agents) foreach (ScenePresence presence in agents)
{ {
@ -958,12 +958,13 @@ namespace OpenSim
m_log.Info( m_log.Info(
String.Format( String.Format(
"{0,-16}{1,-16}{2,-37}{3,-11}{4,-16}", "{0,-16}{1,-16}{2,-37}{3,-11}{4,-16}{5,-30}",
presence.Firstname, presence.Firstname,
presence.Lastname, presence.Lastname,
presence.UUID, presence.UUID,
presence.IsChildAgent ? "Child" : "Root", presence.IsChildAgent ? "Child" : "Root",
regionName)); regionName,
presence.AbsolutePosition.ToString()));
} }
m_log.Info(String.Empty); m_log.Info(String.Empty);

4
OpenSim/Server/Base/ServicesServerBase.cs
View File

@ -226,6 +226,10 @@ namespace OpenSim.Server.Base
"quit", "quit",
"Quit the application", HandleQuit); "Quit the application", HandleQuit);
MainConsole.Instance.Commands.AddCommand("base", false, "shutdown",
"shutdown",
"Quit the application", HandleQuit);
// Allow derived classes to perform initialization that // Allow derived classes to perform initialization that
// needs to be done after the console has opened // needs to be done after the console has opened
// //