aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-10-18 23:58:29 +0100
committerJustin Clark-Casey (justincc)2012-10-18 23:58:29 +0100
commit845228b35e75dea4ec597ca394dd43196ff8bb48 (patch)
tree46b67b730d19cf4c1e0f065463e7024ca6f11478 /OpenSim/Region
parentAdd local and UUID to information output of "show object" and "show part" reg... (diff)
downloadopensim-SC_OLD-845228b35e75dea4ec597ca394dd43196ff8bb48.zip
opensim-SC_OLD-845228b35e75dea4ec597ca394dd43196ff8bb48.tar.gz
opensim-SC_OLD-845228b35e75dea4ec597ca394dd43196ff8bb48.tar.bz2
opensim-SC_OLD-845228b35e75dea4ec597ca394dd43196ff8bb48.tar.xz
minor: Convert ad-hoc list building in ObjectCommandsModule to use ConsoleDisplayList
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs45
1 files changed, 24 insertions, 21 deletions
diff --git a/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs b/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs
index b90b71e..6feba21 100644
--- a/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs
+++ b/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs
@@ -479,31 +479,34 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
479 479
480 private StringBuilder AddSummarySceneObjectReport(StringBuilder sb, SceneObjectGroup so) 480 private StringBuilder AddSummarySceneObjectReport(StringBuilder sb, SceneObjectGroup so)
481 { 481 {
482 sb.AppendFormat("Name: {0}\n", so.Name); 482 ConsoleDisplayList cdl = new ConsoleDisplayList();
483 sb.AppendFormat("Description: {0}\n", so.Description); 483 cdl.AddRow("Name", so.Name);
484 sb.AppendFormat("Local ID {0}\n", so.LocalId); 484 cdl.AddRow("Descrition", so.Description);
485 sb.AppendFormat("UUID {0}\n", so.UUID); 485 cdl.AddRow("Local ID", so.LocalId);
486 sb.AppendFormat("Location: {0} @ {1}\n", so.AbsolutePosition, so.Scene.RegionInfo.RegionName); 486 cdl.AddRow("UUID", so.UUID);
487 sb.AppendFormat("Parts: {0}\n", so.PrimCount); 487 cdl.AddRow("Location", string.Format("{0} @ {1}", so.AbsolutePosition, so.Scene.Name));
488 sb.AppendFormat("Flags: {0}\n", so.RootPart.Flags); 488 cdl.AddRow("Parts", so.PrimCount);
489 489 cdl.AddRow("Flags", so.RootPart.Flags);
490 return sb; 490
491 return sb.Append(cdl.ToString());
491 } 492 }
492 493
493 private StringBuilder AddScenePartReport(StringBuilder sb, SceneObjectPart sop) 494 private StringBuilder AddScenePartReport(StringBuilder sb, SceneObjectPart sop)
494 { 495 {
495 sb.AppendFormat("Name: {0}\n", sop.Name); 496 ConsoleDisplayList cdl = new ConsoleDisplayList();
496 sb.AppendFormat("Description: {0}\n", sop.Description); 497 cdl.AddRow("Name", sop.Name);
497 sb.AppendFormat("Local ID {0}\n", sop.LocalId); 498 cdl.AddRow("Description", sop.Description);
498 sb.AppendFormat("UUID {0}\n", sop.UUID); 499 cdl.AddRow("Local ID", sop.LocalId);
499 sb.AppendFormat("Location: {0} @ {1}\n", sop.AbsolutePosition, sop.ParentGroup.Scene.RegionInfo.RegionName); 500 cdl.AddRow("UUID", sop.UUID);
500 sb.AppendFormat("Parent: {0}", 501 cdl.AddRow("Location", string.Format("{0} @ {1}", sop.AbsolutePosition, sop.ParentGroup.Scene.Name));
501 sop.IsRoot ? "Is Root\n" : string.Format("{0} {1}\n", sop.ParentGroup.Name, sop.ParentGroup.UUID)); 502 cdl.AddRow(
502 sb.AppendFormat("Link number: {0}\n", sop.LinkNum); 503 "Parent",
503 sb.AppendFormat("Items: {0}\n", sop.Inventory.Count); 504 sop.IsRoot ? "Is Root" : string.Format("{0} {1}", sop.ParentGroup.Name, sop.ParentGroup.UUID));
504 sb.AppendFormat("Flags: {0}\n", sop.Flags); 505 cdl.AddRow("Link number", sop.LinkNum);
505 506 cdl.AddRow("Flags", sop.Flags);
506 return sb; 507 cdl.AddRow("Items", sop.Inventory.Count);
508
509 return sb.Append(cdl.ToString());
507 } 510 }
508 511
509 private void HandleDeleteObject(string module, string[] cmd) 512 private void HandleDeleteObject(string module, string[] cmd)