diff options
author | Justin Clark-Casey (justincc) | 2011-01-27 20:11:30 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-01-27 20:11:30 +0000 |
commit | 42c0dbf49aba21a473041bb3f0a9073be6269016 (patch) | |
tree | 13c67abb25598352d31b03598bbc185d4d220227 /OpenSim/Region | |
parent | Add "land clear" command (diff) | |
download | opensim-SC-42c0dbf49aba21a473041bb3f0a9073be6269016.zip opensim-SC-42c0dbf49aba21a473041bb3f0a9073be6269016.tar.gz opensim-SC-42c0dbf49aba21a473041bb3f0a9073be6269016.tar.bz2 opensim-SC-42c0dbf49aba21a473041bb3f0a9073be6269016.tar.xz |
Show local IDs in "land show" output.
Also properly insert region name in "land clear" command
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs | 5 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs | 11 |
2 files changed, 11 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs index 6a96d87..2d2772b 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs | |||
@@ -228,6 +228,11 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
228 | LandData parcel = LandDataSerializer.Deserialize(serialisedParcel); | 228 | LandData parcel = LandDataSerializer.Deserialize(serialisedParcel); |
229 | if (!ResolveUserUuid(parcel.OwnerID)) | 229 | if (!ResolveUserUuid(parcel.OwnerID)) |
230 | parcel.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner; | 230 | parcel.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner; |
231 | |||
232 | // m_log.DebugFormat( | ||
233 | // "[ARCHIVER]: Adding parcel {0}, local id {1}, area {2}", | ||
234 | // parcel.Name, parcel.LocalID, parcel.Area); | ||
235 | |||
231 | landData.Add(parcel); | 236 | landData.Add(parcel); |
232 | } | 237 | } |
233 | 238 | ||
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs index 8ef2902..7d030c7 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs | |||
@@ -1648,7 +1648,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
1648 | { | 1648 | { |
1649 | Clear(); | 1649 | Clear(); |
1650 | 1650 | ||
1651 | MainConsole.Instance.Output("Cleared all parcels from {0}", m_scene.RegionInfo.RegionName); | 1651 | MainConsole.Instance.OutputFormat("Cleared all parcels from {0}", m_scene.RegionInfo.RegionName); |
1652 | } | 1652 | } |
1653 | 1653 | ||
1654 | protected void ShowParcelsCommand(Object[] args) | 1654 | protected void ShowParcelsCommand(Object[] args) |
@@ -1657,8 +1657,9 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
1657 | 1657 | ||
1658 | report.AppendFormat("Land information for {0}\n", m_scene.RegionInfo.RegionName); | 1658 | report.AppendFormat("Land information for {0}\n", m_scene.RegionInfo.RegionName); |
1659 | report.AppendFormat( | 1659 | report.AppendFormat( |
1660 | "{0,-20} {1,-9} {2,-18} {3,-18} {4,-20}\n", | 1660 | "{0,-20} {1,-10} {2,-9} {3,-18} {4,-18} {5,-20}\n", |
1661 | "Parcel Name", | 1661 | "Parcel Name", |
1662 | "Local ID", | ||
1662 | "Area", | 1663 | "Area", |
1663 | "Starts", | 1664 | "Starts", |
1664 | "Ends", | 1665 | "Ends", |
@@ -1671,12 +1672,12 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
1671 | LandData ld = lo.LandData; | 1672 | LandData ld = lo.LandData; |
1672 | 1673 | ||
1673 | report.AppendFormat( | 1674 | report.AppendFormat( |
1674 | "{0,-20} {1,-9} {2,-18} {3,-18} {4,-20}\n", | 1675 | "{0,-20} {1,-10} {2,-9} {3,-18} {4,-18} {5,-20}\n", |
1675 | ld.Name, ld.Area, lo.StartPoint, lo.EndPoint, m_userManager.GetUserName(ld.OwnerID)); | 1676 | ld.Name, ld.LocalID, ld.Area, lo.StartPoint, lo.EndPoint, m_userManager.GetUserName(ld.OwnerID)); |
1676 | } | 1677 | } |
1677 | } | 1678 | } |
1678 | 1679 | ||
1679 | MainConsole.Instance.Output(report.ToString()); | 1680 | MainConsole.Instance.Output(report.ToString()); |
1680 | } | 1681 | } |
1681 | } | 1682 | } |
1682 | } \ No newline at end of file | 1683 | } \ No newline at end of file |