From 42c0dbf49aba21a473041bb3f0a9073be6269016 Mon Sep 17 00:00:00 2001
From: "Justin Clark-Casey (justincc)" <jjustincc@googlemail.com>
Date: Thu, 27 Jan 2011 20:11:30 +0000
Subject: [PATCH] Show local IDs in "land show" output.

Also properly insert region name in "land clear" command
---
 .../CoreModules/World/Archiver/ArchiveReadRequest.cs  |  5 +++++
 .../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 6a96d873eb..2d2772bef5 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
                 LandData parcel = LandDataSerializer.Deserialize(serialisedParcel);
                 if (!ResolveUserUuid(parcel.OwnerID))
                     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);
             }
             
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
index 8ef29023c9..7d030c7a16 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
         {
             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)
@@ -1657,8 +1657,9 @@ namespace OpenSim.Region.CoreModules.World.Land
             
             report.AppendFormat("Land information for {0}\n", m_scene.RegionInfo.RegionName);            
             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",
+                "Local ID",
                 "Area",
                 "Starts",
                 "Ends",
@@ -1671,12 +1672,12 @@ namespace OpenSim.Region.CoreModules.World.Land
                     LandData ld = lo.LandData;
                     
                     report.AppendFormat(
-                        "{0,-20} {1,-9} {2,-18} {3,-18} {4,-20}\n", 
-                        ld.Name, ld.Area, lo.StartPoint, lo.EndPoint, m_userManager.GetUserName(ld.OwnerID));
+                        "{0,-20} {1,-10} {2,-9} {3,-18} {4,-18} {5,-20}\n", 
+                        ld.Name, ld.LocalID, ld.Area, lo.StartPoint, lo.EndPoint, m_userManager.GetUserName(ld.OwnerID));
                 }
             }
             
             MainConsole.Instance.Output(report.ToString());
-        }        
+        }         
     }
 }
\ No newline at end of file