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

Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

bullet-2.82
Diva Canto 2014-07-04 16:28:58 -07:00
parent 869191a51d b019fd5a95
commit bb9071e5f0
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -943,6 +943,7 @@ namespace OpenSim
cdt.AddColumn("Name", ConsoleDisplayUtil.RegionNameSize); cdt.AddColumn("Name", ConsoleDisplayUtil.RegionNameSize);
cdt.AddColumn("ID", ConsoleDisplayUtil.UuidSize); cdt.AddColumn("ID", ConsoleDisplayUtil.UuidSize);
cdt.AddColumn("Position", ConsoleDisplayUtil.CoordTupleSize); cdt.AddColumn("Position", ConsoleDisplayUtil.CoordTupleSize);
cdt.AddColumn("Size", 11);
cdt.AddColumn("Port", ConsoleDisplayUtil.PortSize); cdt.AddColumn("Port", ConsoleDisplayUtil.PortSize);
cdt.AddColumn("Ready?", 6); cdt.AddColumn("Ready?", 6);
cdt.AddColumn("Estate", ConsoleDisplayUtil.EstateNameSize); cdt.AddColumn("Estate", ConsoleDisplayUtil.EstateNameSize);
@ -951,8 +952,13 @@ namespace OpenSim
{ {
RegionInfo ri = scene.RegionInfo; RegionInfo ri = scene.RegionInfo;
cdt.AddRow( cdt.AddRow(
ri.RegionName, ri.RegionID, string.Format("{0},{1}", ri.RegionLocX, ri.RegionLocY), ri.RegionName,
ri.InternalEndPoint.Port, scene.Ready ? "Yes" : "No", ri.EstateSettings.EstateName); 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);
} }
); );

10
OpenSim/Services/GridService/GridService.cs
View File

@ -620,7 +620,6 @@ namespace OpenSim.Services.GridService
OutputRegionsToConsoleSummary(regions); OutputRegionsToConsoleSummary(regions);
} }
private void HandleShowRegion(string module, string[] cmd) private void HandleShowRegion(string module, string[] cmd)
{ {
if (cmd.Length != 4) if (cmd.Length != 4)
@ -679,7 +678,8 @@ namespace OpenSim.Services.GridService
ConsoleDisplayList dispList = new ConsoleDisplayList(); ConsoleDisplayList dispList = new ConsoleDisplayList();
dispList.AddRow("Region Name", r.RegionName); dispList.AddRow("Region Name", r.RegionName);
dispList.AddRow("Region ID", r.RegionID); 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("URI", r.Data["serverURI"]);
dispList.AddRow("Owner ID", r.Data["owner_uuid"]); dispList.AddRow("Owner ID", r.Data["owner_uuid"]);
dispList.AddRow("Flags", flags); dispList.AddRow("Flags", flags);
@ -696,10 +696,10 @@ namespace OpenSim.Services.GridService
private void OutputRegionsToConsoleSummary(List<RegionData> regions) private void OutputRegionsToConsoleSummary(List<RegionData> regions)
{ {
ConsoleDisplayTable dispTable = new ConsoleDisplayTable(); ConsoleDisplayTable dispTable = new ConsoleDisplayTable();
dispTable.AddColumn("Name", 16); dispTable.AddColumn("Name", 44);
dispTable.AddColumn("ID", 36); dispTable.AddColumn("ID", 36);
dispTable.AddColumn("Position", 11); dispTable.AddColumn("Position", 11);
dispTable.AddColumn("Owner ID", 36); dispTable.AddColumn("Size", 11);
dispTable.AddColumn("Flags", 60); dispTable.AddColumn("Flags", 60);
foreach (RegionData r in regions) foreach (RegionData r in regions)
@ -709,7 +709,7 @@ namespace OpenSim.Services.GridService
r.RegionName, r.RegionName,
r.RegionID.ToString(), r.RegionID.ToString(),
string.Format("{0},{1}", r.coordX, r.coordY), string.Format("{0},{1}", r.coordX, r.coordY),
r.Data["owner_uuid"].ToString(), string.Format("{0}x{1}", r.sizeX, r.sizeY),
flags.ToString()); flags.ToString());
} }