Merge branch 'master' into careminster

This commit is contained in:
Melanie
2013-07-04 22:32:58 +01:00
31 changed files with 398 additions and 190 deletions

View File

@@ -546,7 +546,7 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
{
ConsoleDisplayList cdl = new ConsoleDisplayList();
cdl.AddRow("Name", so.Name);
cdl.AddRow("Descrition", so.Description);
cdl.AddRow("Description", so.Description);
cdl.AddRow("Local ID", so.LocalId);
cdl.AddRow("UUID", so.UUID);
cdl.AddRow("Location", string.Format("{0} @ {1}", so.AbsolutePosition, so.Scene.Name));