mirror of
https://github.com/opensim/opensim.git
synced 2026-08-09 18:55:58 +08:00
Massive tab and trailing space cleanup
This commit is contained in:
Melanie Thielker
@@ -135,7 +135,7 @@ namespace OpenSim
|
||||
{
|
||||
// Wait for a signal to be delivered
|
||||
int index = Mono.Unix.UnixSignal.WaitAny (signals, -1);
|
||||
|
||||
|
||||
//Mono.Unix.Native.Signum signal = signals [index].Signum;
|
||||
MainConsole.Instance.RunCommand("shutdown");
|
||||
}
|
||||
@@ -273,17 +273,17 @@ namespace OpenSim
|
||||
|
||||
m_console.Commands.AddCommand("General", false, "change region",
|
||||
"change region <region name>",
|
||||
"Change current console region",
|
||||
"Change current console region",
|
||||
ChangeSelectedRegion);
|
||||
|
||||
m_console.Commands.AddCommand("Archiving", false, "save xml",
|
||||
"save xml [<file name>]",
|
||||
"Save a region's data in XML format",
|
||||
"Save a region's data in XML format",
|
||||
SaveXml);
|
||||
|
||||
m_console.Commands.AddCommand("Archiving", false, "save xml2",
|
||||
"save xml2 [<file name>]",
|
||||
"Save a region's data in XML2 format",
|
||||
"Save a region's data in XML2 format",
|
||||
SaveXml2);
|
||||
|
||||
m_console.Commands.AddCommand("Archiving", false, "load xml",
|
||||
@@ -293,12 +293,12 @@ namespace OpenSim
|
||||
|
||||
m_console.Commands.AddCommand("Archiving", false, "load xml2",
|
||||
"load xml2 [<file name>]",
|
||||
"Load a region's data from XML2 format",
|
||||
"Load a region's data from XML2 format",
|
||||
LoadXml2);
|
||||
|
||||
m_console.Commands.AddCommand("Archiving", false, "save prims xml2",
|
||||
"save prims xml2 [<prim name> <file name>]",
|
||||
"Save named prim to XML2",
|
||||
"Save named prim to XML2",
|
||||
SavePrimsXml2);
|
||||
|
||||
m_console.Commands.AddCommand("Archiving", false, "load oar",
|
||||
@@ -352,7 +352,7 @@ namespace OpenSim
|
||||
|
||||
m_console.Commands.AddCommand("Objects", false, "edit scale",
|
||||
"edit scale <name> <x> <y> <z>",
|
||||
"Change the scale of a named prim",
|
||||
"Change the scale of a named prim",
|
||||
HandleEditScale);
|
||||
|
||||
m_console.Commands.AddCommand("Objects", false, "rotate scene",
|
||||
@@ -379,44 +379,44 @@ namespace OpenSim
|
||||
|
||||
m_console.Commands.AddCommand("Users", false, "show users",
|
||||
"show users [full]",
|
||||
"Show user data for users currently on the region",
|
||||
"Show user data for users currently on the region",
|
||||
"Without the 'full' option, only users actually on the region are shown."
|
||||
+ " With the 'full' option child agents of users in neighbouring regions are also shown.",
|
||||
HandleShow);
|
||||
|
||||
m_console.Commands.AddCommand("Comms", false, "show connections",
|
||||
"show connections",
|
||||
"Show connection data",
|
||||
"Show connection data",
|
||||
HandleShow);
|
||||
|
||||
m_console.Commands.AddCommand("Comms", false, "show circuits",
|
||||
"show circuits",
|
||||
"Show agent circuit data",
|
||||
"Show agent circuit data",
|
||||
HandleShow);
|
||||
|
||||
m_console.Commands.AddCommand("Comms", false, "show pending-objects",
|
||||
"show pending-objects",
|
||||
"Show # of objects on the pending queues of all scene viewers",
|
||||
"Show # of objects on the pending queues of all scene viewers",
|
||||
HandleShow);
|
||||
|
||||
m_console.Commands.AddCommand("General", false, "show modules",
|
||||
"show modules",
|
||||
"Show module data",
|
||||
"Show module data",
|
||||
HandleShow);
|
||||
|
||||
m_console.Commands.AddCommand("Regions", false, "show regions",
|
||||
"show regions",
|
||||
"Show region data",
|
||||
"Show region data",
|
||||
HandleShow);
|
||||
|
||||
|
||||
m_console.Commands.AddCommand("Regions", false, "show ratings",
|
||||
"show ratings",
|
||||
"Show rating data",
|
||||
"Show rating data",
|
||||
HandleShow);
|
||||
|
||||
m_console.Commands.AddCommand("Objects", false, "backup",
|
||||
"backup",
|
||||
"Persist currently unsaved object changes immediately instead of waiting for the normal persistence call.",
|
||||
"Persist currently unsaved object changes immediately instead of waiting for the normal persistence call.",
|
||||
RunCommand);
|
||||
|
||||
m_console.Commands.AddCommand("Regions", false, "create region",
|
||||
@@ -430,22 +430,22 @@ namespace OpenSim
|
||||
|
||||
m_console.Commands.AddCommand("Regions", false, "restart",
|
||||
"restart",
|
||||
"Restart the currently selected region(s) in this instance",
|
||||
"Restart the currently selected region(s) in this instance",
|
||||
RunCommand);
|
||||
|
||||
m_console.Commands.AddCommand("General", false, "command-script",
|
||||
"command-script <script>",
|
||||
"Run a command script from file",
|
||||
"Run a command script from file",
|
||||
RunCommand);
|
||||
|
||||
m_console.Commands.AddCommand("Regions", false, "remove-region",
|
||||
"remove-region <name>",
|
||||
"Remove a region from this simulator",
|
||||
"Remove a region from this simulator",
|
||||
RunCommand);
|
||||
|
||||
m_console.Commands.AddCommand("Regions", false, "delete-region",
|
||||
"delete-region <name>",
|
||||
"Delete a region from disk",
|
||||
"Delete a region from disk",
|
||||
RunCommand);
|
||||
|
||||
m_console.Commands.AddCommand("Estates", false, "estate create",
|
||||
@@ -476,7 +476,7 @@ namespace OpenSim
|
||||
{
|
||||
RunCommandScript(m_shutdownCommandsFile);
|
||||
}
|
||||
|
||||
|
||||
base.ShutdownSpecific();
|
||||
}
|
||||
|
||||
@@ -515,7 +515,7 @@ namespace OpenSim
|
||||
private void KickUserCommand(string module, string[] cmdparams)
|
||||
{
|
||||
bool force = false;
|
||||
|
||||
|
||||
OptionSet options = new OptionSet().Add("f|force", delegate (string v) { force = v != null; });
|
||||
|
||||
List<string> mainParams = options.Parse(cmdparams);
|
||||
@@ -612,7 +612,7 @@ namespace OpenSim
|
||||
MainConsole.Instance.Output(usage);
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
float angle = (float)(Convert.ToSingle(args[2]) / 180.0 * Math.PI);
|
||||
OpenMetaverse.Quaternion rot = OpenMetaverse.Quaternion.CreateFromAxisAngle(0, 0, 1, angle);
|
||||
|
||||
@@ -624,7 +624,7 @@ namespace OpenSim
|
||||
|
||||
Vector3 center = new Vector3(centerX, centerY, 0.0f);
|
||||
|
||||
SceneManager.ForEachSelectedScene(delegate(Scene scene)
|
||||
SceneManager.ForEachSelectedScene(delegate(Scene scene)
|
||||
{
|
||||
scene.ForEachSOG(delegate(SceneObjectGroup sog)
|
||||
{
|
||||
@@ -776,8 +776,8 @@ namespace OpenSim
|
||||
CreateRegion(regInfo, true, out scene);
|
||||
|
||||
if (changed)
|
||||
m_estateDataService.StoreEstateSettings(regInfo.EstateSettings);
|
||||
|
||||
m_estateDataService.StoreEstateSettings(regInfo.EstateSettings);
|
||||
|
||||
scene.Start();
|
||||
}
|
||||
|
||||
@@ -880,8 +880,8 @@ namespace OpenSim
|
||||
protected override void HandleRestartRegion(RegionInfo whichRegion)
|
||||
{
|
||||
base.HandleRestartRegion(whichRegion);
|
||||
|
||||
// Where we are restarting multiple scenes at once, a previous call to RefreshPrompt may have set the
|
||||
|
||||
// Where we are restarting multiple scenes at once, a previous call to RefreshPrompt may have set the
|
||||
// m_console.ConsoleScene to null (indicating all scenes).
|
||||
if (m_console.ConsoleScene != null && whichRegion.RegionName == ((Scene)m_console.ConsoleScene).Name)
|
||||
SceneManager.TrySetCurrentScene(whichRegion.RegionName);
|
||||
@@ -914,7 +914,7 @@ namespace OpenSim
|
||||
{
|
||||
agents = SceneManager.GetCurrentSceneAvatars();
|
||||
}
|
||||
|
||||
|
||||
MainConsole.Instance.Output(String.Format("\nAgents connected: {0}\n", agents.Count));
|
||||
|
||||
MainConsole.Instance.Output(
|
||||
@@ -960,7 +960,7 @@ namespace OpenSim
|
||||
|
||||
case "modules":
|
||||
SceneManager.ForEachSelectedScene(
|
||||
scene =>
|
||||
scene =>
|
||||
{
|
||||
MainConsole.Instance.OutputFormat("Loaded region modules in {0} are:", scene.Name);
|
||||
|
||||
@@ -996,16 +996,16 @@ namespace OpenSim
|
||||
cdt.AddColumn("Ready?", 6);
|
||||
cdt.AddColumn("Estate", ConsoleDisplayUtil.EstateNameSize);
|
||||
SceneManager.ForEachScene(
|
||||
scene =>
|
||||
{
|
||||
RegionInfo ri = scene.RegionInfo;
|
||||
scene =>
|
||||
{
|
||||
RegionInfo ri = scene.RegionInfo;
|
||||
cdt.AddRow(
|
||||
ri.RegionName,
|
||||
ri.RegionID,
|
||||
string.Format("{0},{1}", ri.RegionLocX, ri.RegionLocY),
|
||||
ri.RegionName,
|
||||
ri.RegionID,
|
||||
string.Format("{0},{1}", ri.RegionLocX, ri.RegionLocY),
|
||||
string.Format("{0}x{1}", ri.RegionSizeX, ri.RegionSizeY),
|
||||
ri.InternalEndPoint.Port,
|
||||
scene.Ready ? "Yes" : "No",
|
||||
ri.InternalEndPoint.Port,
|
||||
scene.Ready ? "Yes" : "No",
|
||||
ri.EstateSettings.EstateName);
|
||||
}
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user