Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
commit
bb9071e5f0
|
@ -943,6 +943,7 @@ namespace OpenSim
|
|||
cdt.AddColumn("Name", ConsoleDisplayUtil.RegionNameSize);
|
||||
cdt.AddColumn("ID", ConsoleDisplayUtil.UuidSize);
|
||||
cdt.AddColumn("Position", ConsoleDisplayUtil.CoordTupleSize);
|
||||
cdt.AddColumn("Size", 11);
|
||||
cdt.AddColumn("Port", ConsoleDisplayUtil.PortSize);
|
||||
cdt.AddColumn("Ready?", 6);
|
||||
cdt.AddColumn("Estate", ConsoleDisplayUtil.EstateNameSize);
|
||||
|
@ -951,8 +952,13 @@ namespace OpenSim
|
|||
{
|
||||
RegionInfo ri = scene.RegionInfo;
|
||||
cdt.AddRow(
|
||||
ri.RegionName, ri.RegionID, string.Format("{0},{1}", ri.RegionLocX, ri.RegionLocY),
|
||||
ri.InternalEndPoint.Port, scene.Ready ? "Yes" : "No", ri.EstateSettings.EstateName);
|
||||
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.EstateSettings.EstateName);
|
||||
}
|
||||
);
|
||||
|
||||
|
|
|
@ -620,7 +620,6 @@ namespace OpenSim.Services.GridService
|
|||
OutputRegionsToConsoleSummary(regions);
|
||||
}
|
||||
|
||||
|
||||
private void HandleShowRegion(string module, string[] cmd)
|
||||
{
|
||||
if (cmd.Length != 4)
|
||||
|
@ -679,7 +678,8 @@ namespace OpenSim.Services.GridService
|
|||
ConsoleDisplayList dispList = new ConsoleDisplayList();
|
||||
dispList.AddRow("Region Name", r.RegionName);
|
||||
dispList.AddRow("Region ID", r.RegionID);
|
||||
dispList.AddRow("Location", string.Format("{0},{1}", r.coordX, r.coordY));
|
||||
dispList.AddRow("Position", string.Format("{0},{1}", r.coordX, r.coordY));
|
||||
dispList.AddRow("Size", string.Format("{0}x{1}", r.sizeX, r.sizeY));
|
||||
dispList.AddRow("URI", r.Data["serverURI"]);
|
||||
dispList.AddRow("Owner ID", r.Data["owner_uuid"]);
|
||||
dispList.AddRow("Flags", flags);
|
||||
|
@ -696,10 +696,10 @@ namespace OpenSim.Services.GridService
|
|||
private void OutputRegionsToConsoleSummary(List<RegionData> regions)
|
||||
{
|
||||
ConsoleDisplayTable dispTable = new ConsoleDisplayTable();
|
||||
dispTable.AddColumn("Name", 16);
|
||||
dispTable.AddColumn("Name", 44);
|
||||
dispTable.AddColumn("ID", 36);
|
||||
dispTable.AddColumn("Position", 11);
|
||||
dispTable.AddColumn("Owner ID", 36);
|
||||
dispTable.AddColumn("Size", 11);
|
||||
dispTable.AddColumn("Flags", 60);
|
||||
|
||||
foreach (RegionData r in regions)
|
||||
|
@ -709,7 +709,7 @@ namespace OpenSim.Services.GridService
|
|||
r.RegionName,
|
||||
r.RegionID.ToString(),
|
||||
string.Format("{0},{1}", r.coordX, r.coordY),
|
||||
r.Data["owner_uuid"].ToString(),
|
||||
string.Format("{0}x{1}", r.sizeX, r.sizeY),
|
||||
flags.ToString());
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue