18 files changed, 209 insertions, 96 deletions
diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
index c66a4ea..771038e 100644
--- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
+++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
@@ -41,8 +41,8 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
    /// </summary>
    public class AgentAssetTransactions
    {
-        private static readonly ILog m_log = LogManager.GetLogger(
+//        private static readonly ILog m_log = LogManager.GetLogger(
-                MethodBase.GetCurrentMethod().DeclaringType);
+//                MethodBase.GetCurrentMethod().DeclaringType);
        // Fields
        private bool m_dumpAssetsToFile;
diff --git a/OpenSim/Region/CoreModules/Avatar/Assets/GetMeshModule.cs b/OpenSim/Region/CoreModules/Avatar/Assets/GetMeshModule.cs
index 36aaab3..878242a 100644
--- a/OpenSim/Region/CoreModules/Avatar/Assets/GetMeshModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Assets/GetMeshModule.cs
@@ -49,8 +49,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Assets
    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
    public class GetMeshModule : INonSharedRegionModule
    {
-        private static readonly ILog m_log =
+//        private static readonly ILog m_log =
-            LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+//            LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        
        private Scene m_scene;
        private IAssetService m_assetService;
@@ -102,7 +103,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Assets
        {
            UUID capID = UUID.Random();
-            m_log.Info("[GETMESH]: /CAPS/" + capID);
+//            m_log.Info("[GETMESH]: /CAPS/" + capID);
            caps.RegisterHandler("GetMesh",
                                 new RestHTTPHandler("GET", "/CAPS/" + capID,
                                                       delegate(Hashtable m_dhttpMethod)
diff --git a/OpenSim/Region/CoreModules/Avatar/Assets/GetTextureModule.cs b/OpenSim/Region/CoreModules/Avatar/Assets/GetTextureModule.cs
index 1f60e36..6fb8b46 100644
--- a/OpenSim/Region/CoreModules/Avatar/Assets/GetTextureModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Assets/GetTextureModule.cs
@@ -105,7 +105,7 @@ namespace OpenSim.Region.CoreModules.Avatar.ObjectCaps
        {
            UUID capID = UUID.Random();
-            m_log.InfoFormat("[GETTEXTURE]: /CAPS/{0} in region {1}", capID, m_scene.RegionInfo.RegionName);
+//            m_log.InfoFormat("[GETTEXTURE]: /CAPS/{0} in region {1}", capID, m_scene.RegionInfo.RegionName);
            caps.RegisterHandler("GetTexture", new StreamHandler("GET", "/CAPS/" + capID, ProcessGetTexture));
        }
@@ -171,7 +171,7 @@ namespace OpenSim.Region.CoreModules.Avatar.ObjectCaps
        /// <returns>False for "caller try another codec"; true otherwise</returns>
        private bool FetchTexture(OSHttpRequest httpRequest, OSHttpResponse httpResponse, UUID textureID, string format)
        {
-            m_log.DebugFormat("[GETTEXTURE]: {0} with requested format {1}", textureID, format);
+//            m_log.DebugFormat("[GETTEXTURE]: {0} with requested format {1}", textureID, format);
            AssetBase texture;
            string fullID = textureID.ToString();
diff --git a/OpenSim/Region/CoreModules/Avatar/Assets/NewFileAgentInventoryVariablePriceModule.cs b/OpenSim/Region/CoreModules/Avatar/Assets/NewFileAgentInventoryVariablePriceModule.cs
index af26b2b..542af25 100644
--- a/OpenSim/Region/CoreModules/Avatar/Assets/NewFileAgentInventoryVariablePriceModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Assets/NewFileAgentInventoryVariablePriceModule.cs
@@ -50,8 +50,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Assets
    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
    public class NewFileAgentInventoryVariablePriceModule : INonSharedRegionModule
    {
-        private static readonly ILog m_log =
+//        private static readonly ILog m_log =
-            LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+//            LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        
        private Scene m_scene;
        private IAssetService m_assetService;
        private bool m_dumpAssetsToFile = false;
@@ -104,7 +105,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Assets
        {
            UUID capID = UUID.Random();
-            m_log.Info("[GETMESH]: /CAPS/" + capID);
+//            m_log.Debug("[NEW FILE AGENT INVENTORY VARIABLE PRICE]: /CAPS/" + capID);
            caps.RegisterHandler("NewFileAgentInventoryVariablePrice",
                    new LLSDStreamhandler<LLSDAssetUploadRequest, LLSDNewFileAngentInventoryVariablePriceReplyResponse>("POST",
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index 360a014..ff26264 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -132,8 +132,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                        "[ATTACHMENTS MODULE]: Saving avatar attachment. AgentID: " + remoteClient.AgentId
                        + ", AttachmentPoint: " + AttachmentPt);
-                    if (m_scene.AvatarFactory != null)
-                        m_scene.AvatarFactory.QueueAppearanceSave(remoteClient.AgentId);
                }
            }
            catch (Exception e)
@@ -336,7 +334,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                InventoryItemBase item = new InventoryItemBase(itemID, remoteClient.AgentId);
                item = m_scene.InventoryService.GetItem(item);
-                presence.Appearance.SetAttachment((int)AttachmentPt, itemID, item.AssetID /*att.UUID*/);
+                bool changed = presence.Appearance.SetAttachment((int)AttachmentPt, itemID, item.AssetID);
+                if (changed && m_scene.AvatarFactory != null)
+                    m_scene.AvatarFactory.QueueAppearanceSave(remoteClient.AgentId);
            }
            
            return att.UUID;
@@ -380,9 +380,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                // XXYY!!
                InventoryItemBase item = new InventoryItemBase(itemID, remoteClient.AgentId);
                item = m_scene.InventoryService.GetItem(item);
-                presence.Appearance.SetAttachment((int)AttachmentPt, itemID, item.AssetID /* att.UUID */);
+                bool changed = presence.Appearance.SetAttachment((int)AttachmentPt, itemID, item.AssetID);
+                if (changed && m_scene.AvatarFactory != null)
-                if (m_scene.AvatarFactory != null)
                    m_scene.AvatarFactory.QueueAppearanceSave(remoteClient.AgentId);
            }
        }
@@ -402,11 +401,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
            ScenePresence presence;
            if (m_scene.TryGetScenePresence(remoteClient.AgentId, out presence))
            {
-                presence.Appearance.DetachAttachment(itemID);
                // Save avatar attachment information
                m_log.Debug("[ATTACHMENTS MODULE]: Detaching from UserID: " + remoteClient.AgentId + ", ItemID: " + itemID);
-                if (m_scene.AvatarFactory != null)
+                bool changed = presence.Appearance.DetachAttachment(itemID);
+                if (changed && m_scene.AvatarFactory != null)
                    m_scene.AvatarFactory.QueueAppearanceSave(remoteClient.AgentId);
            }
@@ -431,9 +430,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                    part.ParentGroup.PrimCount, remoteClient.AgentId, presence.AbsolutePosition))
                    return;
-                presence.Appearance.DetachAttachment(itemID);
+                bool changed = presence.Appearance.DetachAttachment(itemID);
+                if (changed && m_scene.AvatarFactory != null)
-                if (m_scene.AvatarFactory != null)
                    m_scene.AvatarFactory.QueueAppearanceSave(remoteClient.AgentId);
                part.ParentGroup.DetachToGround();
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
index 7d6d191..f8ce444 100644
--- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
@@ -167,7 +167,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
                }
            }
-            m_log.InfoFormat("[AVFACTORY]: complete texture check for {0}",client.AgentId);
+            m_log.InfoFormat("[AVFACTORY]: complete texture check for {0}", client.AgentId);
            // If we only found default textures, then the appearance is not cached
            return (defonly ? false : true);
@@ -187,7 +187,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
                return;
            }
-            m_log.InfoFormat("[AVFACTORY]: start SetAppearance for {0}",client.AgentId);
+//            m_log.InfoFormat("[AVFACTORY]: start SetAppearance for {0}", client.AgentId);
            // TODO: This is probably not necessary any longer, just assume the
            // textureEntry set implies that the appearance transaction is complete
@@ -210,14 +210,16 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
                {
                    changed = sp.Appearance.SetTextureEntries(textureEntry) || changed;
-                    m_log.InfoFormat("[AVFACTORY]: received texture update for {0}",client.AgentId);
+                    m_log.InfoFormat("[AVFACTORY]: received texture update for {0}", client.AgentId);
                    Util.FireAndForget(delegate(object o) { ValidateBakedTextureCache(client,false); });
                    // This appears to be set only in the final stage of the appearance
                    // update transaction. In theory, we should be able to do an immediate
                    // appearance send and save here.
-                    QueueAppearanceSave(client.AgentId);
+                    // save only if there were changes, send no matter what (doesn't hurt to send twice)
+                    if (changed)
+                        QueueAppearanceSave(client.AgentId);
                    QueueAppearanceSend(client.AgentId);
                }
diff --git a/OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs b/OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs
index 7303fe7..7df2beb 100644
--- a/OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs
@@ -69,7 +69,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Gestures
            item = invService.GetItem(item);
            if (item != null)
            {
-                item.Flags = 1;
+                item.Flags |= 1;
                invService.UpdateItem(item);
            }
            else 
@@ -85,7 +85,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Gestures
            item = invService.GetItem(item);
            if (item != null)
            {
-                item.Flags = 0;
+                item.Flags &= ~(uint)1;
                invService.UpdateItem(item);
            }
            else 
@@ -93,4 +93,4 @@ namespace OpenSim.Region.CoreModules.Avatar.Gestures
                    "[GESTURES]: Unable to find gesture to deactivate {0} for {1}", gestureId, client.Name);
        }
    }
-}
-\ No newline at end of file
+}
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
index 21a61a7..77c7147 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
@@ -146,7 +146,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
                    if (!user.IsChildAgent)
                    {
                        // Local message
-                        m_log.DebugFormat("[INSTANT MESSAGE]: Delivering IM to root agent {0} {1}", user.Name, toAgentID);
+//                        m_log.DebugFormat("[INSTANT MESSAGE]: Delivering IM to root agent {0} {1}", user.Name, toAgentID);
                        user.ControllingClient.SendInstantMessage(im);
                        // Message sent
@@ -168,7 +168,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
                    // Local message
                    ScenePresence user = (ScenePresence) scene.Entities[toAgentID];
-                    m_log.DebugFormat("[INSTANT MESSAGE]: Delivering IM to child agent {0} {1}", user.Name, toAgentID);
+//                    m_log.DebugFormat("[INSTANT MESSAGE]: Delivering IM to child agent {0} {1}", user.Name, toAgentID);
                    user.ControllingClient.SendInstantMessage(im);
                    // Message sent
@@ -177,7 +177,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
                }
            }
-            m_log.DebugFormat("[INSTANT MESSAGE]: Delivering IM to {0} via XMLRPC", im.toAgentID);
+//            m_log.DebugFormat("[INSTANT MESSAGE]: Delivering IM to {0} via XMLRPC", im.toAgentID);
            SendGridInstantMessageViaXMLRPC(im, result);
            return;
diff --git a/OpenSim/Region/CoreModules/Avatar/ObjectCaps/ObjectAdd.cs b/OpenSim/Region/CoreModules/Avatar/ObjectCaps/ObjectAdd.cs
index c011776..a0d72ed 100644
--- a/OpenSim/Region/CoreModules/Avatar/ObjectCaps/ObjectAdd.cs
+++ b/OpenSim/Region/CoreModules/Avatar/ObjectCaps/ObjectAdd.cs
@@ -43,8 +43,9 @@ namespace OpenSim.Region.CoreModules.Avatar.ObjectCaps
 {
    public class ObjectAdd : IRegionModule
    {
-        private static readonly ILog m_log =
+//        private static readonly ILog m_log =
-            LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+//            LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        
        private Scene m_scene;
        #region IRegionModule Members
@@ -63,7 +64,7 @@ namespace OpenSim.Region.CoreModules.Avatar.ObjectCaps
        {
            UUID capuuid = UUID.Random();
            
-            m_log.InfoFormat("[OBJECTADD]: {0}", "/CAPS/OA/" + capuuid + "/");
+//            m_log.InfoFormat("[OBJECTADD]: {0}", "/CAPS/OA/" + capuuid + "/");
            caps.RegisterHandler("ObjectAdd",
                                 new RestHTTPHandler("POST", "/CAPS/OA/" + capuuid + "/",
diff --git a/OpenSim/Region/CoreModules/Avatar/ObjectCaps/UploadObjectAssetModule.cs b/OpenSim/Region/CoreModules/Avatar/ObjectCaps/UploadObjectAssetModule.cs
index 09b9719..3114d7f 100644
--- a/OpenSim/Region/CoreModules/Avatar/ObjectCaps/UploadObjectAssetModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/ObjectCaps/UploadObjectAssetModule.cs
@@ -105,7 +105,7 @@ namespace OpenSim.Region.CoreModules.Avatar.ObjectCaps
        {
            UUID capID = UUID.Random();
-            m_log.Info("[UploadObjectAssetModule]: /CAPS/" + capID);
+//            m_log.Debug("[UPLOAD OBJECT ASSET MODULE]: /CAPS/" + capID);
            caps.RegisterHandler("UploadObjectAsset",
                                 new RestHTTPHandler("POST", "/CAPS/OA/" + capID + "/",
                                                       delegate(Hashtable m_dhttpMethod)
@@ -156,7 +156,7 @@ namespace OpenSim.Region.CoreModules.Avatar.ObjectCaps
            }
            catch (Exception ex)
            {
-                m_log.Error("[UploadObjectAssetModule]: Error deserializing message " + ex.ToString());
+                m_log.Error("[UPLOAD OBJECT ASSET MODULE]: Error deserializing message " + ex.ToString());
                message = null;
            }
@@ -174,7 +174,7 @@ namespace OpenSim.Region.CoreModules.Avatar.ObjectCaps
            Vector3 pos = avatar.AbsolutePosition + (Vector3.UnitX * avatar.Rotation);
            Quaternion rot = Quaternion.Identity;
            Vector3 rootpos = Vector3.Zero;
-            Quaternion rootrot = Quaternion.Identity;
+//            Quaternion rootrot = Quaternion.Identity;
            SceneObjectGroup rootGroup = null;
            SceneObjectGroup[] allparts = new SceneObjectGroup[message.Objects.Length];
@@ -186,11 +186,9 @@ namespace OpenSim.Region.CoreModules.Avatar.ObjectCaps
                if (i == 0)
                {
                    rootpos = obj.Position;
-                    rootrot = obj.Rotation;
+//                    rootrot = obj.Rotation;                    
-                    
                }
                // Combine the extraparams data into it's ugly blob again....
                //int bytelength = 0;
                //for (int extparams = 0; extparams < obj.ExtraParams.Length; extparams++)
@@ -363,9 +361,8 @@ namespace OpenSim.Region.CoreModules.Avatar.ObjectCaps
            responsedata["str_response_string"] = String.Format("<llsd><map><key>local_id</key>{0}</map></llsd>", ConvertUintToBytes(allparts[0].LocalId));
            return responsedata;
        }
+        
        private string ConvertUintToBytes(uint val)
        {
            byte[] resultbytes = Utils.UIntToBytes(val);
@@ -374,4 +371,4 @@ namespace OpenSim.Region.CoreModules.Avatar.ObjectCaps
            return String.Format("<binary encoding=\"base64\">{0}</binary>", Convert.ToBase64String(resultbytes));
        }
    }
-}
+}
+\ No newline at end of file
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
index ddae20f..b0563c5 100644
--- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
@@ -767,6 +767,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
            LookupUUIDS icon = (LookupUUIDS)iar.AsyncState;
            icon.EndInvoke(iar);
        }
+        
        private void LookupUUID(List<UUID> uuidLst)
        {
            LookupUUIDS d = LookupUUIDsAsync;
@@ -775,6 +776,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
                          LookupUUIDSCompleted,
                          d);
        }
+        
        private void LookupUUIDsAsync(List<UUID> uuidLst)
        {
            UUID[] uuidarr;
@@ -789,12 +791,12 @@ namespace OpenSim.Region.CoreModules.World.Estate
                // string lookupname = m_scene.CommsManager.UUIDNameRequestString(uuidarr[i]);
                IUserManagement userManager = m_scene.RequestModuleInterface<IUserManagement>();
-                string userName = "Unkown User";
                if (userManager != null)
-                    userName = userManager.GetUserName(uuidarr[i]);
+                    userManager.GetUserName(uuidarr[i]);
                
                // we drop it.  It gets cached though...  so we're ready for the next request.
                // diva commnent 11/21/2010: uh?!? wft?
+                // justincc comment 21/01/2011: A side effect of userManager.GetUserName() I presume.
            }
        }
        #endregion
diff --git a/OpenSim/Region/CoreModules/World/Land/LandChannel.cs b/OpenSim/Region/CoreModules/World/Land/LandChannel.cs
index 1ad4db2..9e27ef0 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandChannel.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandChannel.cs
@@ -64,7 +64,7 @@ namespace OpenSim.Region.CoreModules.World.Land
        #endregion
        private readonly Scene m_scene;
-        private readonly LandManagementModule m_landManagementModule;
+        private readonly LandManagementModule m_landManagementModule;        
        public LandChannel(Scene scene, LandManagementModule landManagementMod)
        {
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
index 4f8e205..70767f7 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
@@ -30,6 +30,7 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Reflection;
+using System.Text;
 using log4net;
 using Nini.Config;
 using OpenMetaverse;
@@ -37,19 +38,22 @@ using OpenMetaverse.StructuredData;
 using OpenMetaverse.Messages.Linden;
 using OpenSim.Framework;
 using OpenSim.Framework.Capabilities;
+using OpenSim.Framework.Console;
 using OpenSim.Framework.Servers;
 using OpenSim.Framework.Servers.HttpServer;
-using OpenSim.Services.Interfaces;
+using OpenSim.Region.CoreModules.Framework.InterfaceCommander;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Physics.Manager;
-using Caps=OpenSim.Framework.Capabilities.Caps;
+using OpenSim.Services.Interfaces;
+using Caps = OpenSim.Framework.Capabilities.Caps;
 using GridRegion = OpenSim.Services.Interfaces.GridRegion;
 namespace OpenSim.Region.CoreModules.World.Land
 {
    // used for caching
-    internal class ExtendedLandData {
+    internal class ExtendedLandData 
+    {
        public LandData LandData;
        public ulong RegionHandle;
        public uint X, Y;
@@ -65,6 +69,9 @@ namespace OpenSim.Region.CoreModules.World.Land
        private LandChannel landChannel;
        private Scene m_scene;
+        protected Commander m_commander = new Commander("land");
+        
+        protected IUserManagement m_userManager;
        // Minimum for parcels to work is 64m even if we don't actually use them.
        #pragma warning disable 0429
@@ -127,19 +134,27 @@ namespace OpenSim.Region.CoreModules.World.Land
            m_scene.EventManager.OnRequestParcelPrimCountUpdate += EventManagerOnRequestParcelPrimCountUpdate;
            m_scene.EventManager.OnParcelPrimCountTainted += EventManagerOnParcelPrimCountTainted;
            m_scene.EventManager.OnRegisterCaps += EventManagerOnRegisterCaps;
+            m_scene.EventManager.OnPluginConsole += EventManagerOnPluginConsole;
            lock (m_scene)
            {
                m_scene.LandChannel = (ILandChannel)landChannel;
            }
+            
+            InstallInterfaces();
        }
        public void RegionLoaded(Scene scene)
        {
+             m_userManager = m_scene.RequestModuleInterface<IUserManagement>();         
        }
        public void RemoveRegion(Scene scene)
-        {
+        {            
+            // TODO: Also release other event manager listeners here
+            
+            m_scene.EventManager.OnPluginConsole -= EventManagerOnPluginConsole;
+            m_scene.UnregisterModuleCommander(m_commander.Name);            
        }
 //        private bool OnVerifyUserConnection(ScenePresence scenePresence, out string reason)
@@ -148,6 +163,29 @@ namespace OpenSim.Region.CoreModules.World.Land
 //            reason = "You are not allowed to enter this sim.";
 //            return nearestParcel != null;
 //        }
+        
+        /// <summary>
+        /// Processes commandline input. Do not call directly.
+        /// </summary>
+        /// <param name="args">Commandline arguments</param>
+        protected void EventManagerOnPluginConsole(string[] args)
+        {
+            if (args[0] == "land")
+            {
+                if (args.Length == 1)
+                {
+                    m_commander.ProcessConsoleCommand("help", new string[0]);
+                    return;
+                }
+                string[] tmpArgs = new string[args.Length - 2];
+                int i;
+                for (i = 2; i < args.Length; i++)
+                    tmpArgs[i - 2] = args[i];
+                m_commander.ProcessConsoleCommand(args[1], tmpArgs);
+            }
+        }        
        void EventManagerOnNewClient(IClientAPI client)
        {
@@ -209,11 +247,6 @@ namespace OpenSim.Region.CoreModules.World.Land
            }
        }
-        public void PostInitialise()
-        {
-        }
        public void Close()
        {
        }
@@ -223,11 +256,6 @@ namespace OpenSim.Region.CoreModules.World.Land
            get { return "LandManagementModule"; }
        }
-        public bool IsSharedModule
-        {
-            get { return false; }
-        }
        #endregion
        #region Parcel Add/Remove/Get/Create
@@ -1591,5 +1619,44 @@ namespace OpenSim.Region.CoreModules.World.Land
            UpdateLandObject(localID, land.LandData);
        }
+        
+        protected void InstallInterfaces()
+        {
+            Command showCommand =
+                new Command("show", CommandIntentions.COMMAND_STATISTICAL, ShowParcelsCommand, "Shows all parcels on the current region.");
+            m_commander.RegisterCommand("show", showCommand);
+            // Add this to our scene so scripts can call these functions
+            m_scene.RegisterModuleCommander(m_commander);
+        }     
+        
+        protected void ShowParcelsCommand(Object[] args)
+        {
+            StringBuilder report = new StringBuilder();  
+            
+            report.AppendFormat("Land information for {0}\n", m_scene.RegionInfo.RegionName);            
+            report.AppendFormat(
+                "{0,-20} {1,-9} {2,-18} {3,-18} {4,-20}\n",
+                "Parcel Name",
+                "Area",
+                "Starts",
+                "Ends",
+                "Owner");
+            
+            lock (m_landList)
+            {
+                foreach (ILandObject lo in m_landList.Values)
+                {
+                    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));
+                }
+            }
+            
+            MainConsole.Instance.Output(report.ToString());
+        }        
    }
-}
+}
+\ No newline at end of file
diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
index 3e41c55..b90e307 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
@@ -77,7 +77,43 @@ namespace OpenSim.Region.CoreModules.World.Land
        {
            get { return m_scene.RegionInfo.RegionID; }
        }
+        
+        public Vector3 StartPoint
+        {
+            get
+            {
+                for (int y = 0; y < landArrayMax; y++)
+                {
+                    for (int x = 0; x < landArrayMax; x++)
+                    {
+                        if (LandBitmap[x, y])
+                            return new Vector3(x * 4, y * 4, 0);
+                    }
+                }
+                
+                return new Vector3(-1, -1, -1);
+            }
+        }        
+        
+        public Vector3 EndPoint
+        {
+            get
+            {
+                for (int y = landArrayMax - 1; y >= 0; y--)
+                {
+                    for (int x = landArrayMax - 1; x >= 0; x--)
+                    {
+                        if (LandBitmap[x, y])
+                        {
+                            return new Vector3(x * 4, y * 4, 0);
+                        }                        
+                    }
+                }   
+                
+                return new Vector3(-1, -1, -1);
+            }
+        }
+                
        #region Constructors
        public LandObject(UUID owner_id, bool is_group_owned, Scene scene)
@@ -96,7 +132,7 @@ namespace OpenSim.Region.CoreModules.World.Land
        #region Member Functions
        #region General Functions
+        
        /// <summary>
        /// Checks to see if this land object contains a point
        /// </summary>
@@ -217,6 +253,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                        ParcelFlags.AllowDamage |
                        ParcelFlags.CreateObjects |
                        ParcelFlags.RestrictPushObject |
+                        ParcelFlags.AllowOtherScripts |
                        ParcelFlags.AllowGroupScripts |
                        ParcelFlags.CreateGroupObjects |
                        ParcelFlags.AllowAPrimitiveEntry |
diff --git a/OpenSim/Region/CoreModules/World/Serialiser/SerialiserModule.cs b/OpenSim/Region/CoreModules/World/Serialiser/SerialiserModule.cs
index ec97acd..0e861a1 100644
--- a/OpenSim/Region/CoreModules/World/Serialiser/SerialiserModule.cs
+++ b/OpenSim/Region/CoreModules/World/Serialiser/SerialiserModule.cs
@@ -46,7 +46,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser
        private static readonly ILog m_log = 
            LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        private Commander m_commander = new Commander("export");
+//        private Commander m_commander = new Commander("export");
        private List<Scene> m_regions = new List<Scene>();
        private string m_savedir = "exports";
        private List<IFileSerialiser> m_serialisers = new List<IFileSerialiser>();
@@ -77,14 +77,13 @@ namespace OpenSim.Region.CoreModules.World.Serialiser
                m_serialisers.Add(new SerialiseObjects());
            }
-            LoadCommanderCommands();
+//            LoadCommanderCommands();
        }
        public void AddRegion(Scene scene)
        {
-            scene.RegisterModuleCommander(m_commander);
+//            scene.RegisterModuleCommander(m_commander);
-            scene.EventManager.OnPluginConsole += EventManager_OnPluginConsole;
+//            scene.EventManager.OnPluginConsole += EventManager_OnPluginConsole;
            scene.RegisterModuleInterface<IRegionSerialiserModule>(this);
            lock (m_regions)
@@ -211,18 +210,18 @@ namespace OpenSim.Region.CoreModules.World.Serialiser
        #endregion
-        private void EventManager_OnPluginConsole(string[] args)
+//        private void EventManager_OnPluginConsole(string[] args)
-        {
+//        {
-            if (args[0] == "export")
+//            if (args[0] == "export")
-            {
+//            {
-                string[] tmpArgs = new string[args.Length - 2];
+//                string[] tmpArgs = new string[args.Length - 2];
-                int i = 0;
+//                int i = 0;
-                for (i = 2; i < args.Length; i++)
+//                for (i = 2; i < args.Length; i++)
-                    tmpArgs[i - 2] = args[i];
+//                    tmpArgs[i - 2] = args[i];
+//
-                m_commander.ProcessConsoleCommand(args[1], tmpArgs);
+//                m_commander.ProcessConsoleCommand(args[1], tmpArgs);
-            }
+//            }
-        }
+//        }
        private void InterfaceSaveRegion(Object[] args)
        {
@@ -245,15 +244,15 @@ namespace OpenSim.Region.CoreModules.World.Serialiser
            }
        }
-        private void LoadCommanderCommands()
+//        private void LoadCommanderCommands()
-        {
+//        {
-            Command serialiseSceneCommand = new Command("save", CommandIntentions.COMMAND_NON_HAZARDOUS, InterfaceSaveRegion, "Saves the named region into the exports directory.");
+//            Command serialiseSceneCommand = new Command("save", CommandIntentions.COMMAND_NON_HAZARDOUS, InterfaceSaveRegion, "Saves the named region into the exports directory.");
-            serialiseSceneCommand.AddArgument("region-name", "The name of the region you wish to export", "String");
+//            serialiseSceneCommand.AddArgument("region-name", "The name of the region you wish to export", "String");
+//
-            Command serialiseAllScenesCommand = new Command("save-all",CommandIntentions.COMMAND_NON_HAZARDOUS,  InterfaceSaveAllRegions, "Saves all regions into the exports directory.");
+//            Command serialiseAllScenesCommand = new Command("save-all",CommandIntentions.COMMAND_NON_HAZARDOUS,  InterfaceSaveAllRegions, "Saves all regions into the exports directory.");
+//
-            m_commander.RegisterCommand("save", serialiseSceneCommand);
+//            m_commander.RegisterCommand("save", serialiseSceneCommand);
-            m_commander.RegisterCommand("save-all", serialiseAllScenesCommand);
+//            m_commander.RegisterCommand("save-all", serialiseAllScenesCommand);
-        }
+//        }
    }
 }
diff --git a/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs b/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs
index 8df44fe..09c0ebb 100644
--- a/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs
+++ b/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs
@@ -38,7 +38,7 @@ namespace OpenSim.Region.CoreModules.World.Sound
 {
    public class SoundModule : IRegionModule, ISoundModule
    {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
        
        protected Scene m_scene;
        
diff --git a/OpenSim/Region/CoreModules/World/Warp3DMap/Perlin.cs b/OpenSim/Region/CoreModules/World/Warp3DMap/Perlin.cs
index af59d7a..522a7eb 100644
--- a/OpenSim/Region/CoreModules/World/Warp3DMap/Perlin.cs
+++ b/OpenSim/Region/CoreModules/World/Warp3DMap/Perlin.cs
@@ -85,9 +85,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
        public static float noise1(float arg)
        {
            int bx0, bx1;
-            float rx0, rx1, sx, t, u, v, a;
+            float rx0, rx1, sx, t, u, v;
-            a = arg;
            t = arg + N;
            bx0 = ((int)t) & BM;
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
index f9d28b9..e0f36a2 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
@@ -641,7 +641,17 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
            lock (m_openRequests)
                m_openRequests.Add(requestID, mrs);
-            WebRequest mapitemsrequest = WebRequest.Create(httpserver);
+            WebRequest mapitemsrequest = null;
+            try
+            {
+                mapitemsrequest = WebRequest.Create(httpserver);
+            }
+            catch (Exception e)
+            {
+                m_log.DebugFormat("[WORLD MAP]: Access to {0} failed with {1}", httpserver, e);
+                return new OSDMap();
+            }
            mapitemsrequest.Method = "POST";
            mapitemsrequest.ContentType = "application/xml+llsd";
            OSDMap RAMap = new OSDMap();