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

Show local IDs in "land show" output. 

Also properly insert region name in "land clear" command
viewer-2-initial-appearance
Justin Clark-Casey (justincc) 2011-01-27 20:11:30 +00:00
parent ab9a0f2f1d
commit 42c0dbf49a
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
View File

@ -228,6 +228,11 @@ namespace OpenSim.Region.CoreModules.World.Archiver
LandData parcel = LandDataSerializer.Deserialize(serialisedParcel); LandData parcel = LandDataSerializer.Deserialize(serialisedParcel);
if (!ResolveUserUuid(parcel.OwnerID)) if (!ResolveUserUuid(parcel.OwnerID))
parcel.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner; parcel.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner;
// m_log.DebugFormat(
// "[ARCHIVER]: Adding parcel {0}, local id {1}, area {2}",
// parcel.Name, parcel.LocalID, parcel.Area);
landData.Add(parcel); landData.Add(parcel);
} }

11
OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
View File

@ -1648,7 +1648,7 @@ namespace OpenSim.Region.CoreModules.World.Land
{ {
Clear(); Clear();
MainConsole.Instance.Output("Cleared all parcels from {0}", m_scene.RegionInfo.RegionName); MainConsole.Instance.OutputFormat("Cleared all parcels from {0}", m_scene.RegionInfo.RegionName);
} }
protected void ShowParcelsCommand(Object[] args) protected void ShowParcelsCommand(Object[] args)
@ -1657,8 +1657,9 @@ namespace OpenSim.Region.CoreModules.World.Land
report.AppendFormat("Land information for {0}\n", m_scene.RegionInfo.RegionName); report.AppendFormat("Land information for {0}\n", m_scene.RegionInfo.RegionName);
report.AppendFormat( report.AppendFormat(
"{0,-20} {1,-9} {2,-18} {3,-18} {4,-20}\n", "{0,-20} {1,-10} {2,-9} {3,-18} {4,-18} {5,-20}\n",
"Parcel Name", "Parcel Name",
"Local ID",
"Area", "Area",
"Starts", "Starts",
"Ends", "Ends",
@ -1671,12 +1672,12 @@ namespace OpenSim.Region.CoreModules.World.Land
LandData ld = lo.LandData; LandData ld = lo.LandData;
report.AppendFormat( report.AppendFormat(
"{0,-20} {1,-9} {2,-18} {3,-18} {4,-20}\n", "{0,-20} {1,-10} {2,-9} {3,-18} {4,-18} {5,-20}\n",
ld.Name, ld.Area, lo.StartPoint, lo.EndPoint, m_userManager.GetUserName(ld.OwnerID)); ld.Name, ld.LocalID, ld.Area, lo.StartPoint, lo.EndPoint, m_userManager.GetUserName(ld.OwnerID));
} }
} }
MainConsole.Instance.Output(report.ToString()); MainConsole.Instance.Output(report.ToString());
} }
} }
} }