21 files changed, 2001 insertions, 1358 deletions

diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index 365cdbb..c802490 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -28,6 +28,7 @@
 using System;
 using System.Collections.Generic;
 using System.Reflection;
+using System.Xml;
 using log4net;
 using Mono.Addins;
 using Nini.Config;
@@ -37,6 +38,7 @@ using OpenSim.Framework;
 using OpenSim.Region.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
+using OpenSim.Region.Framework.Scenes.Serialization;
 
 namespace OpenSim.Region.CoreModules.Avatar.Attachments
 {
@@ -233,8 +235,14 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
 
         public UUID RezSingleAttachmentFromInventory(
             IClientAPI remoteClient, UUID itemID, uint AttachmentPt, bool updateInventoryStatus)
+        {
+            return RezSingleAttachmentFromInventory(remoteClient, itemID, AttachmentPt, true, null);
+        }
+
+        public UUID RezSingleAttachmentFromInventory(
+            IClientAPI remoteClient, UUID itemID, uint AttachmentPt, bool updateInventoryStatus, XmlDocument doc)
         {                        
-            SceneObjectGroup att = RezSingleAttachmentFromInventoryInternal(remoteClient, itemID, AttachmentPt);
+            SceneObjectGroup att = RezSingleAttachmentFromInventoryInternal(remoteClient, itemID, AttachmentPt, doc);
 
             if (updateInventoryStatus)
             {
@@ -253,7 +261,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
         }        
 
         protected SceneObjectGroup RezSingleAttachmentFromInventoryInternal(
-            IClientAPI remoteClient, UUID itemID, uint AttachmentPt)
+            IClientAPI remoteClient, UUID itemID, uint AttachmentPt, XmlDocument doc)
         {
             IInventoryAccessModule invAccess = m_scene.RequestModuleInterface<IInventoryAccessModule>();
             if (invAccess != null)
@@ -278,13 +286,19 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                     if (tainted)
                         objatt.HasGroupChanged = true;
 
+                    if (doc != null)
+                    {
+                        objatt.LoadScriptState(doc);
+                        objatt.ResetOwnerChangeFlag();
+                    }
+
                     // Fire after attach, so we don't get messy perms dialogs
                     // 4 == AttachedRez
                     objatt.CreateScriptInstances(0, true, m_scene.DefaultScriptEngine, 4);
                     objatt.ResumeScripts();
 
                     // Do this last so that event listeners have access to all the effects of the attachment
-                    m_scene.EventManager.TriggerOnAttach(objatt.LocalId, itemID, remoteClient.AgentId);
+                    //m_scene.EventManager.TriggerOnAttach(objatt.LocalId, itemID, remoteClient.AgentId);
                 }
                 else
                 {
@@ -313,7 +327,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
             if (m_scene.TryGetScenePresence(remoteClient.AgentId, out presence))
             {
                 InventoryItemBase item = new InventoryItemBase(itemID, remoteClient.AgentId);
-                item = m_scene.InventoryService.GetItem(item);
+                if (m_scene.InventoryService != null)
+                    item = m_scene.InventoryService.GetItem(item);
 
                 presence.Appearance.SetAttachment((int)AttachmentPt, itemID, item.AssetID /*att.UUID*/);
             }
@@ -358,6 +373,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
             {
                 // XXYY!!
                 InventoryItemBase item = new InventoryItemBase(itemID, remoteClient.AgentId);
+                if (item == null)
+                    m_log.Error("[ATTACHMENT]: item == null");
+                if (m_scene == null)
+                    m_log.Error("[ATTACHMENT]: m_scene == null");
+                if (m_scene.InventoryService == null)
+                    m_log.Error("[ATTACHMENT]: m_scene.InventoryService == null");
                 item = m_scene.InventoryService.GetItem(item);
                 presence.Appearance.SetAttachment((int)AttachmentPt, itemID, item.AssetID /* att.UUID */);
 
@@ -446,6 +467,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                     if (group.GetFromItemID() == itemID)
                     {
                         m_scene.EventManager.TriggerOnAttach(group.LocalId, itemID, UUID.Zero);
+                        // CM / XMREngine!!!! Needed to conclude attach event
+                        SceneObjectSerializer.ToOriginalXmlFormat(group);
                         group.DetachToInventoryPrep();
                         m_log.Debug("[ATTACHMENTS MODULE]: Saving attachpoint: " + ((uint)group.GetAttachmentPoint()).ToString());
                         m_scene.UpdateKnownItem(remoteClient, group,group.GetFromItemID(), group.OwnerID);
diff --git a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
index 02f0968..06b1b00 100644
--- a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
@@ -49,7 +49,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
         private int m_shoutdistance = 100;
         private int m_whisperdistance = 10;
         private List<Scene> m_scenes = new List<Scene>();
-
+        private List<string> FreezeCache = new List<string>();
+        private string m_adminPrefix = "";
         internal object m_syncy = new object();
 
         internal IConfig m_config;
@@ -76,6 +77,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
             m_whisperdistance = config.Configs["Chat"].GetInt("whisper_distance", m_whisperdistance);
             m_saydistance = config.Configs["Chat"].GetInt("say_distance", m_saydistance);
             m_shoutdistance = config.Configs["Chat"].GetInt("shout_distance", m_shoutdistance);
+            m_adminPrefix = config.Configs["Chat"].GetString("admin_prefix", "");
         }
 
         public virtual void AddRegion(Scene scene)
@@ -171,7 +173,15 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
                 return;
             }
 
-            DeliverChatToAvatars(ChatSourceType.Agent, c);
+            if (FreezeCache.Contains(c.Sender.AgentId.ToString()))
+            {
+                if (c.Type != ChatTypeEnum.StartTyping || c.Type != ChatTypeEnum.StopTyping)
+                    c.Sender.SendAgentAlertMessage("You may not talk as you are frozen.", false);
+            }
+            else
+            {
+                DeliverChatToAvatars(ChatSourceType.Agent, c);
+            }
         }
 
         public virtual void OnChatFromWorld(Object sender, OSChatMessage c)
@@ -185,6 +195,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
         protected virtual void DeliverChatToAvatars(ChatSourceType sourceType, OSChatMessage c)
         {
             string fromName = c.From;
+            string fromNamePrefix = "";
             UUID fromID = UUID.Zero;
             string message = c.Message;
             IScene scene = c.Scene;
@@ -207,7 +218,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
                 fromPos = avatar.AbsolutePosition;
                 fromName = avatar.Name;
                 fromID = c.Sender.AgentId;
-
+                if (avatar.GodLevel >= 200)
+                {
+                    fromNamePrefix = m_adminPrefix;
+                }
                 break;
 
             case ChatSourceType.Object:
@@ -227,7 +241,19 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
                 s.ForEachScenePresence(
                     delegate(ScenePresence presence)
                     {
-                        TrySendChatMessage(presence, fromPos, regionPos, fromID, fromName, c.Type, message, sourceType);
+                        ILandObject Presencecheck = s.LandChannel.GetLandObject(presence.AbsolutePosition.X, presence.AbsolutePosition.Y);
+                        if (Presencecheck != null)
+                        {
+                            // This will pass all chat from objects. Not
+                            // perfect, but it will do. For now. Better
+                            // than the prior behavior of muting all
+                            // objects on a parcel with access restrictions
+                            if (c.Sender == null || Presencecheck.IsEitherBannedOrRestricted(c.Sender.AgentId) != true)
+                            {
+                                TrySendChatMessage(presence, fromPos, regionPos, fromID, fromNamePrefix+fromName, c.Type, message, sourceType);
+                            }
+                        }
+
                     }
                 );
             }
@@ -270,25 +296,29 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
             }
             
             // m_log.DebugFormat("[CHAT] Broadcast: fromID {0} fromName {1}, cType {2}, sType {3}", fromID, fromName, cType, sourceType);
-
-            ((Scene)c.Scene).ForEachScenePresence(
-                delegate(ScenePresence presence)
-                {
-                    // ignore chat from child agents
-                    if (presence.IsChildAgent) return;
-                    
-                    IClientAPI client = presence.ControllingClient;
-                    
-                    // don't forward SayOwner chat from objects to
-                    // non-owner agents
-                    if ((c.Type == ChatTypeEnum.Owner) &&
-                        (null != c.SenderObject) &&
-                        (((SceneObjectPart)c.SenderObject).OwnerID != client.AgentId))
-                        return;
-                    
-                    client.SendChatMessage(c.Message, (byte)cType, CenterOfRegion, fromName, fromID, 
-                                           (byte)sourceType, (byte)ChatAudibleLevel.Fully);
-                });
+            if (c.Scene != null)
+            {
+                ((Scene)c.Scene).ForEachScenePresence
+                (
+                    delegate(ScenePresence presence)
+                    {
+                        // ignore chat from child agents
+                        if (presence.IsChildAgent) return;
+                        
+                        IClientAPI client = presence.ControllingClient;
+                        
+                        // don't forward SayOwner chat from objects to
+                        // non-owner agents
+                        if ((c.Type == ChatTypeEnum.Owner) &&
+                            (null != c.SenderObject) &&
+                            (((SceneObjectPart)c.SenderObject).OwnerID != client.AgentId))
+                            return;
+                        
+                        client.SendChatMessage(c.Message, (byte)cType, CenterOfRegion, fromName, fromID, 
+                                               (byte)sourceType, (byte)ChatAudibleLevel.Fully);
+                    }
+                );
+             }
         }
 
 
@@ -317,5 +347,35 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
             presence.ControllingClient.SendChatMessage(message, (byte) type, fromPos, fromName,
                                                        fromAgentID,(byte)src,(byte)ChatAudibleLevel.Fully);
         }
+
+        Dictionary<UUID, System.Threading.Timer> Timers = new Dictionary<UUID, System.Threading.Timer>();
+        public void ParcelFreezeUser(IClientAPI client, UUID parcelowner, uint flags, UUID target)
+        {
+            System.Threading.Timer Timer;
+            if (flags == 0)
+            {
+                FreezeCache.Add(target.ToString());
+                System.Threading.TimerCallback timeCB = new System.Threading.TimerCallback(OnEndParcelFrozen);
+                Timer = new System.Threading.Timer(timeCB, target, 30000, 0);
+                Timers.Add(target, Timer);
+            }
+            else
+            {
+                FreezeCache.Remove(target.ToString());
+                Timers.TryGetValue(target, out Timer);
+                Timers.Remove(target);
+                Timer.Dispose();
+            }
+        }
+
+        private void OnEndParcelFrozen(object avatar)
+        {
+            UUID target = (UUID)avatar;
+            FreezeCache.Remove(target.ToString());
+            System.Threading.Timer Timer;
+            Timers.TryGetValue(target, out Timer);
+            Timers.Remove(target);
+            Timer.Dispose();
+        }
     }
 }
diff --git a/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs b/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs
index 2105f3c..1498dba 100644
--- a/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs
@@ -1,208 +1,223 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using System.Collections.Generic;
-using System.Reflection;
-using log4net;
-using Nini.Config;
-using OpenMetaverse;
-using OpenSim.Framework;
-
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-using OpenSim.Services.Interfaces;
-
-namespace OpenSim.Region.CoreModules.Avatar.Dialog
-{
-    public class DialogModule : IRegionModule, IDialogModule
-    { 
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
-        protected Scene m_scene;
-        
-        public void Initialise(Scene scene, IConfigSource source)
-        {
-            m_scene = scene;
-            m_scene.RegisterModuleInterface<IDialogModule>(this);
-            
-            m_scene.AddCommand(
-                this, "alert", "alert <first> <last> <message>", "Send an alert to a user", HandleAlertConsoleCommand);
-
-            m_scene.AddCommand(
-                this, "alert general", "alert general <message>", "Send an alert to everyone", HandleAlertConsoleCommand);
-        }
-        
-        public void PostInitialise() {}
-        public void Close() {}
-        public string Name { get { return "Dialog Module"; } }
-        public bool IsSharedModule { get { return false; } }
-        
-        public void SendAlertToUser(IClientAPI client, string message)
-        {
-            SendAlertToUser(client, message, false);
-        }
-        
-        public void SendAlertToUser(IClientAPI client, string message, bool modal)
-        {
-            client.SendAgentAlertMessage(message, modal);
-        } 
-        
-        public void SendAlertToUser(UUID agentID, string message)
-        {
-            SendAlertToUser(agentID, message, false);
-        }
-        
-        public void SendAlertToUser(UUID agentID, string message, bool modal)
-        {
-            ScenePresence sp = m_scene.GetScenePresence(agentID);
-            
-            if (sp != null)
-                sp.ControllingClient.SendAgentAlertMessage(message, modal);
-        }
-        
-        public void SendAlertToUser(string firstName, string lastName, string message, bool modal)
-        {
-            ScenePresence presence = m_scene.GetScenePresence(firstName, lastName);
-            if (presence != null)
-                presence.ControllingClient.SendAgentAlertMessage(message, modal);
-        }
-        
-        public void SendGeneralAlert(string message)
-        {
-            m_scene.ForEachScenePresence(delegate(ScenePresence presence)
-            {
-                if (!presence.IsChildAgent)
-                    presence.ControllingClient.SendAlertMessage(message);
-            });
-        }
-
-        public void SendDialogToUser(
-            UUID avatarID, string objectName, UUID objectID, UUID ownerID,
-            string message, UUID textureID, int ch, string[] buttonlabels)
-        {
-            UserAccount account = m_scene.UserAccountService.GetUserAccount(m_scene.RegionInfo.ScopeID, ownerID);
-            string ownerFirstName, ownerLastName;
-            if (account != null)
-            {
-                ownerFirstName = account.FirstName;
-                ownerLastName = account.LastName;
-            }
-            else
-            {
-                ownerFirstName = "(unknown";
-                ownerLastName = "user)";
-            }
-
-            ScenePresence sp = m_scene.GetScenePresence(avatarID);
-            if (sp != null)
-                sp.ControllingClient.SendDialog(objectName, objectID, ownerFirstName, ownerLastName, message, textureID, ch, buttonlabels);
-        }
-
-        public void SendUrlToUser(
-            UUID avatarID, string objectName, UUID objectID, UUID ownerID, bool groupOwned, string message, string url)
-        {
-            ScenePresence sp = m_scene.GetScenePresence(avatarID);
-            
-            if (sp != null)
-                sp.ControllingClient.SendLoadURL(objectName, objectID, ownerID, groupOwned, message, url);
-        }
-        
-        public void SendTextBoxToUser(UUID avatarid, string message, int chatChannel, string name, UUID objectid, UUID ownerid)
-        {
-            UserAccount account = m_scene.UserAccountService.GetUserAccount(m_scene.RegionInfo.ScopeID, ownerid);
-            string ownerFirstName, ownerLastName;
-            if (account != null)
-            {
-                ownerFirstName = account.FirstName;
-                ownerLastName = account.LastName;
-            }
-            else
-            {
-                ownerFirstName = "(unknown";
-                ownerLastName = "user)";
-            }
-
-            ScenePresence sp = m_scene.GetScenePresence(avatarid);
-            
-            if (sp != null)
-                sp.ControllingClient.SendTextBoxRequest(message, chatChannel, name, ownerFirstName, ownerLastName, objectid);
-        }
-
-        public void SendNotificationToUsersInRegion(
-            UUID fromAvatarID, string fromAvatarName, string message)
-        {
-            m_scene.ForEachScenePresence(delegate(ScenePresence presence)
-            {
-                if (!presence.IsChildAgent)
-                    presence.ControllingClient.SendBlueBoxMessage(fromAvatarID, fromAvatarName, message);
-            });
-        }
-        
-        /// <summary>
-        /// Handle an alert command from the console.
-        /// </summary>
-        /// <param name="module"></param>
-        /// <param name="cmdparams"></param>
-        public void HandleAlertConsoleCommand(string module, string[] cmdparams)
-        {
-            if (m_scene.ConsoleScene() != null && m_scene.ConsoleScene() != m_scene)
-                return;
-            
-            if (cmdparams[1] == "general")
-            {
-                string message = CombineParams(cmdparams, 2);
-                
-                m_log.InfoFormat(
-                    "[DIALOG]: Sending general alert in region {0} with message {1}", m_scene.RegionInfo.RegionName, message);
-                SendGeneralAlert(message);
-            }
-            else
-            {
-                string firstName = cmdparams[1];
-                string lastName = cmdparams[2];
-                string message = CombineParams(cmdparams, 3);
-                
-                m_log.InfoFormat(
-                    "[DIALOG]: Sending alert in region {0} to {1} {2} with message {3}", 
-                    m_scene.RegionInfo.RegionName, firstName, lastName, message);
-                SendAlertToUser(firstName, lastName, message, false);
-            }
-        }
-
-        private string CombineParams(string[] commandParams, int pos)
-        {
-            string result = string.Empty;
-            for (int i = pos; i < commandParams.Length; i++)
-            {
-                result += commandParams[i] + " ";
-            }
-            
-            return result;
-        }
-    }
-}
\ No newline at end of file
+/*

+ * Copyright (c) Contributors, http://opensimulator.org/

+ * See CONTRIBUTORS.TXT for a full list of copyright holders.

+ *

+ * Redistribution and use in source and binary forms, with or without

+ * modification, are permitted provided that the following conditions are met:

+ *     * Redistributions of source code must retain the above copyright

+ *       notice, this list of conditions and the following disclaimer.

+ *     * Redistributions in binary form must reproduce the above copyright

+ *       notice, this list of conditions and the following disclaimer in the

+ *       documentation and/or other materials provided with the distribution.

+ *     * Neither the name of the OpenSimulator Project nor the

+ *       names of its contributors may be used to endorse or promote products

+ *       derived from this software without specific prior written permission.

+ *

+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY

+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY

+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

+ */

+

+using System;

+using System.Collections.Generic;

+using System.Reflection;

+using log4net;

+using Nini.Config;

+using OpenMetaverse;

+using OpenSim.Framework;

+

+using OpenSim.Region.Framework.Interfaces;

+using OpenSim.Region.Framework.Scenes;

+using OpenSim.Services.Interfaces;

+

+namespace OpenSim.Region.CoreModules.Avatar.Dialog

+{

+    public class DialogModule : IRegionModule, IDialogModule

+    { 

+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);

+        

+        protected Scene m_scene;

+        

+        public void Initialise(Scene scene, IConfigSource source)

+        {

+            m_scene = scene;

+            m_scene.RegisterModuleInterface<IDialogModule>(this);

+            

+            m_scene.AddCommand(

+                this, "alert", "alert <first> <last> <message>", "Send an alert to a user", HandleAlertConsoleCommand);

+

+            m_scene.AddCommand(

+                this, "alert general", "alert general <message>", "Send an alert to everyone", HandleAlertConsoleCommand);

+

+            m_scene.AddCommand(

+                this, "alert dialog", "alert dialog <message>", "Send a dialog alert to everyone", HandleAlertConsoleCommand);

+

+

+        }

+        

+        public void PostInitialise() {}

+        public void Close() {}

+        public string Name { get { return "Dialog Module"; } }

+        public bool IsSharedModule { get { return false; } }

+        

+        public void SendAlertToUser(IClientAPI client, string message)

+        {

+            SendAlertToUser(client, message, false);

+        }

+        

+        public void SendAlertToUser(IClientAPI client, string message, bool modal)

+        {

+            client.SendAgentAlertMessage(message, modal);

+        } 

+        

+        public void SendAlertToUser(UUID agentID, string message)

+        {

+            SendAlertToUser(agentID, message, false);

+        }

+        

+        public void SendAlertToUser(UUID agentID, string message, bool modal)

+        {

+            ScenePresence sp = m_scene.GetScenePresence(agentID);

+            

+            if (sp != null)

+                sp.ControllingClient.SendAgentAlertMessage(message, modal);

+        }

+        

+        public void SendAlertToUser(string firstName, string lastName, string message, bool modal)

+        {

+            ScenePresence presence = m_scene.GetScenePresence(firstName, lastName);

+            if (presence != null)

+                presence.ControllingClient.SendAgentAlertMessage(message, modal);

+        }

+        

+        public void SendGeneralAlert(string message)

+        {

+            m_scene.ForEachScenePresence(delegate(ScenePresence presence)

+            {

+                if (!presence.IsChildAgent)

+                {

+                    presence.ControllingClient.SendAlertMessage(message);

+                }

+            });

+        }

+

+        public void SendDialogToUser(

+            UUID avatarID, string objectName, UUID objectID, UUID ownerID,

+            string message, UUID textureID, int ch, string[] buttonlabels)

+        {

+            UserAccount account = m_scene.UserAccountService.GetUserAccount(m_scene.RegionInfo.ScopeID, ownerID);

+            string ownerFirstName, ownerLastName;

+            if (account != null)

+            {

+                ownerFirstName = account.FirstName;

+                ownerLastName = account.LastName;

+            }

+            else

+            {

+                ownerFirstName = "(unknown";

+                ownerLastName = "user)";

+            }

+

+            ScenePresence sp = m_scene.GetScenePresence(avatarID);

+            if (sp != null)

+                sp.ControllingClient.SendDialog(objectName, objectID, ownerFirstName, ownerLastName, message, textureID, ch, buttonlabels);

+        }

+

+        public void SendUrlToUser(

+            UUID avatarID, string objectName, UUID objectID, UUID ownerID, bool groupOwned, string message, string url)

+        {

+            ScenePresence sp = m_scene.GetScenePresence(avatarID);

+            

+            if (sp != null)

+                sp.ControllingClient.SendLoadURL(objectName, objectID, ownerID, groupOwned, message, url);

+        }

+        

+        public void SendTextBoxToUser(UUID avatarid, string message, int chatChannel, string name, UUID objectid, UUID ownerid)

+        {

+            UserAccount account = m_scene.UserAccountService.GetUserAccount(m_scene.RegionInfo.ScopeID, ownerid);

+            string ownerFirstName, ownerLastName;

+            if (account != null)

+            {

+                ownerFirstName = account.FirstName;

+                ownerLastName = account.LastName;

+            }

+            else

+            {

+                ownerFirstName = "(unknown";

+                ownerLastName = "user)";

+            }

+

+            ScenePresence sp = m_scene.GetScenePresence(avatarid);

+            

+            if (sp != null)

+                sp.ControllingClient.SendTextBoxRequest(message, chatChannel, name, ownerFirstName, ownerLastName, objectid);

+        }

+

+        public void SendNotificationToUsersInRegion(

+            UUID fromAvatarID, string fromAvatarName, string message)

+        {

+            m_scene.ForEachScenePresence(delegate(ScenePresence presence)

+            {

+                if (!presence.IsChildAgent)

+                    presence.ControllingClient.SendBlueBoxMessage(fromAvatarID, fromAvatarName, message);

+            });

+        }

+        

+        /// <summary>

+        /// Handle an alert command from the console.

+        /// </summary>

+        /// <param name="module"></param>

+        /// <param name="cmdparams"></param>

+        public void HandleAlertConsoleCommand(string module, string[] cmdparams)

+        {

+            if (m_scene.ConsoleScene() != null && m_scene.ConsoleScene() != m_scene)

+                return;

+            

+            if (cmdparams[1] == "general")

+            {

+                string message = CombineParams(cmdparams, 2);

+                

+                m_log.InfoFormat(

+                    "[DIALOG]: Sending general alert in region {0} with message {1}", m_scene.RegionInfo.RegionName, message);

+                SendGeneralAlert(message);

+            }

+            else if (cmdparams[1] == "dialog")

+            {

+                string message = CombineParams(cmdparams, 2);

+

+                m_log.InfoFormat(

+                    "[DIALOG]: Sending dialog alert in region {0} with message {1}", m_scene.RegionInfo.RegionName, message);

+                SendNotificationToUsersInRegion(UUID.Zero, "System", message);

+            }

+            else

+            {

+                string firstName = cmdparams[1];

+                string lastName = cmdparams[2];

+                string message = CombineParams(cmdparams, 3);

+                

+                m_log.InfoFormat(

+                    "[DIALOG]: Sending alert in region {0} to {1} {2} with message {3}", 

+                    m_scene.RegionInfo.RegionName, firstName, lastName, message);

+                SendAlertToUser(firstName, lastName, message, false);

+            }

+        }

+

+        private string CombineParams(string[] commandParams, int pos)

+        {

+            string result = string.Empty;

+            for (int i = pos; i < commandParams.Length; i++)

+            {

+                result += commandParams[i] + " ";

+            }

+            

+            return result;

+        }

+    }

+}

diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
index 6f044cb..ca0b7ad 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
@@ -67,7 +67,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
                 return false;
             }
         }
-            
+
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         protected List<Scene> m_Scenes = new List<Scene>();
@@ -203,9 +203,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
 
             UserFriendData data = m_Friends[principalID];
 
+            string searchFor = friendID.ToString();
             foreach (FriendInfo fi in data.Friends)
             {
-                if (fi.Friend == friendID.ToString())
+                if (fi.Friend == searchFor)
                     return (uint)fi.TheirFlags;
             }
             return 0;
@@ -292,7 +293,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
 
             // Inform the friends that this user is online
             StatusChange(agentID, true);
-            
+
             // Register that we need to send the list of online friends to this user
             lock (m_NeedsListOfFriends)
                 if (!m_NeedsListOfFriends.Contains(agentID))
@@ -498,7 +499,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
         private void OnInstantMessage(IClientAPI client, GridInstantMessage im)
         {
             if (im.dialog == (byte)OpenMetaverse.InstantMessageDialog.FriendshipOffered)
-            { 
+            {
                 // we got a friendship offer
                 UUID principalID = new UUID(im.fromAgentID);
                 UUID friendID = new UUID(im.toAgentID);
@@ -730,7 +731,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
                 // we're done
                 return true;
             }
-            
+
             return false;
         }
 
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
index a3c40e0..1603c07 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
@@ -156,6 +156,31 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
                 return;
             }
 
+            DateTime dt = DateTime.UtcNow;
+
+            // Ticks from UtcNow, but make it look like local. Evil, huh?
+            dt = DateTime.SpecifyKind(dt, DateTimeKind.Local);
+
+            try
+            {
+                // Convert that to the PST timezone
+                TimeZoneInfo timeZoneInfo = TimeZoneInfo.FindSystemTimeZoneById("America/Los_Angeles");
+                dt = TimeZoneInfo.ConvertTime(dt, timeZoneInfo);
+            }
+            catch
+            {
+                //m_log.Info("[OFFLINE MESSAGING]: No PST timezone found on this machine. Saving with local timestamp.");
+            }
+
+            // And make it look local again to fool the unix time util
+            dt = DateTime.SpecifyKind(dt, DateTimeKind.Utc);
+
+            im.timestamp = (uint)Util.ToUnixTime(dt);
+
+            // If client is null, this message comes from storage and IS offline
+            if (client != null)
+                im.offline = 0;
+
             if (m_TransferModule != null)
             {
                 m_TransferModule.SendInstantMessage(im,
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
index d025f0c..e1ee0b1 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
@@ -132,7 +132,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
         {
             UUID toAgentID = new UUID(im.toAgentID);
 
-            m_log.DebugFormat("[INSTANT MESSAGE]: Attempting delivery of IM from {0} to {1}", im.fromAgentName, toAgentID.ToString());
+            //m_log.DebugFormat("[INSTANT MESSAGE]: Attempting delivery of IM from {0} to {1}", im.fromAgentName, toAgentID.ToString());
 
             // Try root avatar only first
             foreach (Scene scene in m_Scenes)
@@ -140,12 +140,12 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
                 if (scene.Entities.ContainsKey(toAgentID) &&
                         scene.Entities[toAgentID] is ScenePresence)
                 {
-                    m_log.DebugFormat("[INSTANT MESSAGE]: Looking for {0} in {1}", toAgentID.ToString(), scene.RegionInfo.RegionName);
+             //       m_log.DebugFormat("[INSTANT MESSAGE]: Looking for {0} in {1}", toAgentID.ToString(), scene.RegionInfo.RegionName);
                     // Local message
                     ScenePresence user = (ScenePresence) scene.Entities[toAgentID];
                     if (!user.IsChildAgent)
                     {
-                        m_log.DebugFormat("[INSTANT MESSAGE]: Delivering to client");
+              //          m_log.DebugFormat("[INSTANT MESSAGE]: Delivering to client");
                         user.ControllingClient.SendInstantMessage(im);
 
                         // Message sent
@@ -167,7 +167,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
                     // Local message
                     ScenePresence user = (ScenePresence) scene.Entities[toAgentID];
 
-                    m_log.DebugFormat("[INSTANT MESSAGE]: Delivering to client");
+               //     m_log.DebugFormat("[INSTANT MESSAGE]: Delivering to client");
                     user.ControllingClient.SendInstantMessage(im);
 
                     // Message sent
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
index fdfcd10..feeb9e6 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
@@ -172,13 +172,16 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
 
         private void RetrieveInstantMessages(IClientAPI client)
         {
-            if (m_RestURL != "")
-            {
-                m_log.DebugFormat("[OFFLINE MESSAGING] Retrieving stored messages for {0}", client.AgentId);
+            if (m_RestURL == String.Empty)
+                return;
 
-                List<GridInstantMessage> msglist = SynchronousRestObjectPoster.BeginPostObject<UUID, List<GridInstantMessage>>(
+            m_log.DebugFormat("[OFFLINE MESSAGING] Retrieving stored messages for {0}", client.AgentId);
+
+            List<GridInstantMessage> msglist = SynchronousRestObjectPoster.BeginPostObject<UUID, List<GridInstantMessage>>(
                         "POST", m_RestURL + "/RetrieveMessages/", client.AgentId);
 
+            if (msglist != null)
+            {
                 foreach (GridInstantMessage im in msglist)
                 {
                     // client.SendInstantMessage(im);
@@ -189,6 +192,17 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
                     // Needed for proper state management for stored group
                     // invitations
                     //
+
+                    im.offline = 1;
+
+                    // Reconstruct imSessionID
+                    if (im.dialog == (byte)InstantMessageDialog.MessageFromAgent)
+                    {
+                        UUID fromAgentID = new UUID(im.fromAgentID);
+                        UUID sessionID = fromAgentID ^ client.AgentId;
+                        im.imSessionID = new Guid(sessionID.ToString());
+                    }
+
                     Scene s = FindScene(client.AgentId);
                     if (s != null)
                         s.EventManager.TriggerIncomingInstantMessage(im);
@@ -198,26 +212,37 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
 
         private void UndeliveredMessage(GridInstantMessage im)
         {
-            if ((im.offline != 0)
-                && (!im.fromGroup || (im.fromGroup && m_ForwardOfflineGroupMessages)))
+            if (im.dialog != (byte)InstantMessageDialog.MessageFromObject &&
+                im.dialog != (byte)InstantMessageDialog.MessageFromAgent &&
+                im.dialog != (byte)InstantMessageDialog.GroupNotice &&
+                im.dialog != (byte)InstantMessageDialog.InventoryOffered)
             {
-                bool success = SynchronousRestObjectPoster.BeginPostObject<GridInstantMessage, bool>(
-                        "POST", m_RestURL+"/SaveMessage/", im);
+                return;
+            }
 
-                if (im.dialog == (byte)InstantMessageDialog.MessageFromAgent)
-                {
-                    IClientAPI client = FindClient(new UUID(im.fromAgentID));
-                    if (client == null)
-                        return;
-
-                    client.SendInstantMessage(new GridInstantMessage(
-                            null, new UUID(im.toAgentID),
-                            "System", new UUID(im.fromAgentID),
-                            (byte)InstantMessageDialog.MessageFromAgent,
-                            "User is not logged in. "+
-                            (success ? "Message saved." : "Message not saved"),
-                            false, new Vector3()));
-                }
+            // It's not delivered. Make sure the scope id is saved
+            // We don't need the imSessionID here anymore, overwrite it
+            Scene scene = FindScene(new UUID(im.fromAgentID));
+            if (scene == null)
+                scene = m_SceneList[0];
+            im.imSessionID = new Guid(scene.RegionInfo.ScopeID.ToString());
+
+            bool success = SynchronousRestObjectPoster.BeginPostObject<GridInstantMessage, bool>(
+                    "POST", m_RestURL+"/SaveMessage/", im);
+
+            if (im.dialog == (byte)InstantMessageDialog.MessageFromAgent)
+            {
+                IClientAPI client = FindClient(new UUID(im.fromAgentID));
+                if (client == null)
+                    return;
+
+                client.SendInstantMessage(new GridInstantMessage(
+                        null, new UUID(im.toAgentID),
+                        "System", new UUID(im.fromAgentID),
+                        (byte)InstantMessageDialog.MessageFromAgent,
+                        "User is not logged in. "+
+                        (success ? "Message saved." : "Message not saved"),
+                        false, new Vector3()));
             }
         }
     }
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
index 8b77a5f..4465e8a 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
@@ -160,7 +160,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
 
         private void OnInstantMessage(IClientAPI client, GridInstantMessage im)
         {
-            m_log.InfoFormat("[INVENTORY TRANSFER]: OnInstantMessage {0}", im.dialog);
+            //m_log.InfoFormat("[INVENTORY TRANSFER]: OnInstantMessage {0}", im.dialog);
             
             Scene scene = FindClientScene(client.AgentId);
 
@@ -247,6 +247,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
                     im.imSessionID = itemID.Guid;
                 }
 
+                im.offline = 1; // Remember these
+
                 // Send the IM to the recipient. The item is already
                 // in their inventory, so it will not be lost if
                 // they are offline.
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index bb98dba..0ba67d3 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -259,7 +259,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             // This may be a costly operation. The reg.ExternalEndPoint field is not a passive field,
             // it's actually doing a lot of work.
             IPEndPoint endPoint = finalDestination.ExternalEndPoint;
-            if (endPoint.Address != null)
+            if (endPoint != null && endPoint.Address != null)
             {
                 // Fixing a bug where teleporting while sitting results in the avatar ending up removed from
                 // both regions
@@ -561,6 +561,12 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
             if (uinfo != null)
             {
+                if (uinfo.HomeRegionID == UUID.Zero)
+                {
+                    // can't find the Home region: Tell viewer and abort
+                    client.SendTeleportFailed("You don't have a home position set.");
+                    return;
+                }
                 GridRegion regionInfo = m_aScene.GridService.GetRegionByUUID(UUID.Zero, uinfo.HomeRegionID);
                 if (regionInfo == null)
                 {
@@ -568,7 +574,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                     client.SendTeleportFailed("Your home region could not be found.");
                     return;
                 }
-                m_log.DebugFormat("[ENTITY TRANSFER MODULE]: User's home region is {0} {1} ({2}-{3})", 
+                m_log.DebugFormat("[ENTITY TRANSFER MODULE]: User's home region is {0} {1} ({2}-{3})",
                     regionInfo.RegionName, regionInfo.RegionID, regionInfo.RegionLocX / Constants.RegionSize, regionInfo.RegionLocY / Constants.RegionSize);
 
                 // a little eekie that this goes back to Scene and with a forced cast, will fix that at some point...
@@ -576,6 +582,12 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                     client, regionInfo.RegionHandle, uinfo.HomePosition, uinfo.HomeLookAt,
                     (uint)(Constants.TeleportFlags.SetLastToTarget | Constants.TeleportFlags.ViaHome));
             }
+            else
+            {
+                // can't find the Home region: Tell viewer and abort
+                client.SendTeleportFailed("Your home region could not be found.");
+                return;
+            }
         }
 
         #endregion
@@ -863,15 +875,19 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Sending new CAPS seed url {0} to client {1}", capsPath, agent.UUID);
 
                 IEventQueue eq = agent.Scene.RequestModuleInterface<IEventQueue>();
-                if (eq != null)
-                {
-                    eq.CrossRegion(neighbourHandle, pos, agent.Velocity, neighbourRegion.ExternalEndPoint,
-                                   capsPath, agent.UUID, agent.ControllingClient.SessionId);
-                }
-                else
+                IPEndPoint neighbourExternal = neighbourRegion.ExternalEndPoint;
+                if (neighbourExternal != null)
                 {
-                    agent.ControllingClient.CrossRegion(neighbourHandle, pos, agent.Velocity, neighbourRegion.ExternalEndPoint,
-                                                capsPath);
+                    if (eq != null)
+                    {
+                        eq.CrossRegion(neighbourHandle, pos, agent.Velocity, neighbourExternal,
+                                       capsPath, agent.UUID, agent.ControllingClient.SessionId);
+                    }
+                    else
+                    {
+                        agent.ControllingClient.CrossRegion(neighbourHandle, pos, agent.Velocity, neighbourExternal,
+                                                    capsPath);
+                    }
                 }
 
                 if (!WaitForCallback(agent.UUID))
@@ -969,10 +985,14 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 agent.Viewer = currentAgentCircuit.Viewer;
             }
 
-            InformClientOfNeighbourDelegate d = InformClientOfNeighbourAsync;
-            d.BeginInvoke(sp, agent, region, region.ExternalEndPoint, true,
+            IPEndPoint external = region.ExternalEndPoint;
+            if (external != null)
+            {
+                InformClientOfNeighbourDelegate d = InformClientOfNeighbourAsync;
+                d.BeginInvoke(sp, agent, region, external, true,
                           InformClientOfNeighbourCompleted,
                           d);
+            }
         }
         #endregion
 
@@ -1101,6 +1121,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                     InformClientOfNeighbourDelegate d = InformClientOfNeighbourAsync;
                     try
                     {
+                        //neighbour.ExternalEndPoint may return null, which will be caught
                         d.BeginInvoke(sp, cagents[count], neighbour, neighbour.ExternalEndPoint, newAgent,
                                       InformClientOfNeighbourCompleted,
                                       d);
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
index eef0c73..cc12df0 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
@@ -219,6 +219,11 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
 
             Vector3 originalPosition = objectGroup.AbsolutePosition;
 
+            // Restore attachment data after trip through the sim
+            if (objectGroup.RootPart.AttachPoint > 0)
+                inventoryStoredPosition = objectGroup.RootPart.AttachOffset;
+            objectGroup.RootPart.Shape.State = objectGroup.RootPart.AttachPoint;
+
             objectGroup.AbsolutePosition = inventoryStoredPosition;
 
             string sceneObjectXml = SceneObjectSerializer.ToOriginalXmlFormat(objectGroup);
@@ -491,6 +496,11 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
 
             if (item != null)
             {
+                if (item.ID == UUID.Zero)
+                {
+                    m_log.Debug("[InventoryAccessModule]: Inventory object has UUID.Zero! Position 1");
+                }
+
                 AssetBase rezAsset = m_Scene.AssetService.Get(item.AssetID.ToString());
 
                 if (rezAsset != null)
@@ -513,17 +523,30 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                         itemId = item.ID;
                     }
 
+                    if (item.ID == UUID.Zero)
+                    {
+                        m_log.Debug("[InventoryAccessModule]: Inventory object has UUID.Zero! Position 2");
+                    }
+
                     string xmlData = Utils.BytesToString(rezAsset.Data);
                     SceneObjectGroup group
                         = SceneObjectSerializer.FromOriginalXmlFormat(itemId, xmlData);
-
+                    Vector3 storedPosition = group.AbsolutePosition;
+                    if (group.UUID == UUID.Zero)
+                    {
+                        m_log.Debug("[InventoryAccessModule]: Inventory object has UUID.Zero! Position 3");
+                    }
                     group.RootPart.FromFolderID = item.Folder;
 
                     // If it's rezzed in world, select it. Much easier to 
                     // find small items.
                     //
                     if (!attachment)
+                    {
                         group.RootPart.CreateSelected = true;
+                        foreach (SceneObjectPart child in group.Children.Values)
+                            child.CreateSelected = true;
+                    }
 
                     if (!m_Scene.Permissions.CanRezObject(
                         group.Children.Count, remoteClient.AgentId, pos)
@@ -538,9 +561,15 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                             remoteClient.SendBulkUpdateInventory(item);
                         return null;
                     }
-
+                    if (group.UUID == UUID.Zero)
+                    {
+                        m_log.Debug("[InventoryAccessModule]: Inventory object has UUID.Zero! Position 4");
+                    }
                     group.ResetIDs();
-
+                    if (group.UUID == UUID.Zero)
+                    {
+                        m_log.Debug("[InventoryAccessModule]: Inventory object has UUID.Zero! Position 5");
+                    }
                     if (attachment)
                     {
                         group.RootPart.Flags |= PrimFlags.Phantom;
@@ -572,7 +601,10 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                     {
                         group.SetFromItemID(itemID);
                     }
-
+                    if (group.UUID == UUID.Zero)
+                    {
+                        m_log.Debug("[InventoryAccessModule]: Inventory object has UUID.Zero! Position 6");
+                    }
                     SceneObjectPart rootPart = null;
                     try
                     {
@@ -587,7 +619,10 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
 
                         m_log.Error("[AGENT INVENTORY]: Error rezzing ItemID: " + itemID + " object has no rootpart." + isAttachment);
                     }
-
+                    if (group.UUID == UUID.Zero)
+                    {
+                        m_log.Debug("[InventoryAccessModule]: Inventory object has UUID.Zero! Position 7");
+                    }
                     // Since renaming the item in the inventory does not affect the name stored
                     // in the serialization, transfer the correct name from the inventory to the
                     // object itself before we rez.
@@ -615,7 +650,10 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                             group.ApplyNextOwnerPermissions();
                         }
                     }
-
+                    if (group.UUID == UUID.Zero)
+                    {
+                        m_log.Debug("[InventoryAccessModule]: Inventory object has UUID.Zero! Position 8");
+                    }
                     foreach (SceneObjectPart part in partList)
                     {
                         if ((part.OwnerID != item.Owner) || (item.CurrentPermissions & 16) != 0)
@@ -628,13 +666,23 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                         part.EveryoneMask = item.EveryOnePermissions;
                         part.NextOwnerMask = item.NextPermissions;
                     }
-
+                    if (group.UUID == UUID.Zero)
+                    {
+                        m_log.Debug("[InventoryAccessModule]: Inventory object has UUID.Zero! Position 9");
+                    }
                     rootPart.TrimPermissions();
-
+                    if (group.UUID == UUID.Zero)
+                    {
+                        m_log.Debug("[InventoryAccessModule]: Inventory object has UUID.Zero! Position 10");
+                    }
                     if (!attachment)
                     {
                         if (group.RootPart.Shape.PCode == (byte)PCode.Prim)
                         {
+                            // Save attachment data
+                            group.RootPart.AttachPoint = group.RootPart.Shape.State;
+                            group.RootPart.AttachOffset = storedPosition;
+
                             group.ClearPartAttachmentData();
                         }
                         
@@ -660,8 +708,11 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                             }
                         }
                     }
-
-                    return rootPart.ParentGroup;
+                    if (group.UUID == UUID.Zero)
+                    {
+                        m_log.Debug("[InventoryAccessModule]: Inventory object has UUID.Zero! Position 11");
+                    }
+                    return group;
                 }
             }
 
diff --git a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
index 9b565ed..1fd1f47 100644
--- a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
@@ -142,7 +142,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
                     engine.PostScriptEvent(itemID, "http_request", new Object[] { urlcode.ToString(), "URL_REQUEST_DENIED", "" });
                     return urlcode;
                 }
-                string url = "http://" + m_ExternalHostNameForLSL + ":" + m_HttpServer.Port.ToString() + "/lslhttp/" + urlcode.ToString() + "/";
+                string url = "http://" + m_ExternalHostNameForLSL + ":" + m_HttpServer.Port.ToString() + "/lslhttp/" + urlcode.ToString();
 
                 UrlData urlData = new UrlData();
                 urlData.hostID = host.UUID;
@@ -152,10 +152,9 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
                 urlData.urlcode = urlcode;
                 urlData.requests = new Dictionary<UUID, RequestData>();
 
-                
                 m_UrlMap[url] = urlData;
                 
-                string uri = "/lslhttp/" + urlcode.ToString() + "/";
+                string uri = "/lslhttp/" + urlcode.ToString();
                
                 m_HttpServer.AddPollServiceHTTPHandler(uri,HandleHttpPoll,
                         new PollServiceEventArgs(HttpRequestHandler,HasEvents, GetEvents, NoEvents,
@@ -386,6 +385,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
 
             return response;
         }
+
         public void HttpRequestHandler(UUID requestID, Hashtable request)
         {
             lock (request)
@@ -400,8 +400,8 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
 
                     int pos1 = uri.IndexOf("/");// /lslhttp
                     int pos2 = uri.IndexOf("/", pos1 + 1);// /lslhttp/
-                    int pos3 = uri.IndexOf("/", pos2 + 1);// /lslhttp/<UUID>/
-                    string uri_tmp = uri.Substring(0, pos3 + 1);
+                    int pos3 = pos2 + 37; // /lslhttp/urlcode
+                    string uri_tmp = uri.Substring(0, pos3);
                     //HTTP server code doesn't provide us with QueryStrings
                     string pathInfo;
                     string queryString;
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs
index e54ee02..ebfba2b 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs
@@ -57,9 +57,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid.Tests
             config.Configs["Modules"].Set("GridServices", "LocalGridServicesConnector");
             config.Configs["GridService"].Set("LocalServiceModule", "OpenSim.Services.GridService.dll:GridService");
             config.Configs["GridService"].Set("StorageProvider", "OpenSim.Data.Null.dll");
-            config.Configs["GridService"].Set("Region_Test_Region_1", "DefaultRegion");
-            config.Configs["GridService"].Set("Region_Test_Region_2", "FallbackRegion");
-            config.Configs["GridService"].Set("Region_Test_Region_3", "FallbackRegion");
+            config.Configs["GridService"].Set("Region_Test_Region_1", "DefaultRegion");

+            config.Configs["GridService"].Set("Region_Test_Region_2", "FallbackRegion");

+            config.Configs["GridService"].Set("Region_Test_Region_3", "FallbackRegion");

             config.Configs["GridService"].Set("Region_Other_Region_4", "FallbackRegion");
 
             m_LocalConnector = new LocalGridServicesConnector(config);
@@ -128,8 +128,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid.Tests
             Assert.IsNotNull(result, "Retrieved GetRegionByName is null");
             Assert.That(result.RegionName, Is.EqualTo("Test Region 1"), "Retrieved region's name does not match");
 
-            m_LocalConnector.RegisterRegion(UUID.Zero, r2);
-            m_LocalConnector.RegisterRegion(UUID.Zero, r3);
+            m_LocalConnector.RegisterRegion(UUID.Zero, r2);

+            m_LocalConnector.RegisterRegion(UUID.Zero, r3);

             m_LocalConnector.RegisterRegion(UUID.Zero, r4);
 
             result = m_LocalConnector.GetRegionByUUID(UUID.Zero, new UUID(1));
@@ -154,38 +154,38 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid.Tests
             Assert.IsNotNull(results, "Retrieved GetRegionRange collection is null");
             Assert.That(results.Count, Is.EqualTo(2), "Retrieved neighbour collection is not the number expected");
 
-            results = m_LocalConnector.GetDefaultRegions(UUID.Zero);
-            Assert.IsNotNull(results, "Retrieved GetDefaultRegions collection is null");
-            Assert.That(results.Count, Is.EqualTo(1), "Retrieved default regions collection has not the expected size");
-            Assert.That(results[0].RegionID, Is.EqualTo(new UUID(1)), "Retrieved default region's UUID does not match");
-
-            results = m_LocalConnector.GetFallbackRegions(UUID.Zero, r1.RegionLocX, r1.RegionLocY);
-            Assert.IsNotNull(results, "Retrieved GetFallbackRegions collection for region 1 is null");
-            Assert.That(results.Count, Is.EqualTo(3), "Retrieved fallback regions collection for region 1 has not the expected size");
-            Assert.That(results[0].RegionID, Is.EqualTo(new UUID(2)), "Retrieved fallback regions for default region are not in the expected order 2-4-3");
-            Assert.That(results[1].RegionID, Is.EqualTo(new UUID(4)), "Retrieved fallback regions for default region are not in the expected order 2-4-3");
-            Assert.That(results[2].RegionID, Is.EqualTo(new UUID(3)), "Retrieved fallback regions for default region are not in the expected order 2-4-3");
-
-            results = m_LocalConnector.GetFallbackRegions(UUID.Zero, r2.RegionLocX, r2.RegionLocY);
-            Assert.IsNotNull(results, "Retrieved GetFallbackRegions collection for region 2 is null");
-            Assert.That(results.Count, Is.EqualTo(3), "Retrieved fallback regions collection for region 2 has not the expected size");
-            Assert.That(results[0].RegionID, Is.EqualTo(new UUID(2)), "Retrieved fallback regions are not in the expected order 2-4-3");
-            Assert.That(results[1].RegionID, Is.EqualTo(new UUID(4)), "Retrieved fallback regions are not in the expected order 2-4-3");
-            Assert.That(results[2].RegionID, Is.EqualTo(new UUID(3)), "Retrieved fallback regions are not in the expected order 2-4-3");
-
-            results = m_LocalConnector.GetFallbackRegions(UUID.Zero, r3.RegionLocX, r3.RegionLocY);
-            Assert.IsNotNull(results, "Retrieved GetFallbackRegions collection for region 3 is null");
-            Assert.That(results.Count, Is.EqualTo(3), "Retrieved fallback regions collection for region 3 has not the expected size");
-            Assert.That(results[0].RegionID, Is.EqualTo(new UUID(3)), "Retrieved fallback regions are not in the expected order 3-4-2");
-            Assert.That(results[1].RegionID, Is.EqualTo(new UUID(4)), "Retrieved fallback regions are not in the expected order 3-4-2");
-            Assert.That(results[2].RegionID, Is.EqualTo(new UUID(2)), "Retrieved fallback regions are not in the expected order 3-4-2");
-
-            results = m_LocalConnector.GetFallbackRegions(UUID.Zero, r4.RegionLocX, r4.RegionLocY);
-            Assert.IsNotNull(results, "Retrieved GetFallbackRegions collection for region 4 is null");
-            Assert.That(results.Count, Is.EqualTo(3), "Retrieved fallback regions collection for region 4 has not the expected size");
-            Assert.That(results[0].RegionID, Is.EqualTo(new UUID(4)), "Retrieved fallback regions are not in the expected order 4-3-2");
-            Assert.That(results[1].RegionID, Is.EqualTo(new UUID(3)), "Retrieved fallback regions are not in the expected order 4-3-2");
-            Assert.That(results[2].RegionID, Is.EqualTo(new UUID(2)), "Retrieved fallback regions are not in the expected order 4-3-2");
+            results = m_LocalConnector.GetDefaultRegions(UUID.Zero);

+            Assert.IsNotNull(results, "Retrieved GetDefaultRegions collection is null");

+            Assert.That(results.Count, Is.EqualTo(1), "Retrieved default regions collection has not the expected size");

+            Assert.That(results[0].RegionID, Is.EqualTo(new UUID(1)), "Retrieved default region's UUID does not match");

+

+            results = m_LocalConnector.GetFallbackRegions(UUID.Zero, r1.RegionLocX, r1.RegionLocY);

+            Assert.IsNotNull(results, "Retrieved GetFallbackRegions collection for region 1 is null");

+            Assert.That(results.Count, Is.EqualTo(3), "Retrieved fallback regions collection for region 1 has not the expected size");

+            Assert.That(results[0].RegionID, Is.EqualTo(new UUID(2)), "Retrieved fallback regions for default region are not in the expected order 2-4-3");

+            Assert.That(results[1].RegionID, Is.EqualTo(new UUID(4)), "Retrieved fallback regions for default region are not in the expected order 2-4-3");

+            Assert.That(results[2].RegionID, Is.EqualTo(new UUID(3)), "Retrieved fallback regions for default region are not in the expected order 2-4-3");

+

+            results = m_LocalConnector.GetFallbackRegions(UUID.Zero, r2.RegionLocX, r2.RegionLocY);

+            Assert.IsNotNull(results, "Retrieved GetFallbackRegions collection for region 2 is null");

+            Assert.That(results.Count, Is.EqualTo(3), "Retrieved fallback regions collection for region 2 has not the expected size");

+            Assert.That(results[0].RegionID, Is.EqualTo(new UUID(2)), "Retrieved fallback regions are not in the expected order 2-4-3");

+            Assert.That(results[1].RegionID, Is.EqualTo(new UUID(4)), "Retrieved fallback regions are not in the expected order 2-4-3");

+            Assert.That(results[2].RegionID, Is.EqualTo(new UUID(3)), "Retrieved fallback regions are not in the expected order 2-4-3");

+

+            results = m_LocalConnector.GetFallbackRegions(UUID.Zero, r3.RegionLocX, r3.RegionLocY);

+            Assert.IsNotNull(results, "Retrieved GetFallbackRegions collection for region 3 is null");

+            Assert.That(results.Count, Is.EqualTo(3), "Retrieved fallback regions collection for region 3 has not the expected size");

+            Assert.That(results[0].RegionID, Is.EqualTo(new UUID(3)), "Retrieved fallback regions are not in the expected order 3-4-2");

+            Assert.That(results[1].RegionID, Is.EqualTo(new UUID(4)), "Retrieved fallback regions are not in the expected order 3-4-2");

+            Assert.That(results[2].RegionID, Is.EqualTo(new UUID(2)), "Retrieved fallback regions are not in the expected order 3-4-2");

+

+            results = m_LocalConnector.GetFallbackRegions(UUID.Zero, r4.RegionLocX, r4.RegionLocY);

+            Assert.IsNotNull(results, "Retrieved GetFallbackRegions collection for region 4 is null");

+            Assert.That(results.Count, Is.EqualTo(3), "Retrieved fallback regions collection for region 4 has not the expected size");

+            Assert.That(results[0].RegionID, Is.EqualTo(new UUID(4)), "Retrieved fallback regions are not in the expected order 4-3-2");

+            Assert.That(results[1].RegionID, Is.EqualTo(new UUID(3)), "Retrieved fallback regions are not in the expected order 4-3-2");

+            Assert.That(results[2].RegionID, Is.EqualTo(new UUID(2)), "Retrieved fallback regions are not in the expected order 4-3-2");

 
             results = m_LocalConnector.GetHyperlinks(UUID.Zero);
             Assert.IsNotNull(results, "Retrieved GetHyperlinks list is null");
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
index e32dbb3..329a259 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
@@ -290,6 +290,23 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
             return false;
         }
 
+        public bool CloseChildAgent(GridRegion destination, UUID id)
+        {
+            if (destination == null)
+                return false;
+
+            foreach (Scene s in m_sceneList)
+            {
+                if (s.RegionInfo.RegionID == destination.RegionID)
+                {
+                    //m_log.Debug("[LOCAL COMMS]: Found region to SendCloseAgent");
+                    return s.IncomingCloseChildAgent(id);
+                }
+            }
+            //m_log.Debug("[LOCAL COMMS]: region not found in SendCloseAgent");
+            return false;
+        }
+
         /**
          * Object-related communications
          */
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
index 3f577f2..e16e273 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
@@ -252,6 +252,21 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
             return false;
         }
 
+        public bool CloseChildAgent(GridRegion destination, UUID id)
+        {
+            if (destination == null)
+                return false;
+
+            // Try local first
+            if (m_localBackend.CloseChildAgent(destination, id))
+                return true;
+
+            // else do the remote thing
+            if (!m_localBackend.IsLocalRegion(destination.RegionHandle))
+                return m_remoteConnector.CloseChildAgent(destination, id);
+
+            return false;
+        }
 
         public bool CloseAgent(GridRegion destination, UUID id)
         {
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/UserAccountCache.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/UserAccountCache.cs
index e1bc243..fb2edb9 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/UserAccountCache.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/UserAccountCache.cs
@@ -55,7 +55,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts
             if (account != null)
                 m_NameCache.AddOrUpdate(account.Name, account.PrincipalID, DateTime.Now + TimeSpan.FromMinutes(2.0d));
 
-            m_log.DebugFormat("[USER CACHE]: cached user {0}", userID);
+           // m_log.DebugFormat("[USER CACHE]: cached user {0}", userID);
         }
 
         public UserAccount Get(UUID userID, out bool inCache)
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
index bc653ce..57b7672 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
@@ -261,10 +261,11 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                     // Fix ownership/creator of inventory items
                     // Not doing so results in inventory items
                     // being no copy/no mod for everyone
-                    lock (part.TaskInventory)
+                    part.TaskInventory.LockItemsForRead(true);
+                    TaskInventoryDictionary inv = part.TaskInventory;
+                    foreach (KeyValuePair<UUID, TaskInventoryItem> kvp in inv)
                     {
-                        TaskInventoryDictionary inv = part.TaskInventory;
-                        foreach (KeyValuePair<UUID, TaskInventoryItem> kvp in inv)
+                        if (!ResolveUserUuid(kvp.Value.OwnerID))
                         {
                             if (!ResolveUserUuid(kvp.Value.OwnerID))
                             {
@@ -276,6 +277,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                             }
                         }
                     }
+                    part.TaskInventory.LockItemsForRead(false);
                 }
 
                 if (m_scene.AddRestoredSceneObject(sceneObject, true, false))
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
index 51f2c41..171e0b9 100644
--- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
@@ -29,6 +29,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Reflection;
 using System.Security;
+using System.Timers;
 using log4net;
 using Nini.Config;
 using OpenMetaverse;
@@ -45,6 +46,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
         private delegate void LookupUUIDS(List<UUID> uuidLst);
 
         private Scene m_scene;
+        private Timer m_regionChangeTimer = new Timer();
 
         private EstateTerrainXferHandler TerrainUploader;
 
@@ -250,7 +252,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
 
             if ((estateAccessType & 4) != 0) // User add
             {
-                if (m_scene.Permissions.CanIssueEstateCommand(remote_client.AgentId, true) || m_scene.Permissions.BypassPermissions())
+                if (m_scene.Permissions.CanIssueEstateCommand(remote_client.AgentId, false) || m_scene.Permissions.BypassPermissions())
                 {
                     m_scene.RegionInfo.EstateSettings.AddEstateUser(user);
                     m_scene.RegionInfo.EstateSettings.Save();
@@ -265,7 +267,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
             }
             if ((estateAccessType & 8) != 0) // User remove
             {
-                if (m_scene.Permissions.CanIssueEstateCommand(remote_client.AgentId, true) || m_scene.Permissions.BypassPermissions())
+                if (m_scene.Permissions.CanIssueEstateCommand(remote_client.AgentId, false) || m_scene.Permissions.BypassPermissions())
                 {
                     m_scene.RegionInfo.EstateSettings.RemoveEstateUser(user);
                     m_scene.RegionInfo.EstateSettings.Save();
@@ -280,7 +282,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
             }
             if ((estateAccessType & 16) != 0) // Group add
             {
-                if (m_scene.Permissions.CanIssueEstateCommand(remote_client.AgentId, true) || m_scene.Permissions.BypassPermissions())
+                if (m_scene.Permissions.CanIssueEstateCommand(remote_client.AgentId, false) || m_scene.Permissions.BypassPermissions())
                 {
                     m_scene.RegionInfo.EstateSettings.AddEstateGroup(user);
                     m_scene.RegionInfo.EstateSettings.Save();
@@ -294,7 +296,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
             }
             if ((estateAccessType & 32) != 0) // Group remove
             {
-                if (m_scene.Permissions.CanIssueEstateCommand(remote_client.AgentId, true) || m_scene.Permissions.BypassPermissions())
+                if (m_scene.Permissions.CanIssueEstateCommand(remote_client.AgentId, false) || m_scene.Permissions.BypassPermissions())
                 {
                     m_scene.RegionInfo.EstateSettings.RemoveEstateGroup(user);
                     m_scene.RegionInfo.EstateSettings.Save();
@@ -895,6 +897,9 @@ namespace OpenSim.Region.CoreModules.World.Estate
             m_scene.RegisterModuleInterface<IEstateModule>(this);
             m_scene.EventManager.OnNewClient += EventManager_OnNewClient;
             m_scene.EventManager.OnRequestChangeWaterHeight += changeWaterHeight;
+            m_regionChangeTimer.AutoReset = false;
+            m_regionChangeTimer.Interval = 2000;
+            m_regionChangeTimer.Elapsed += RaiseRegionInfoChange;
 
             m_scene.AddCommand(this, "set terrain texture",
                                "set terrain texture <number> <uuid> [<x>] [<y>]",
@@ -1165,6 +1170,12 @@ namespace OpenSim.Region.CoreModules.World.Estate
 
         protected void TriggerRegionInfoChange()
         {
+            m_regionChangeTimer.Stop();
+            m_regionChangeTimer.Start();
+        }
+
+        protected void RaiseRegionInfoChange(object sender, ElapsedEventArgs e)
+        {
             ChangeDelegate change = OnRegionInfoChange;
 
             if (change != null)
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
index 15dc301..d00cb07 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
@@ -83,6 +83,8 @@ namespace OpenSim.Region.CoreModules.World.Land
         private int m_lastLandLocalID = LandChannel.START_LAND_LOCAL_ID - 1;
 
         private bool m_allowedForcefulBans = true;
+        private UUID DefaultGodParcelGroup;
+        private string DefaultGodParcelName;
 
         // caches ExtendedLandData
         private Cache parcelInfoCache;
@@ -97,6 +99,12 @@ namespace OpenSim.Region.CoreModules.World.Land
 
         public void Initialise(IConfigSource source)
         {
+            IConfig cnf = source.Configs["LandManagement"];
+            if (cnf != null)
+            {
+                DefaultGodParcelGroup = new UUID(cnf.GetString("DefaultAdministratorGroupUUID", UUID.Zero.ToString()));
+                DefaultGodParcelName = cnf.GetString("DefaultAdministratorParcelName", "Default Parcel");
+            }
         }
 
         public void AddRegion(Scene scene)
@@ -161,7 +169,7 @@ namespace OpenSim.Region.CoreModules.World.Land
             client.OnParcelGodForceOwner += ClientOnParcelGodForceOwner;
             client.OnParcelReclaim += ClientOnParcelReclaim;
             client.OnParcelInfoRequest += ClientOnParcelInfoRequest;
-            client.OnParcelDwellRequest += ClientOnParcelDwellRequest;
+//            client.OnParcelDwellRequest += ClientOnParcelDwellRequest;
             client.OnParcelDeedToGroup += ClientOnParcelDeedToGroup;
             client.OnPreAgentUpdate += ClientOnPreAgentUpdate;
 
@@ -352,7 +360,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                 {
                     if (avatar.AbsolutePosition.Z < LandChannel.BAN_LINE_SAFETY_HIEGHT)
                     {
-                        if (parcelAvatarIsEntering.IsBannedFromLand(avatar.UUID))
+                        if (parcelAvatarIsEntering.IsEitherBannedOrRestricted(avatar.UUID))
                         {
                             SendYouAreBannedNotice(avatar);
                             ForceAvatarToPosition(avatar, m_scene.GetNearestAllowedPosition(avatar));
@@ -649,7 +657,7 @@ namespace OpenSim.Region.CoreModules.World.Land
             int x;
             int y;
 
-            if (x_float > Constants.RegionSize || x_float <= 0 || y_float > Constants.RegionSize || y_float <= 0)
+            if (x_float > Constants.RegionSize || x_float < 0 || y_float > Constants.RegionSize || y_float < 0)
                 return null;
             
             try
@@ -992,6 +1000,10 @@ namespace OpenSim.Region.CoreModules.World.Land
                             //Owner Flag
                             tempByte = Convert.ToByte(tempByte | LandChannel.LAND_TYPE_OWNED_BY_REQUESTER);
                         }
+                        else if (currentParcelBlock.LandData.IsGroupOwned && remote_client.IsGroupMember(currentParcelBlock.LandData.GroupID))
+                        {
+                            tempByte = Convert.ToByte(tempByte | LandChannel.LAND_TYPE_OWNED_BY_GROUP);
+                        }
                         else if (currentParcelBlock.LandData.SalePrice > 0 &&
                                  (currentParcelBlock.LandData.AuthBuyerID == UUID.Zero ||
                                   currentParcelBlock.LandData.AuthBuyerID == remote_client.AgentId))
@@ -1292,18 +1304,31 @@ namespace OpenSim.Region.CoreModules.World.Land
 
         public void EventManagerOnIncomingLandDataFromStorage(List<LandData> data)
         {
-            for (int i = 0; i < data.Count; i++)
+            lock (m_landList)
             {
-                IncomingLandObjectFromStorage(data[i]);
+                //Remove all the land objects in the sim and then process our new data
+                foreach (int n in m_landList.Keys)
+                {
+                    m_scene.EventManager.TriggerLandObjectRemoved(m_landList[n].LandData.GlobalID);
+                }
+                m_landIDList.Initialize();
+                m_landList.Clear();
+
+                for (int i = 0; i < data.Count; i++)
+                {
+                    IncomingLandObjectFromStorage(data[i]);
+                }
             }
         }
 
         public void IncomingLandObjectFromStorage(LandData data)
         {
+
             ILandObject new_land = new LandObject(data.OwnerID, data.IsGroupOwned, m_scene);
             new_land.LandData = data.Copy();
             new_land.SetLandBitmapFromByteArray();
             AddLandObject(new_land);
+            new_land.SendLandUpdateToAvatarsOverMe();
         }
 
         public void ReturnObjectsInParcel(int localID, uint returnType, UUID[] agentIDs, UUID[] taskIDs, IClientAPI remoteClient)
@@ -1524,5 +1549,321 @@ namespace OpenSim.Region.CoreModules.World.Land
 
             UpdateLandObject(localID, land.LandData);
         }
+
+        public void ClientOnParcelGodMark(IClientAPI client, UUID god, int landID)
+        {
+            ILandObject land = null;
+            List<ILandObject> Land = ((Scene)client.Scene).LandChannel.AllParcels();
+            foreach (ILandObject landObject in Land)
+            {
+                if (landObject.LandData.LocalID == landID)
+                {
+                    land = landObject;
+                }
+            }
+            land.DeedToGroup(DefaultGodParcelGroup);
+            land.LandData.Name = DefaultGodParcelName;
+            land.SendLandUpdateToAvatarsOverMe();
+        }
+
+        private void ClientOnSimWideDeletes(IClientAPI client, UUID agentID, int flags, UUID targetID)
+        {
+            ScenePresence SP;
+            ((Scene)client.Scene).TryGetScenePresence(client.AgentId, out SP);
+            List<SceneObjectGroup> returns = new List<SceneObjectGroup>();
+            if (SP.GodLevel != 0)
+            {
+                if (flags == 0) //All parcels, scripted or not
+                {
+                    ((Scene)client.Scene).ForEachSOG(delegate(SceneObjectGroup e)
+                    {
+                        if (e.OwnerID == targetID)
+                        {
+                            returns.Add(e);
+                        }
+                    }
+                                                    );
+                }
+                if (flags == 4) //All parcels, scripted object
+                {
+                    ((Scene)client.Scene).ForEachSOG(delegate(SceneObjectGroup e)
+                    {
+                        if (e.OwnerID == targetID)
+                        {
+                            if (e.scriptScore >= 0.01)
+                            {
+                                returns.Add(e);
+                            }
+                        }
+                    }
+                                                    );
+                }
+                if (flags == 4) //not target parcel, scripted object
+                {
+                    ((Scene)client.Scene).ForEachSOG(delegate(SceneObjectGroup e)
+                    {
+                        if (e.OwnerID == targetID)
+                        {
+                            ILandObject landobject = ((Scene)client.Scene).LandChannel.GetLandObject(e.AbsolutePosition.X, e.AbsolutePosition.Y);
+                            if (landobject.LandData.OwnerID != e.OwnerID)
+                            {
+                                if (e.scriptScore >= 0.01)
+                                {
+                                    returns.Add(e);
+                                }
+                            }
+                        }
+                    }
+                                                    );
+                }
+                foreach (SceneObjectGroup ol in returns)
+                {
+                    ReturnObject(ol, client);
+                }
+            }
+        }
+        public void ReturnObject(SceneObjectGroup obj, IClientAPI client)
+        {
+            SceneObjectGroup[] objs = new SceneObjectGroup[1];
+            objs[0] = obj;
+            ((Scene)client.Scene).returnObjects(objs, client.AgentId);
+        }
+
+        Dictionary<UUID, System.Threading.Timer> Timers = new Dictionary<UUID, System.Threading.Timer>();
+
+        public void ClientOnParcelFreezeUser(IClientAPI client, UUID parcelowner, uint flags, UUID target)
+        {
+            ScenePresence targetAvatar = null;
+            ((Scene)client.Scene).TryGetScenePresence(target, out targetAvatar);
+            ScenePresence parcelManager = null;
+            ((Scene)client.Scene).TryGetScenePresence(client.AgentId, out parcelManager);
+            System.Threading.Timer Timer;
+
+            if (targetAvatar.GodLevel == 0)
+            {
+                ILandObject land = ((Scene)client.Scene).LandChannel.GetLandObject(targetAvatar.AbsolutePosition.X, targetAvatar.AbsolutePosition.Y);
+                if (!((Scene)client.Scene).Permissions.CanEditParcel(client.AgentId, land))
+                    return;
+                if (flags == 0)
+                {
+                    targetAvatar.AllowMovement = false;
+                    targetAvatar.ControllingClient.SendAlertMessage(parcelManager.Firstname + " " + parcelManager.Lastname + " has frozen you for 30 seconds.  You cannot move or interact with the world.");
+                    parcelManager.ControllingClient.SendAlertMessage("Avatar Frozen.");
+                    System.Threading.TimerCallback timeCB = new System.Threading.TimerCallback(OnEndParcelFrozen);
+                    Timer = new System.Threading.Timer(timeCB, targetAvatar, 30000, 0);
+                    Timers.Add(targetAvatar.UUID, Timer);
+                }
+                else
+                {
+                    targetAvatar.AllowMovement = true;
+                    targetAvatar.ControllingClient.SendAlertMessage(parcelManager.Firstname + " " + parcelManager.Lastname + " has unfrozen you.");
+                    parcelManager.ControllingClient.SendAlertMessage("Avatar Unfrozen.");
+                    Timers.TryGetValue(targetAvatar.UUID, out Timer);
+                    Timers.Remove(targetAvatar.UUID);
+                    Timer.Dispose();
+                }
+            }
+        }
+        private void OnEndParcelFrozen(object avatar)
+        {
+            ScenePresence targetAvatar = (ScenePresence)avatar;
+            targetAvatar.AllowMovement = true;
+            System.Threading.Timer Timer;
+            Timers.TryGetValue(targetAvatar.UUID, out Timer);
+            Timers.Remove(targetAvatar.UUID);
+            targetAvatar.ControllingClient.SendAgentAlertMessage("The freeze has worn off; you may go about your business.", false);
+        }
+
+
+        public void ClientOnParcelEjectUser(IClientAPI client, UUID parcelowner, uint flags, UUID target)
+        {
+            ScenePresence targetAvatar = null;
+            ((Scene)client.Scene).TryGetScenePresence(target, out targetAvatar);
+            ScenePresence parcelManager = null;
+            ((Scene)client.Scene).TryGetScenePresence(client.AgentId, out parcelManager);
+            //Just eject
+            if (flags == 0)
+            {
+                if (targetAvatar.GodLevel == 0)
+                {
+                    ILandObject land = ((Scene)client.Scene).LandChannel.GetLandObject(targetAvatar.AbsolutePosition.X, targetAvatar.AbsolutePosition.Y);
+                    if (!((Scene)client.Scene).Permissions.CanEditParcel(client.AgentId, land))
+                        return;
+
+                    Vector3 position = new Vector3(0, 0, 0);
+                    List<ILandObject> allParcels = new List<ILandObject>();
+                    allParcels = AllParcels();
+                    if (allParcels.Count != 1)
+                    {
+                        foreach (ILandObject parcel in allParcels)
+                        {
+                            if (parcel.LandData.GlobalID != land.LandData.GlobalID)
+                            {
+                                if (parcel.IsEitherBannedOrRestricted(targetAvatar.UUID) != true)
+                                {
+                                    for (int x = 1; x <= Constants.RegionSize; x += 2)
+                                    {
+                                        for (int y = 1; y <= Constants.RegionSize; y += 2)
+                                        {
+                                            if (parcel.ContainsPoint(x, y))
+                                            {
+                                                position = new Vector3(x, y, targetAvatar.AbsolutePosition.Z);
+                                                targetAvatar.TeleportWithMomentum(position);
+                                                targetAvatar.ControllingClient.SendAlertMessage("You have been ejected by " + parcelManager.Firstname + " " + parcelManager.Lastname);
+                                                parcelManager.ControllingClient.SendAlertMessage("Avatar Ejected.");
+                                                return;
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    Vector3 targetVector;
+                    if (targetAvatar.AbsolutePosition.X > targetAvatar.AbsolutePosition.Y)
+                    {
+                        if (targetAvatar.AbsolutePosition.X > .5 * Constants.RegionSize)
+                        {
+                            targetVector = new Vector3(Constants.RegionSize, targetAvatar.AbsolutePosition.Y, targetAvatar.AbsolutePosition.Z); ;
+                            targetAvatar.TeleportWithMomentum(targetVector);
+                            targetAvatar.ControllingClient.SendAlertMessage("You have been ejected by " + parcelManager.Firstname + " " + parcelManager.Lastname);
+                            parcelManager.ControllingClient.SendAlertMessage("Avatar Ejected.");
+                            return;
+                        }
+                        else
+                        {
+                            targetVector = new Vector3(0, targetAvatar.AbsolutePosition.Y, targetAvatar.AbsolutePosition.Z); ;
+                            targetAvatar.TeleportWithMomentum(targetVector);
+                            targetAvatar.ControllingClient.SendAlertMessage("You have been ejected by " + parcelManager.Firstname + " " + parcelManager.Lastname);
+                            parcelManager.ControllingClient.SendAlertMessage("Avatar Ejected.");
+                            return;
+                        }
+                    }
+                    else
+                    {
+                        if (targetAvatar.AbsolutePosition.Y > .5 * Constants.RegionSize)
+                        {
+                            targetVector = new Vector3(targetAvatar.AbsolutePosition.X, Constants.RegionSize, targetAvatar.AbsolutePosition.Z); ;
+                            targetAvatar.TeleportWithMomentum(targetVector);
+                            targetAvatar.ControllingClient.SendAlertMessage("You have been ejected by " + parcelManager.Firstname + " " + parcelManager.Lastname);
+                            parcelManager.ControllingClient.SendAlertMessage("Avatar Ejected.");
+                            return;
+                        }
+                        else
+                        {
+                            targetVector = new Vector3(targetAvatar.AbsolutePosition.X, 0, targetAvatar.AbsolutePosition.Z); ;
+                            targetAvatar.TeleportWithMomentum(targetVector);
+                            targetAvatar.ControllingClient.SendAlertMessage("You have been ejected by " + parcelManager.Firstname + " " + parcelManager.Lastname);
+                            parcelManager.ControllingClient.SendAlertMessage("Avatar Ejected.");
+                            return;
+                        }
+                    }
+                }
+            }
+            //Eject and ban
+            if (flags == 1)
+            {
+                if (targetAvatar.GodLevel == 0)
+                {
+                    ILandObject land = ((Scene)client.Scene).LandChannel.GetLandObject(targetAvatar.AbsolutePosition.X, targetAvatar.AbsolutePosition.Y);
+                    if (!((Scene)client.Scene).Permissions.CanEditParcel(client.AgentId, land))
+                        return;
+
+                    Vector3 position = new Vector3(0, 0, 0);
+                    List<ILandObject> allParcels = new List<ILandObject>();
+                    allParcels = AllParcels();
+                    if (allParcels.Count != 1)
+                    {
+                        foreach (ILandObject parcel in allParcels)
+                        {
+                            if (parcel.LandData.GlobalID != land.LandData.GlobalID)
+                            {
+                                if (parcel.IsEitherBannedOrRestricted(targetAvatar.UUID) != true)
+                                {
+                                    for (int x = 1; x <= Constants.RegionSize; x += 2)
+                                    {
+                                        for (int y = 1; y <= Constants.RegionSize; y += 2)
+                                        {
+                                            if (parcel.ContainsPoint(x, y))
+                                            {
+                                                position = new Vector3(x, y, targetAvatar.AbsolutePosition.Z);
+                                                targetAvatar.TeleportWithMomentum(position);
+                                                targetAvatar.ControllingClient.SendAlertMessage("You have been ejected and banned by " + parcelManager.Firstname + " " + parcelManager.Lastname);
+                                                parcelManager.ControllingClient.SendAlertMessage("Avatar Ejected and Banned.");
+                                                ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry();
+                                                entry.AgentID = targetAvatar.UUID;
+                                                entry.Flags = AccessList.Ban;
+                                                entry.Time = new DateTime();
+                                                land.LandData.ParcelAccessList.Add(entry);
+                                                return;
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    Vector3 targetVector;
+                    if (targetAvatar.AbsolutePosition.X > targetAvatar.AbsolutePosition.Y)
+                    {
+                        if (targetAvatar.AbsolutePosition.X > .5 * Constants.RegionSize)
+                        {
+                            targetVector = new Vector3(Constants.RegionSize, targetAvatar.AbsolutePosition.Y, targetAvatar.AbsolutePosition.Z); ;
+                            targetAvatar.TeleportWithMomentum(targetVector);
+                            targetAvatar.ControllingClient.SendAlertMessage("You have been ejected and banned by " + parcelManager.Firstname + " " + parcelManager.Lastname);
+                            parcelManager.ControllingClient.SendAlertMessage("Avatar Ejected and Banned.");
+                            ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry();
+                            entry.AgentID = targetAvatar.UUID;
+                            entry.Flags = AccessList.Ban;
+                            entry.Time = new DateTime();
+                            land.LandData.ParcelAccessList.Add(entry);
+                            return;
+                        }
+                        else
+                        {
+                            targetVector = new Vector3(0, targetAvatar.AbsolutePosition.Y, targetAvatar.AbsolutePosition.Z); ;
+                            targetAvatar.TeleportWithMomentum(targetVector);
+                            targetAvatar.ControllingClient.SendAlertMessage("You have been ejected and banned by " + parcelManager.Firstname + " " + parcelManager.Lastname);
+                            parcelManager.ControllingClient.SendAlertMessage("Avatar Ejected and Banned.");
+                            ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry();
+                            entry.AgentID = targetAvatar.UUID;
+                            entry.Flags = AccessList.Ban;
+                            entry.Time = new DateTime();
+                            land.LandData.ParcelAccessList.Add(entry);
+                            return;
+                        }
+                    }
+                    else
+                    {
+                        if (targetAvatar.AbsolutePosition.Y > .5 * Constants.RegionSize)
+                        {
+                            targetVector = new Vector3(targetAvatar.AbsolutePosition.X, Constants.RegionSize, targetAvatar.AbsolutePosition.Z); ;
+                            targetAvatar.TeleportWithMomentum(targetVector);
+                            targetAvatar.ControllingClient.SendAlertMessage("You have been ejected and banned by " + parcelManager.Firstname + " " + parcelManager.Lastname);
+                            parcelManager.ControllingClient.SendAlertMessage("Avatar Ejected and Banned.");
+                            ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry();
+                            entry.AgentID = targetAvatar.UUID;
+                            entry.Flags = AccessList.Ban;
+                            entry.Time = new DateTime();
+                            land.LandData.ParcelAccessList.Add(entry);
+                            return;
+                        }
+                        else
+                        {
+                            targetVector = new Vector3(targetAvatar.AbsolutePosition.X, 0, targetAvatar.AbsolutePosition.Z); ;
+                            targetAvatar.TeleportWithMomentum(targetVector);
+                            targetAvatar.ControllingClient.SendAlertMessage("You have been ejected and banned by " + parcelManager.Firstname + " " + parcelManager.Lastname);
+                            parcelManager.ControllingClient.SendAlertMessage("Avatar Ejected and Banned.");
+                            ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry();
+                            entry.AgentID = targetAvatar.UUID;
+                            entry.Flags = AccessList.Ban;
+                            entry.Time = new DateTime();
+                            land.LandData.ParcelAccessList.Add(entry);
+                            return;
+                        }
+                    }
+                }
+            }
+        }
     }
 }
diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
index 6864629..fcd993c 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
@@ -1,1013 +1,1045 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using System.Collections.Generic;
-using System.Reflection;
-using log4net;
-using OpenMetaverse;
-using OpenSim.Framework;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-
-namespace OpenSim.Region.CoreModules.World.Land
-{
-    /// <summary>
-    /// Keeps track of a specific piece of land's information
-    /// </summary>
-    public class LandObject : ILandObject
-    {
-        #region Member Variables
-
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        #pragma warning disable 0429
-        private const int landArrayMax = ((int)((int)Constants.RegionSize / 4) >= 64) ? (int)((int)Constants.RegionSize / 4) : 64;
-        #pragma warning restore 0429
-        private bool[,] m_landBitmap = new bool[landArrayMax,landArrayMax];
-
-        private int m_lastSeqId = 0;
-
-        protected LandData m_landData = new LandData();
-        protected Scene m_scene;
-        protected List<SceneObjectGroup> primsOverMe = new List<SceneObjectGroup>();
-
-        public bool[,] LandBitmap
-        {
-            get { return m_landBitmap; }
-            set { m_landBitmap = value; }
-        }
-
-        #endregion
-
-        #region ILandObject Members
-
-        public LandData LandData
-        {
-            get { return m_landData; }
-
-            set { m_landData = value; }
-        }
-
-        public UUID RegionUUID
-        {
-            get { return m_scene.RegionInfo.RegionID; }
-        }
-
-        #region Constructors
-
-        public LandObject(UUID owner_id, bool is_group_owned, Scene scene)
-        {
-            m_scene = scene;
-            LandData.OwnerID = owner_id;
-            if (is_group_owned)
-                LandData.GroupID = owner_id;
-            else
-                LandData.GroupID = UUID.Zero;
-            LandData.IsGroupOwned = is_group_owned;
-        }
-
-        #endregion
-
-        #region Member Functions
-
-        #region General Functions
-
-        /// <summary>
-        /// Checks to see if this land object contains a point
-        /// </summary>
-        /// <param name="x"></param>
-        /// <param name="y"></param>
-        /// <returns>Returns true if the piece of land contains the specified point</returns>
-        public bool ContainsPoint(int x, int y)
-        {
-            if (x >= 0 && y >= 0 && x <= Constants.RegionSize && y <= Constants.RegionSize)
-            {
-                return (LandBitmap[x / 4, y / 4] == true);
-            }
-            else
-            {
-                return false;
-            }
-        }
-
-        public ILandObject Copy()
-        {
-            ILandObject newLand = new LandObject(LandData.OwnerID, LandData.IsGroupOwned, m_scene);
-
-            //Place all new variables here!
-            newLand.LandBitmap = (bool[,]) (LandBitmap.Clone());
-            newLand.LandData = LandData.Copy();
-
-            return newLand;
-        }
-
-        static overrideParcelMaxPrimCountDelegate overrideParcelMaxPrimCount;
-        static overrideSimulatorMaxPrimCountDelegate overrideSimulatorMaxPrimCount;
-
-        public void SetParcelObjectMaxOverride(overrideParcelMaxPrimCountDelegate overrideDel)
-        {
-            overrideParcelMaxPrimCount = overrideDel;
-        }
-        public void SetSimulatorObjectMaxOverride(overrideSimulatorMaxPrimCountDelegate overrideDel)
-        {
-            overrideSimulatorMaxPrimCount = overrideDel;
-        }
-
-        public int GetParcelMaxPrimCount(ILandObject thisObject)
-        {
-            if (overrideParcelMaxPrimCount != null)
-            {
-                return overrideParcelMaxPrimCount(thisObject);
-            }
-            else
-            {
-                // Normal Calculations
-                return (int)Math.Round(((float)LandData.Area / 65536.0f) * (float)m_scene.RegionInfo.ObjectCapacity * (float)m_scene.RegionInfo.RegionSettings.ObjectBonus);
-            }
-        }
-        public int GetSimulatorMaxPrimCount(ILandObject thisObject)
-        {
-            if (overrideSimulatorMaxPrimCount != null)
-            {
-                return overrideSimulatorMaxPrimCount(thisObject);
-            }
-            else
-            {
-                //Normal Calculations
-                return m_scene.RegionInfo.ObjectCapacity;
-            }
-        }
-        #endregion
-
-        #region Packet Request Handling
-
-        public void SendLandProperties(int sequence_id, bool snap_selection, int request_result, IClientAPI remote_client)
-        {
-            IEstateModule estateModule = m_scene.RequestModuleInterface<IEstateModule>();
-            uint regionFlags = 336723974 & ~((uint)(RegionFlags.AllowLandmark | RegionFlags.AllowSetHome));
-            if (estateModule != null)
-                regionFlags = estateModule.GetRegionFlags();
-
-            // In a perfect world, this would have worked.
-            //
-//            if ((landData.Flags & (uint)ParcelFlags.AllowLandmark) != 0)
-//                regionFlags |=  (uint)RegionFlags.AllowLandmark;
-//            if (landData.OwnerID == remote_client.AgentId)
-//                regionFlags |=  (uint)RegionFlags.AllowSetHome;
-
-            int seq_id;
-            if (snap_selection && (sequence_id == 0))
-            {
-                seq_id = m_lastSeqId;
-            }
-            else
-            {
-                seq_id = sequence_id;
-                m_lastSeqId = seq_id;
-            }
-
-            remote_client.SendLandProperties(seq_id,
-                    snap_selection, request_result, LandData,
-                    (float)m_scene.RegionInfo.RegionSettings.ObjectBonus,
-                    GetParcelMaxPrimCount(this),
-                    GetSimulatorMaxPrimCount(this), regionFlags);
-        }
-
-        public void UpdateLandProperties(LandUpdateArgs args, IClientAPI remote_client)
-        {
-            if (m_scene.Permissions.CanEditParcel(remote_client.AgentId,this))
-            {
-                //Needs later group support
-                bool snap_selection = false;
-                LandData newData = LandData.Copy();
-
-                if (args.AuthBuyerID != newData.AuthBuyerID || args.SalePrice != newData.SalePrice)
-                {
-                    if (m_scene.Permissions.CanSellParcel(remote_client.AgentId, this))
-                    {
-                        newData.AuthBuyerID = args.AuthBuyerID;
-                        newData.SalePrice = args.SalePrice;
-                        snap_selection = true;
-                    }
-                }
-                newData.Category = args.Category;
-                newData.Description = args.Desc;
-                newData.GroupID = args.GroupID;
-                newData.LandingType = args.LandingType;
-                newData.MediaAutoScale = args.MediaAutoScale;
-                newData.MediaID = args.MediaID;
-                newData.MediaURL = args.MediaURL;
-                newData.MusicURL = args.MusicURL;
-                newData.Name = args.Name;
-                newData.Flags = args.ParcelFlags;
-                newData.PassHours = args.PassHours;
-                newData.PassPrice = args.PassPrice;
-                newData.SnapshotID = args.SnapshotID;
-                newData.UserLocation = args.UserLocation;
-                newData.UserLookAt = args.UserLookAt;
-
-                m_scene.LandChannel.UpdateLandObject(LandData.LocalID, newData);
-
-                SendLandUpdateToAvatarsOverMe(snap_selection);
-            }
-        }
-
-        public void UpdateLandSold(UUID avatarID, UUID groupID, bool groupOwned, uint AuctionID, int claimprice, int area)
-        {
-            LandData newData = LandData.Copy();
-            newData.OwnerID = avatarID;
-            newData.GroupID = groupID;
-            newData.IsGroupOwned = groupOwned;
-            //newData.auctionID = AuctionID;
-            newData.ClaimDate = Util.UnixTimeSinceEpoch();
-            newData.ClaimPrice = claimprice;
-            newData.SalePrice = 0;
-            newData.AuthBuyerID = UUID.Zero;
-            newData.Flags &= ~(uint) (ParcelFlags.ForSale | ParcelFlags.ForSaleObjects | ParcelFlags.SellParcelObjects | ParcelFlags.ShowDirectory);
-            m_scene.LandChannel.UpdateLandObject(LandData.LocalID, newData);
-
-            SendLandUpdateToAvatarsOverMe(true);
-        }
-
-        public void DeedToGroup(UUID groupID)
-        {
-            LandData newData = LandData.Copy();
-            newData.OwnerID = groupID;
-            newData.GroupID = groupID;
-            newData.IsGroupOwned = true;
-
-            // Reset show in directory flag on deed
-            newData.Flags &= ~(uint) (ParcelFlags.ForSale | ParcelFlags.ForSaleObjects | ParcelFlags.SellParcelObjects | ParcelFlags.ShowDirectory);
-
-            m_scene.LandChannel.UpdateLandObject(LandData.LocalID, newData);
-
-            SendLandUpdateToAvatarsOverMe(true);
-        }
-
-        public bool IsEitherBannedOrRestricted(UUID avatar)
-        {
-            if (IsBannedFromLand(avatar))
-            {
-                return true;
-            }
-            else if (IsRestrictedFromLand(avatar))
-            {
-                return true;
-            }
-            return false;
-        }
-
-        public bool IsBannedFromLand(UUID avatar)
-        {
-            if (m_scene.Permissions.IsAdministrator(avatar))
-                return false;
-
-            if ((LandData.Flags & (uint) ParcelFlags.UseBanList) > 0)
-            {
-                ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry();
-                entry.AgentID = avatar;
-                entry.Flags = AccessList.Ban;
-                entry.Time = new DateTime();
-                //See if they are on the list, but make sure the owner isn't banned
-                if (LandData.ParcelAccessList.Contains(entry) && LandData.OwnerID != avatar)
-                {
-                    //They are banned, so lets send them a notice about this parcel
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        public bool IsRestrictedFromLand(UUID avatar)
-        {
-            if (m_scene.Permissions.IsAdministrator(avatar))
-                return false;
-
-            if ((LandData.Flags & (uint) ParcelFlags.UseAccessList) > 0)
-            {
-                ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry();
-                entry.AgentID = avatar;
-                entry.Flags = AccessList.Access;
-                entry.Time = new DateTime();
-
-                //If they are not on the access list and are not the owner
-                if (!LandData.ParcelAccessList.Contains(entry) && LandData.OwnerID != avatar)
-                {
-                    //They are not allowed in this parcel, but not banned, so lets send them a notice about this parcel
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        public void SendLandUpdateToClient(IClientAPI remote_client)
-        {
-            SendLandProperties(0, false, 0, remote_client);
-        }
-
-        public void SendLandUpdateToClient(bool snap_selection, IClientAPI remote_client)
-        {
-            SendLandProperties(0, snap_selection, 0, remote_client);
-        }
-
-        public void SendLandUpdateToAvatarsOverMe()
-        {
-            SendLandUpdateToAvatarsOverMe(false);
-        }
-
-        public void SendLandUpdateToAvatarsOverMe(bool snap_selection)
-        {
-            m_scene.ForEachScenePresence(delegate(ScenePresence avatar)
-            {
-                if (avatar.IsChildAgent)
-                    return;
-
-                ILandObject over = null;
-                try
-                {
-                    over =
-                        m_scene.LandChannel.GetLandObject(Util.Clamp<int>((int)Math.Round(avatar.AbsolutePosition.X), 0, ((int)Constants.RegionSize - 1)),
-                                                          Util.Clamp<int>((int)Math.Round(avatar.AbsolutePosition.Y), 0, ((int)Constants.RegionSize - 1)));
-                }
-                catch (Exception)
-                {
-                    m_log.Warn("[LAND]: " + "unable to get land at x: " + Math.Round(avatar.AbsolutePosition.X) + " y: " +
-                               Math.Round(avatar.AbsolutePosition.Y));
-                }
-
-                if (over != null)
-                {
-                    if (over.LandData.LocalID == LandData.LocalID)
-                    {
-                        if (((over.LandData.Flags & (uint)ParcelFlags.AllowDamage) != 0) &&
-                            m_scene.RegionInfo.RegionSettings.AllowDamage)
-                            avatar.Invulnerable = false;
-                        else
-                            avatar.Invulnerable = true;
-
-                        SendLandUpdateToClient(snap_selection, avatar.ControllingClient);
-                    }
-                }
-            });
-        }
-
-        #endregion
-
-        #region AccessList Functions
-
-        public List<UUID>  CreateAccessListArrayByFlag(AccessList flag)
-        {
-            List<UUID> list = new List<UUID>();
-            foreach (ParcelManager.ParcelAccessEntry entry in LandData.ParcelAccessList)
-            {
-                if (entry.Flags == flag)
-                {
-                   list.Add(entry.AgentID);
-                }
-            }
-            if (list.Count == 0)
-            {
-                list.Add(UUID.Zero);
-            }
-
-            return list;
-        }
-
-        public void SendAccessList(UUID agentID, UUID sessionID, uint flags, int sequenceID,
-                                   IClientAPI remote_client)
-        {
-
-            if (flags == (uint) AccessList.Access || flags == (uint) AccessList.Both)
-            {
-                List<UUID> avatars = CreateAccessListArrayByFlag(AccessList.Access);
-                remote_client.SendLandAccessListData(avatars,(uint) AccessList.Access,LandData.LocalID);
-            }
-
-            if (flags == (uint) AccessList.Ban || flags == (uint) AccessList.Both)
-            {
-                List<UUID> avatars = CreateAccessListArrayByFlag(AccessList.Ban);
-                remote_client.SendLandAccessListData(avatars, (uint)AccessList.Ban, LandData.LocalID);
-            }
-        }
-
-        public void UpdateAccessList(uint flags, List<ParcelManager.ParcelAccessEntry> entries, IClientAPI remote_client)
-        {
-            LandData newData = LandData.Copy();
-
-            if (entries.Count == 1 && entries[0].AgentID == UUID.Zero)
-            {
-                entries.Clear();
-            }
-
-            List<ParcelManager.ParcelAccessEntry> toRemove = new List<ParcelManager.ParcelAccessEntry>();
-            foreach (ParcelManager.ParcelAccessEntry entry in newData.ParcelAccessList)
-            {
-                if (entry.Flags == (AccessList)flags)
-                {
-                    toRemove.Add(entry);
-                }
-            }
-
-            foreach (ParcelManager.ParcelAccessEntry entry in toRemove)
-            {
-                newData.ParcelAccessList.Remove(entry);
-            }
-            foreach (ParcelManager.ParcelAccessEntry entry in entries)
-            {
-                ParcelManager.ParcelAccessEntry temp = new ParcelManager.ParcelAccessEntry();
-                temp.AgentID = entry.AgentID;
-                temp.Time = new DateTime(); //Pointless? Yes.
-                temp.Flags = (AccessList)flags;
-
-                if (!newData.ParcelAccessList.Contains(temp))
-                {
-                    newData.ParcelAccessList.Add(temp);
-                }
-            }
-
-            m_scene.LandChannel.UpdateLandObject(LandData.LocalID, newData);
-        }
-
-        #endregion
-
-        #region Update Functions
-
-        public void UpdateLandBitmapByteArray()
-        {
-            LandData.Bitmap = ConvertLandBitmapToBytes();
-        }
-
-        /// <summary>
-        /// Update all settings in land such as area, bitmap byte array, etc
-        /// </summary>
-        public void ForceUpdateLandInfo()
-        {
-            UpdateAABBAndAreaValues();
-            UpdateLandBitmapByteArray();
-        }
-
-        public void SetLandBitmapFromByteArray()
-        {
-            LandBitmap = ConvertBytesToLandBitmap();
-        }
-
-        /// <summary>
-        /// Updates the AABBMin and AABBMax values after area/shape modification of the land object
-        /// </summary>
-        private void UpdateAABBAndAreaValues()
-        {
-            int min_x = 64;
-            int min_y = 64;
-            int max_x = 0;
-            int max_y = 0;
-            int tempArea = 0;
-            int x, y;
-            for (x = 0; x < 64; x++)
-            {
-                for (y = 0; y < 64; y++)
-                {
-                    if (LandBitmap[x, y] == true)
-                    {
-                        if (min_x > x) min_x = x;
-                        if (min_y > y) min_y = y;
-                        if (max_x < x) max_x = x;
-                        if (max_y < y) max_y = y;
-                        tempArea += 16; //16sqm peice of land
-                    }
-                }
-            }
-            int tx = min_x * 4;
-            if (tx > ((int)Constants.RegionSize - 1))
-                tx = ((int)Constants.RegionSize - 1);
-            int ty = min_y * 4;
-            if (ty > ((int)Constants.RegionSize - 1))
-                ty = ((int)Constants.RegionSize - 1);
-            LandData.AABBMin =
-                new Vector3((float) (min_x * 4), (float) (min_y * 4),
-                              (float) m_scene.Heightmap[tx, ty]);
-
-            tx = max_x * 4;
-            if (tx > ((int)Constants.RegionSize - 1))
-                tx = ((int)Constants.RegionSize - 1);
-            ty = max_y * 4;
-            if (ty > ((int)Constants.RegionSize - 1))
-                ty = ((int)Constants.RegionSize - 1);
-            LandData.AABBMax =
-                new Vector3((float) (max_x * 4), (float) (max_y * 4),
-                              (float) m_scene.Heightmap[tx, ty]);
-            LandData.Area = tempArea;
-        }
-
-        #endregion
-
-        #region Land Bitmap Functions
-
-        /// <summary>
-        /// Sets the land's bitmap manually
-        /// </summary>
-        /// <param name="bitmap">64x64 block representing where this land is on a map</param>
-        public void SetLandBitmap(bool[,] bitmap)
-        {
-            if (bitmap.GetLength(0) != 64 || bitmap.GetLength(1) != 64 || bitmap.Rank != 2)
-            {
-                //Throw an exception - The bitmap is not 64x64
-                //throw new Exception("Error: Invalid Parcel Bitmap");
-            }
-            else
-            {
-                //Valid: Lets set it
-                LandBitmap = bitmap;
-                ForceUpdateLandInfo();
-            }
-        }
-
-        /// <summary>
-        /// Gets the land's bitmap manually
-        /// </summary>
-        /// <returns></returns>
-        public bool[,] GetLandBitmap()
-        {
-            return LandBitmap;
-        }
-
-        /// <summary>
-        /// Full sim land object creation
-        /// </summary>
-        /// <returns></returns>
-        public bool[,] BasicFullRegionLandBitmap()
-        {
-            return GetSquareLandBitmap(0, 0, (int) Constants.RegionSize, (int) Constants.RegionSize);
-        }
-
-        /// <summary>
-        /// Used to modify the bitmap between the x and y points. Points use 64 scale
-        /// </summary>
-        /// <param name="start_x"></param>
-        /// <param name="start_y"></param>
-        /// <param name="end_x"></param>
-        /// <param name="end_y"></param>
-        /// <returns></returns>
-        public bool[,] GetSquareLandBitmap(int start_x, int start_y, int end_x, int end_y)
-        {
-            bool[,] tempBitmap = new bool[64,64];
-            tempBitmap.Initialize();
-
-            tempBitmap = ModifyLandBitmapSquare(tempBitmap, start_x, start_y, end_x, end_y, true);
-            return tempBitmap;
-        }
-
-        /// <summary>
-        /// Change a land bitmap at within a square and set those points to a specific value
-        /// </summary>
-        /// <param name="land_bitmap"></param>
-        /// <param name="start_x"></param>
-        /// <param name="start_y"></param>
-        /// <param name="end_x"></param>
-        /// <param name="end_y"></param>
-        /// <param name="set_value"></param>
-        /// <returns></returns>
-        public bool[,] ModifyLandBitmapSquare(bool[,] land_bitmap, int start_x, int start_y, int end_x, int end_y,
-                                              bool set_value)
-        {
-            if (land_bitmap.GetLength(0) != 64 || land_bitmap.GetLength(1) != 64 || land_bitmap.Rank != 2)
-            {
-                //Throw an exception - The bitmap is not 64x64
-                //throw new Exception("Error: Invalid Parcel Bitmap in modifyLandBitmapSquare()");
-            }
-
-            int x, y;
-            for (y = 0; y < 64; y++)
-            {
-                for (x = 0; x < 64; x++)
-                {
-                    if (x >= start_x / 4 && x < end_x / 4
-                        && y >= start_y / 4 && y < end_y / 4)
-                    {
-                        land_bitmap[x, y] = set_value;
-                    }
-                }
-            }
-            return land_bitmap;
-        }
-
-        /// <summary>
-        /// Join the true values of 2 bitmaps together
-        /// </summary>
-        /// <param name="bitmap_base"></param>
-        /// <param name="bitmap_add"></param>
-        /// <returns></returns>
-        public bool[,] MergeLandBitmaps(bool[,] bitmap_base, bool[,] bitmap_add)
-        {
-            if (bitmap_base.GetLength(0) != 64 || bitmap_base.GetLength(1) != 64 || bitmap_base.Rank != 2)
-            {
-                //Throw an exception - The bitmap is not 64x64
-                throw new Exception("Error: Invalid Parcel Bitmap - Bitmap_base in mergeLandBitmaps");
-            }
-            if (bitmap_add.GetLength(0) != 64 || bitmap_add.GetLength(1) != 64 || bitmap_add.Rank != 2)
-            {
-                //Throw an exception - The bitmap is not 64x64
-                throw new Exception("Error: Invalid Parcel Bitmap - Bitmap_add in mergeLandBitmaps");
-            }
-
-            int x, y;
-            for (y = 0; y < 64; y++)
-            {
-                for (x = 0; x < 64; x++)
-                {
-                    if (bitmap_add[x, y])
-                    {
-                        bitmap_base[x, y] = true;
-                    }
-                }
-            }
-            return bitmap_base;
-        }
-
-        /// <summary>
-        /// Converts the land bitmap to a packet friendly byte array
-        /// </summary>
-        /// <returns></returns>
-        private byte[] ConvertLandBitmapToBytes()
-        {
-            byte[] tempConvertArr = new byte[512];
-            byte tempByte = 0;
-            int x, y, i, byteNum = 0;
-            i = 0;
-            for (y = 0; y < 64; y++)
-            {
-                for (x = 0; x < 64; x++)
-                {
-                    tempByte = Convert.ToByte(tempByte | Convert.ToByte(LandBitmap[x, y]) << (i++ % 8));
-                    if (i % 8 == 0)
-                    {
-                        tempConvertArr[byteNum] = tempByte;
-                        tempByte = (byte) 0;
-                        i = 0;
-                        byteNum++;
-                    }
-                }
-            }
-            return tempConvertArr;
-        }
-
-        private bool[,] ConvertBytesToLandBitmap()
-        {
-            bool[,] tempConvertMap = new bool[landArrayMax, landArrayMax];
-            tempConvertMap.Initialize();
-            byte tempByte = 0;
-            int x = 0, y = 0, i = 0, bitNum = 0;
-            for (i = 0; i < 512; i++)
-            {
-                tempByte = LandData.Bitmap[i];
-                for (bitNum = 0; bitNum < 8; bitNum++)
-                {
-                    bool bit = Convert.ToBoolean(Convert.ToByte(tempByte >> bitNum) & (byte) 1);
-                    tempConvertMap[x, y] = bit;
-                    x++;
-                    if (x > 63)
-                    {
-                        x = 0;
-                        y++;
-                    }
-                }
-            }
-            return tempConvertMap;
-        }
-
-        #endregion
-
-        #region Object Select and Object Owner Listing
-
-        public void SendForceObjectSelect(int local_id, int request_type, List<UUID> returnIDs, IClientAPI remote_client)
-        {
-            if (m_scene.Permissions.CanEditParcel(remote_client.AgentId, this))
-            {
-                List<uint> resultLocalIDs = new List<uint>();
-                try
-                {
-                    lock (primsOverMe)
-                    {
-                        foreach (SceneObjectGroup obj in primsOverMe)
-                        {
-                            if (obj.LocalId > 0)
-                            {
-                                if (request_type == LandChannel.LAND_SELECT_OBJECTS_OWNER && obj.OwnerID == LandData.OwnerID)
-                                {
-                                    resultLocalIDs.Add(obj.LocalId);
-                                }
-                                else if (request_type == LandChannel.LAND_SELECT_OBJECTS_GROUP && obj.GroupID == LandData.GroupID && LandData.GroupID != UUID.Zero)
-                                {
-                                    resultLocalIDs.Add(obj.LocalId);
-                                }
-                                else if (request_type == LandChannel.LAND_SELECT_OBJECTS_OTHER &&
-                                         obj.OwnerID != remote_client.AgentId)
-                                {
-                                    resultLocalIDs.Add(obj.LocalId);
-                                }
-                                else if (request_type == (int)ObjectReturnType.List && returnIDs.Contains(obj.OwnerID))
-                                {
-                                    resultLocalIDs.Add(obj.LocalId);
-                                }
-                            }
-                        }
-                    }
-                } catch (InvalidOperationException)
-                {
-                    m_log.Error("[LAND]: Unable to force select the parcel objects. Arr.");
-                }
-
-                remote_client.SendForceClientSelectObjects(resultLocalIDs);
-            }
-        }
-
-        /// <summary>
-        /// Notify the parcel owner each avatar that owns prims situated on their land.  This notification includes
-        /// aggreagete details such as the number of prims.
-        ///
-        /// </summary>
-        /// <param name="remote_client">
-        /// A <see cref="IClientAPI"/>
-        /// </param>
-        public void SendLandObjectOwners(IClientAPI remote_client)
-        {
-            if (m_scene.Permissions.CanEditParcel(remote_client.AgentId, this))
-            {
-                Dictionary<UUID, int> primCount = new Dictionary<UUID, int>();
-                List<UUID> groups = new List<UUID>();
-
-                lock (primsOverMe)
-                {
-                    try
-                    {
-
-                        foreach (SceneObjectGroup obj in primsOverMe)
-                        {
-                            try
-                            {
-                                if (!primCount.ContainsKey(obj.OwnerID))
-                                {
-                                    primCount.Add(obj.OwnerID, 0);
-                                }
-                            }
-                            catch (NullReferenceException)
-                            {
-                                m_log.Info("[LAND]: " + "Got Null Reference when searching land owners from the parcel panel");
-                            }
-                            try
-                            {
-                                primCount[obj.OwnerID] += obj.PrimCount;
-                            }
-                            catch (KeyNotFoundException)
-                            {
-                                m_log.Error("[LAND]: Unable to match a prim with it's owner.");
-                            }
-                            if (obj.OwnerID == obj.GroupID && (!groups.Contains(obj.OwnerID)))
-                                groups.Add(obj.OwnerID);
-                        }
-                    }
-                    catch (InvalidOperationException)
-                    {
-                        m_log.Error("[LAND]: Unable to Enumerate Land object arr.");
-                    }
-                }
-
-                remote_client.SendLandObjectOwners(LandData, groups, primCount);
-            }
-        }
-
-        public Dictionary<UUID, int> GetLandObjectOwners()
-        {
-            Dictionary<UUID, int> ownersAndCount = new Dictionary<UUID, int>();
-            lock (primsOverMe)
-            {
-                try
-                {
-
-                    foreach (SceneObjectGroup obj in primsOverMe)
-                    {
-                        if (!ownersAndCount.ContainsKey(obj.OwnerID))
-                        {
-                            ownersAndCount.Add(obj.OwnerID, 0);
-                        }
-                        ownersAndCount[obj.OwnerID] += obj.PrimCount;
-                    }
-                }
-                catch (InvalidOperationException)
-                {
-                    m_log.Error("[LAND]: Unable to enumerate land owners. arr.");
-                }
-
-            }
-            return ownersAndCount;
-        }
-
-        #endregion
-
-        #region Object Returning
-
-        public void ReturnObject(SceneObjectGroup obj)
-        {
-            SceneObjectGroup[] objs = new SceneObjectGroup[1];
-            objs[0] = obj;
-            m_scene.returnObjects(objs, obj.OwnerID);
-        }
-
-        public void ReturnLandObjects(uint type, UUID[] owners, UUID[] tasks, IClientAPI remote_client)
-        {
-            Dictionary<UUID,List<SceneObjectGroup>> returns =
-                    new Dictionary<UUID,List<SceneObjectGroup>>();
-
-            lock (primsOverMe)
-            {
-                if (type == (uint)ObjectReturnType.Owner)
-                {
-                    foreach (SceneObjectGroup obj in primsOverMe)
-                    {
-                        if (obj.OwnerID == m_landData.OwnerID)
-                        {
-                            if (!returns.ContainsKey(obj.OwnerID))
-                                returns[obj.OwnerID] =
-                                        new List<SceneObjectGroup>();
-                            returns[obj.OwnerID].Add(obj);
-                        }
-                    }
-                }
-                else if (type == (uint)ObjectReturnType.Group && m_landData.GroupID != UUID.Zero)
-                {
-                    foreach (SceneObjectGroup obj in primsOverMe)
-                    {
-                        if (obj.GroupID == m_landData.GroupID)
-                        {
-                            if (!returns.ContainsKey(obj.OwnerID))
-                                returns[obj.OwnerID] =
-                                        new List<SceneObjectGroup>();
-                            returns[obj.OwnerID].Add(obj);
-                        }
-                    }
-                }
-                else if (type == (uint)ObjectReturnType.Other)
-                {
-                    foreach (SceneObjectGroup obj in primsOverMe)
-                    {
-                        if (obj.OwnerID != m_landData.OwnerID &&
-                            (obj.GroupID != m_landData.GroupID ||
-                            m_landData.GroupID == UUID.Zero))
-                        {
-                            if (!returns.ContainsKey(obj.OwnerID))
-                                returns[obj.OwnerID] =
-                                        new List<SceneObjectGroup>();
-                            returns[obj.OwnerID].Add(obj);
-                        }
-                    }
-                }
-                else if (type == (uint)ObjectReturnType.List)
-                {
-                    List<UUID> ownerlist = new List<UUID>(owners);
-
-                    foreach (SceneObjectGroup obj in primsOverMe)
-                    {
-                        if (ownerlist.Contains(obj.OwnerID))
-                        {
-                            if (!returns.ContainsKey(obj.OwnerID))
-                                returns[obj.OwnerID] =
-                                        new List<SceneObjectGroup>();
-                            returns[obj.OwnerID].Add(obj);
-                        }
-                    }
-                }
-            }
-
-            foreach (List<SceneObjectGroup> ol in returns.Values)
-            {
-                if (m_scene.Permissions.CanReturnObjects(this, remote_client.AgentId, ol))
-                    m_scene.returnObjects(ol.ToArray(), remote_client.AgentId);
-            }
-        }
-
-        #endregion
-
-        #region Object Adding/Removing from Parcel
-
-        public void ResetLandPrimCounts()
-        {
-            LandData.GroupPrims = 0;
-            LandData.OwnerPrims = 0;
-            LandData.OtherPrims = 0;
-            LandData.SelectedPrims = 0;
-
-
-            lock (primsOverMe)
-                primsOverMe.Clear();
-        }
-
-        public void AddPrimToCount(SceneObjectGroup obj)
-        {
-
-            UUID prim_owner = obj.OwnerID;
-            int prim_count = obj.PrimCount;
-
-            if (obj.IsSelected)
-            {
-                LandData.SelectedPrims += prim_count;
-            }
-            else
-            {
-                if (prim_owner == LandData.OwnerID)
-                {
-                    LandData.OwnerPrims += prim_count;
-                }
-                else if ((obj.GroupID == LandData.GroupID ||
-                          prim_owner  == LandData.GroupID) &&
-                          LandData.GroupID != UUID.Zero)
-                {
-                    LandData.GroupPrims += prim_count;
-                }
-                else
-                {
-                    LandData.OtherPrims += prim_count;
-                }
-            }
-
-            lock (primsOverMe)
-                primsOverMe.Add(obj);
-        }
-
-        public void RemovePrimFromCount(SceneObjectGroup obj)
-        {
-            lock (primsOverMe)
-            {
-                if (primsOverMe.Contains(obj))
-                {
-                    UUID prim_owner = obj.OwnerID;
-                    int prim_count = obj.PrimCount;
-
-                    if (prim_owner == LandData.OwnerID)
-                    {
-                        LandData.OwnerPrims -= prim_count;
-                    }
-                    else if (obj.GroupID == LandData.GroupID ||
-                             prim_owner  == LandData.GroupID)
-                    {
-                        LandData.GroupPrims -= prim_count;
-                    }
-                    else
-                    {
-                        LandData.OtherPrims -= prim_count;
-                    }
-
-                    primsOverMe.Remove(obj);
-                }
-            }
-        }
-
-        #endregion
-
-        #endregion
-
-        #endregion
-        
-        /// <summary>
-        /// Set the media url for this land parcel
-        /// </summary>
-        /// <param name="url"></param>
-        public void SetMediaUrl(string url)
-        {
-            LandData.MediaURL = url;
-            SendLandUpdateToAvatarsOverMe();
-        }
-        
-        /// <summary>
-        /// Set the music url for this land parcel
-        /// </summary>
-        /// <param name="url"></param>
-        public void SetMusicUrl(string url)
-        {
-            LandData.MusicURL = url;
-            SendLandUpdateToAvatarsOverMe();
-        }
-    }
-}
+/*

+ * Copyright (c) Contributors, http://opensimulator.org/

+ * See CONTRIBUTORS.TXT for a full list of copyright holders.

+ *

+ * Redistribution and use in source and binary forms, with or without

+ * modification, are permitted provided that the following conditions are met:

+ *     * Redistributions of source code must retain the above copyright

+ *       notice, this list of conditions and the following disclaimer.

+ *     * Redistributions in binary form must reproduce the above copyright

+ *       notice, this list of conditions and the following disclaimer in the

+ *       documentation and/or other materials provided with the distribution.

+ *     * Neither the name of the OpenSimulator Project nor the

+ *       names of its contributors may be used to endorse or promote products

+ *       derived from this software without specific prior written permission.

+ *

+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY

+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY

+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

+ */

+

+using System;

+using System.Collections.Generic;

+using System.Reflection;

+using log4net;

+using OpenMetaverse;

+using OpenSim.Framework;

+using OpenSim.Region.Framework.Interfaces;

+using OpenSim.Region.Framework.Scenes;

+

+namespace OpenSim.Region.CoreModules.World.Land

+{

+    /// <summary>

+    /// Keeps track of a specific piece of land's information

+    /// </summary>

+    public class LandObject : ILandObject

+    {

+        #region Member Variables

+

+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);

+        #pragma warning disable 0429

+        private const int landArrayMax = ((int)((int)Constants.RegionSize / 4) >= 64) ? (int)((int)Constants.RegionSize / 4) : 64;

+        #pragma warning restore 0429

+        private bool[,] m_landBitmap = new bool[landArrayMax,landArrayMax];

+

+        private int m_lastSeqId = 0;

+

+        protected LandData m_landData = new LandData();

+        protected Scene m_scene;

+        protected List<SceneObjectGroup> primsOverMe = new List<SceneObjectGroup>();

+

+        public bool[,] LandBitmap

+        {

+            get { return m_landBitmap; }

+            set { m_landBitmap = value; }

+        }

+

+        #endregion

+

+        #region ILandObject Members

+

+        public LandData LandData

+        {

+            get { return m_landData; }

+

+            set { m_landData = value; }

+        }

+

+        public UUID RegionUUID

+        {

+            get { return m_scene.RegionInfo.RegionID; }

+        }

+

+        #region Constructors

+

+        public LandObject(UUID owner_id, bool is_group_owned, Scene scene)

+        {

+            m_scene = scene;

+            LandData.OwnerID = owner_id;

+            if (is_group_owned)

+                LandData.GroupID = owner_id;

+            else

+                LandData.GroupID = UUID.Zero;

+            LandData.IsGroupOwned = is_group_owned;

+        }

+

+        #endregion

+

+        #region Member Functions

+

+        #region General Functions

+

+        /// <summary>

+        /// Checks to see if this land object contains a point

+        /// </summary>

+        /// <param name="x"></param>

+        /// <param name="y"></param>

+        /// <returns>Returns true if the piece of land contains the specified point</returns>

+        public bool ContainsPoint(int x, int y)

+        {

+            if (x >= 0 && y >= 0 && x <= Constants.RegionSize && y <= Constants.RegionSize)

+            {

+                return (LandBitmap[x / 4, y / 4] == true);

+            }

+            else

+            {

+                return false;

+            }

+        }

+

+        public ILandObject Copy()

+        {

+            ILandObject newLand = new LandObject(LandData.OwnerID, LandData.IsGroupOwned, m_scene);

+

+            //Place all new variables here!

+            newLand.LandBitmap = (bool[,]) (LandBitmap.Clone());

+            newLand.LandData = LandData.Copy();

+

+            return newLand;

+        }

+

+        static overrideParcelMaxPrimCountDelegate overrideParcelMaxPrimCount;

+        static overrideSimulatorMaxPrimCountDelegate overrideSimulatorMaxPrimCount;

+

+        public void SetParcelObjectMaxOverride(overrideParcelMaxPrimCountDelegate overrideDel)

+        {

+            overrideParcelMaxPrimCount = overrideDel;

+        }

+        public void SetSimulatorObjectMaxOverride(overrideSimulatorMaxPrimCountDelegate overrideDel)

+        {

+            overrideSimulatorMaxPrimCount = overrideDel;

+        }

+

+        public int GetParcelMaxPrimCount(ILandObject thisObject)

+        {

+            if (overrideParcelMaxPrimCount != null)

+            {

+                return overrideParcelMaxPrimCount(thisObject);

+            }

+            else

+            {

+                // Normal Calculations

+                return (int)Math.Round(((float)LandData.Area / 65536.0f) * (float)m_scene.RegionInfo.ObjectCapacity * (float)m_scene.RegionInfo.RegionSettings.ObjectBonus);

+            }

+        }

+        public int GetSimulatorMaxPrimCount(ILandObject thisObject)

+        {

+            if (overrideSimulatorMaxPrimCount != null)

+            {

+                return overrideSimulatorMaxPrimCount(thisObject);

+            }

+            else

+            {

+                //Normal Calculations

+                return m_scene.RegionInfo.ObjectCapacity;

+            }

+        }

+        #endregion

+

+        #region Packet Request Handling

+

+        public void SendLandProperties(int sequence_id, bool snap_selection, int request_result, IClientAPI remote_client)

+        {

+            IEstateModule estateModule = m_scene.RequestModuleInterface<IEstateModule>();

+            uint regionFlags = 336723974 & ~((uint)(RegionFlags.AllowLandmark | RegionFlags.AllowSetHome));

+            if (estateModule != null)

+                regionFlags = estateModule.GetRegionFlags();

+

+            // In a perfect world, this would have worked.

+            //

+//            if ((landData.Flags & (uint)ParcelFlags.AllowLandmark) != 0)

+//                regionFlags |=  (uint)RegionFlags.AllowLandmark;

+//            if (landData.OwnerID == remote_client.AgentId)

+//                regionFlags |=  (uint)RegionFlags.AllowSetHome;

+

+            int seq_id;

+            if (snap_selection && (sequence_id == 0))

+            {

+                seq_id = m_lastSeqId;

+            }

+            else

+            {

+                seq_id = sequence_id;

+                m_lastSeqId = seq_id;

+            }

+

+            remote_client.SendLandProperties(seq_id,

+                    snap_selection, request_result, LandData,

+                    (float)m_scene.RegionInfo.RegionSettings.ObjectBonus,

+                    GetParcelMaxPrimCount(this),

+                    GetSimulatorMaxPrimCount(this), regionFlags);

+        }

+

+        public void UpdateLandProperties(LandUpdateArgs args, IClientAPI remote_client)

+        {

+            if (m_scene.Permissions.CanEditParcel(remote_client.AgentId,this))

+            {

+                //Needs later group support

+                bool snap_selection = false;

+                LandData newData = LandData.Copy();

+

+                if (args.AuthBuyerID != newData.AuthBuyerID || args.SalePrice != newData.SalePrice)

+                {

+                    if (m_scene.Permissions.CanSellParcel(remote_client.AgentId, this))

+                    {

+                        newData.AuthBuyerID = args.AuthBuyerID;

+                        newData.SalePrice = args.SalePrice;

+                        snap_selection = true;

+                    }

+                }

+                newData.Category = args.Category;

+                newData.Description = args.Desc;

+                newData.GroupID = args.GroupID;

+                newData.LandingType = args.LandingType;

+                newData.MediaAutoScale = args.MediaAutoScale;

+                newData.MediaID = args.MediaID;

+                newData.MediaURL = args.MediaURL;

+                newData.MusicURL = args.MusicURL;

+                newData.Name = args.Name;

+                newData.Flags = args.ParcelFlags;

+                newData.PassHours = args.PassHours;

+                newData.PassPrice = args.PassPrice;

+                newData.SnapshotID = args.SnapshotID;

+                newData.UserLocation = args.UserLocation;

+                newData.UserLookAt = args.UserLookAt;

+

+                m_scene.LandChannel.UpdateLandObject(LandData.LocalID, newData);

+

+                SendLandUpdateToAvatarsOverMe(snap_selection);

+            }

+        }

+

+        public void UpdateLandSold(UUID avatarID, UUID groupID, bool groupOwned, uint AuctionID, int claimprice, int area)

+        {

+            LandData newData = LandData.Copy();

+            newData.OwnerID = avatarID;

+            newData.GroupID = groupID;

+            newData.IsGroupOwned = groupOwned;

+            //newData.auctionID = AuctionID;

+            newData.ClaimDate = Util.UnixTimeSinceEpoch();

+            newData.ClaimPrice = claimprice;

+            newData.SalePrice = 0;

+            newData.AuthBuyerID = UUID.Zero;

+            newData.Flags &= ~(uint) (ParcelFlags.ForSale | ParcelFlags.ForSaleObjects | ParcelFlags.SellParcelObjects | ParcelFlags.ShowDirectory);

+            m_scene.LandChannel.UpdateLandObject(LandData.LocalID, newData);

+

+            SendLandUpdateToAvatarsOverMe(true);

+        }

+

+        public void DeedToGroup(UUID groupID)

+        {

+            LandData newData = LandData.Copy();

+            newData.OwnerID = groupID;

+            newData.GroupID = groupID;

+            newData.IsGroupOwned = true;

+

+            // Reset show in directory flag on deed

+            newData.Flags &= ~(uint) (ParcelFlags.ForSale | ParcelFlags.ForSaleObjects | ParcelFlags.SellParcelObjects | ParcelFlags.ShowDirectory);

+

+            m_scene.LandChannel.UpdateLandObject(LandData.LocalID, newData);

+

+            SendLandUpdateToAvatarsOverMe(true);

+        }

+

+        public bool IsEitherBannedOrRestricted(UUID avatar)

+        {

+            if (IsBannedFromLand(avatar))

+            {

+                return true;

+            }

+            else if (IsRestrictedFromLand(avatar))

+            {

+                return true;

+            }

+            return false;

+        }

+

+        public bool HasGroupAccess(UUID avatar)

+        {

+            if ((LandData.Flags & (uint)ParcelFlags.UseAccessGroup) == (uint)ParcelFlags.UseAccessGroup)

+            {

+                IGroupsModule groupsModule =

+                        m_scene.RequestModuleInterface<IGroupsModule>();

+

+                List<UUID> agentGroups = new List<UUID>();

+                if (groupsModule != null)

+                {

+                    GroupMembershipData[] GroupMembership =

+                            groupsModule.GetMembershipData(avatar);

+

+                    if (GroupMembership != null)

+                    {

+                        for (int i = 0; i < GroupMembership.Length; i++)

+                        {

+                            if (LandData.GroupID == GroupMembership[i].GroupID)

+                            {

+                                return true;

+                            }

+                        }

+                    }

+                }

+            }

+            return false;

+        }

+

+        public bool IsBannedFromLand(UUID avatar)

+        {

+            if (m_scene.Permissions.IsAdministrator(avatar))

+                return false;

+

+            if ((LandData.Flags & (uint) ParcelFlags.UseBanList) > 0)

+            {

+                ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry();

+                entry.AgentID = avatar;

+                entry.Flags = AccessList.Ban;

+                entry.Time = new DateTime();

+                //See if they are on the list, but make sure the owner isn't banned

+                if (LandData.ParcelAccessList.Contains(entry) && LandData.OwnerID != avatar)

+                {

+                    //They are banned, so lets send them a notice about this parcel

+                    return true;

+                }

+            }

+            return false;

+        }

+

+        public bool IsRestrictedFromLand(UUID avatar)

+        {

+            if (m_scene.Permissions.IsAdministrator(avatar))

+                return false;

+

+            if ((LandData.Flags & (uint) ParcelFlags.UseAccessList) > 0)

+            {

+                ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry();

+                entry.AgentID = avatar;

+                entry.Flags = AccessList.Access;

+                entry.Time = new DateTime();

+

+                //If they are not on the access list and are not the owner

+                if (!LandData.ParcelAccessList.Contains(entry) && LandData.OwnerID != avatar)

+                {

+                    if (!HasGroupAccess(avatar))

+                    {

+                        //They are not allowed in this parcel, but not banned, so lets send them a notice about this parcel

+                        return true;

+                    }

+                }

+            }

+

+            return false;

+        }

+

+        public void SendLandUpdateToClient(IClientAPI remote_client)

+        {

+            SendLandProperties(0, false, 0, remote_client);

+        }

+

+        public void SendLandUpdateToClient(bool snap_selection, IClientAPI remote_client)

+        {

+            SendLandProperties(0, snap_selection, 0, remote_client);

+        }

+

+        public void SendLandUpdateToAvatarsOverMe()

+        {

+            SendLandUpdateToAvatarsOverMe(false);

+        }

+

+        public void SendLandUpdateToAvatarsOverMe(bool snap_selection)

+        {

+            m_scene.ForEachScenePresence(delegate(ScenePresence avatar)

+            {

+                if (avatar.IsChildAgent)

+                    return;

+

+                ILandObject over = null;

+                try

+                {

+                    over =

+                        m_scene.LandChannel.GetLandObject(Util.Clamp<int>((int)Math.Round(avatar.AbsolutePosition.X), 0, ((int)Constants.RegionSize - 1)),

+                                                          Util.Clamp<int>((int)Math.Round(avatar.AbsolutePosition.Y), 0, ((int)Constants.RegionSize - 1)));

+                }

+                catch (Exception)

+                {

+                    m_log.Warn("[LAND]: " + "unable to get land at x: " + Math.Round(avatar.AbsolutePosition.X) + " y: " +

+                               Math.Round(avatar.AbsolutePosition.Y));

+                }

+

+                if (over != null)

+                {

+                    if (over.LandData.LocalID == LandData.LocalID)

+                    {

+                        if (((over.LandData.Flags & (uint)ParcelFlags.AllowDamage) != 0) &&

+                            m_scene.RegionInfo.RegionSettings.AllowDamage)

+                            avatar.Invulnerable = false;

+                        else

+                            avatar.Invulnerable = true;

+

+                        SendLandUpdateToClient(snap_selection, avatar.ControllingClient);

+                    }

+                }

+            });

+        }

+

+        #endregion

+

+        #region AccessList Functions

+

+        public List<UUID>  CreateAccessListArrayByFlag(AccessList flag)

+        {

+            List<UUID> list = new List<UUID>();

+            foreach (ParcelManager.ParcelAccessEntry entry in LandData.ParcelAccessList)

+            {

+                if (entry.Flags == flag)

+                {

+                   list.Add(entry.AgentID);

+                }

+            }

+            if (list.Count == 0)

+            {

+                list.Add(UUID.Zero);

+            }

+

+            return list;

+        }

+

+        public void SendAccessList(UUID agentID, UUID sessionID, uint flags, int sequenceID,

+                                   IClientAPI remote_client)

+        {

+

+            if (flags == (uint) AccessList.Access || flags == (uint) AccessList.Both)

+            {

+                List<UUID> avatars = CreateAccessListArrayByFlag(AccessList.Access);

+                remote_client.SendLandAccessListData(avatars,(uint) AccessList.Access,LandData.LocalID);

+            }

+

+            if (flags == (uint) AccessList.Ban || flags == (uint) AccessList.Both)

+            {

+                List<UUID> avatars = CreateAccessListArrayByFlag(AccessList.Ban);

+                remote_client.SendLandAccessListData(avatars, (uint)AccessList.Ban, LandData.LocalID);

+            }

+        }

+

+        public void UpdateAccessList(uint flags, List<ParcelManager.ParcelAccessEntry> entries, IClientAPI remote_client)

+        {

+            LandData newData = LandData.Copy();

+

+            if (entries.Count == 1 && entries[0].AgentID == UUID.Zero)

+            {

+                entries.Clear();

+            }

+

+            List<ParcelManager.ParcelAccessEntry> toRemove = new List<ParcelManager.ParcelAccessEntry>();

+            foreach (ParcelManager.ParcelAccessEntry entry in newData.ParcelAccessList)

+            {

+                if (entry.Flags == (AccessList)flags)

+                {

+                    toRemove.Add(entry);

+                }

+            }

+

+            foreach (ParcelManager.ParcelAccessEntry entry in toRemove)

+            {

+                newData.ParcelAccessList.Remove(entry);

+            }

+            foreach (ParcelManager.ParcelAccessEntry entry in entries)

+            {

+                ParcelManager.ParcelAccessEntry temp = new ParcelManager.ParcelAccessEntry();

+                temp.AgentID = entry.AgentID;

+                temp.Time = new DateTime(); //Pointless? Yes.

+                temp.Flags = (AccessList)flags;

+

+                if (!newData.ParcelAccessList.Contains(temp))

+                {

+                    newData.ParcelAccessList.Add(temp);

+                }

+            }

+

+            m_scene.LandChannel.UpdateLandObject(LandData.LocalID, newData);

+        }

+

+        #endregion

+

+        #region Update Functions

+

+        public void UpdateLandBitmapByteArray()

+        {

+            LandData.Bitmap = ConvertLandBitmapToBytes();

+        }

+

+        /// <summary>

+        /// Update all settings in land such as area, bitmap byte array, etc

+        /// </summary>

+        public void ForceUpdateLandInfo()

+        {

+            UpdateAABBAndAreaValues();

+            UpdateLandBitmapByteArray();

+        }

+

+        public void SetLandBitmapFromByteArray()

+        {

+            LandBitmap = ConvertBytesToLandBitmap();

+        }

+

+        /// <summary>

+        /// Updates the AABBMin and AABBMax values after area/shape modification of the land object

+        /// </summary>

+        private void UpdateAABBAndAreaValues()

+        {

+            int min_x = 64;

+            int min_y = 64;

+            int max_x = 0;

+            int max_y = 0;

+            int tempArea = 0;

+            int x, y;

+            for (x = 0; x < 64; x++)

+            {

+                for (y = 0; y < 64; y++)

+                {

+                    if (LandBitmap[x, y] == true)

+                    {

+                        if (min_x > x) min_x = x;

+                        if (min_y > y) min_y = y;

+                        if (max_x < x) max_x = x;

+                        if (max_y < y) max_y = y;

+                        tempArea += 16; //16sqm peice of land

+                    }

+                }

+            }

+            int tx = min_x * 4;

+            if (tx > ((int)Constants.RegionSize - 1))

+                tx = ((int)Constants.RegionSize - 1);

+            int ty = min_y * 4;

+            if (ty > ((int)Constants.RegionSize - 1))

+                ty = ((int)Constants.RegionSize - 1);

+            LandData.AABBMin =

+                new Vector3((float) (min_x * 4), (float) (min_y * 4),

+                              (float) m_scene.Heightmap[tx, ty]);

+

+            tx = max_x * 4;

+            if (tx > ((int)Constants.RegionSize - 1))

+                tx = ((int)Constants.RegionSize - 1);

+            ty = max_y * 4;

+            if (ty > ((int)Constants.RegionSize - 1))

+                ty = ((int)Constants.RegionSize - 1);

+            LandData.AABBMax =

+                new Vector3((float) (max_x * 4), (float) (max_y * 4),

+                              (float) m_scene.Heightmap[tx, ty]);

+            LandData.Area = tempArea;

+        }

+

+        #endregion

+

+        #region Land Bitmap Functions

+

+        /// <summary>

+        /// Sets the land's bitmap manually

+        /// </summary>

+        /// <param name="bitmap">64x64 block representing where this land is on a map</param>

+        public void SetLandBitmap(bool[,] bitmap)

+        {

+            if (bitmap.GetLength(0) != 64 || bitmap.GetLength(1) != 64 || bitmap.Rank != 2)

+            {

+                //Throw an exception - The bitmap is not 64x64

+                //throw new Exception("Error: Invalid Parcel Bitmap");

+            }

+            else

+            {

+                //Valid: Lets set it

+                LandBitmap = bitmap;

+                ForceUpdateLandInfo();

+            }

+        }

+

+        /// <summary>

+        /// Gets the land's bitmap manually

+        /// </summary>

+        /// <returns></returns>

+        public bool[,] GetLandBitmap()

+        {

+            return LandBitmap;

+        }

+

+        /// <summary>

+        /// Full sim land object creation

+        /// </summary>

+        /// <returns></returns>

+        public bool[,] BasicFullRegionLandBitmap()

+        {

+            return GetSquareLandBitmap(0, 0, (int) Constants.RegionSize, (int) Constants.RegionSize);

+        }

+

+        /// <summary>

+        /// Used to modify the bitmap between the x and y points. Points use 64 scale

+        /// </summary>

+        /// <param name="start_x"></param>

+        /// <param name="start_y"></param>

+        /// <param name="end_x"></param>

+        /// <param name="end_y"></param>

+        /// <returns></returns>

+        public bool[,] GetSquareLandBitmap(int start_x, int start_y, int end_x, int end_y)

+        {

+            bool[,] tempBitmap = new bool[64,64];

+            tempBitmap.Initialize();

+

+            tempBitmap = ModifyLandBitmapSquare(tempBitmap, start_x, start_y, end_x, end_y, true);

+            return tempBitmap;

+        }

+

+        /// <summary>

+        /// Change a land bitmap at within a square and set those points to a specific value

+        /// </summary>

+        /// <param name="land_bitmap"></param>

+        /// <param name="start_x"></param>

+        /// <param name="start_y"></param>

+        /// <param name="end_x"></param>

+        /// <param name="end_y"></param>

+        /// <param name="set_value"></param>

+        /// <returns></returns>

+        public bool[,] ModifyLandBitmapSquare(bool[,] land_bitmap, int start_x, int start_y, int end_x, int end_y,

+                                              bool set_value)

+        {

+            if (land_bitmap.GetLength(0) != 64 || land_bitmap.GetLength(1) != 64 || land_bitmap.Rank != 2)

+            {

+                //Throw an exception - The bitmap is not 64x64

+                //throw new Exception("Error: Invalid Parcel Bitmap in modifyLandBitmapSquare()");

+            }

+

+            int x, y;

+            for (y = 0; y < 64; y++)

+            {

+                for (x = 0; x < 64; x++)

+                {

+                    if (x >= start_x / 4 && x < end_x / 4

+                        && y >= start_y / 4 && y < end_y / 4)

+                    {

+                        land_bitmap[x, y] = set_value;

+                    }

+                }

+            }

+            return land_bitmap;

+        }

+

+        /// <summary>

+        /// Join the true values of 2 bitmaps together

+        /// </summary>

+        /// <param name="bitmap_base"></param>

+        /// <param name="bitmap_add"></param>

+        /// <returns></returns>

+        public bool[,] MergeLandBitmaps(bool[,] bitmap_base, bool[,] bitmap_add)

+        {

+            if (bitmap_base.GetLength(0) != 64 || bitmap_base.GetLength(1) != 64 || bitmap_base.Rank != 2)

+            {

+                //Throw an exception - The bitmap is not 64x64

+                throw new Exception("Error: Invalid Parcel Bitmap - Bitmap_base in mergeLandBitmaps");

+            }

+            if (bitmap_add.GetLength(0) != 64 || bitmap_add.GetLength(1) != 64 || bitmap_add.Rank != 2)

+            {

+                //Throw an exception - The bitmap is not 64x64

+                throw new Exception("Error: Invalid Parcel Bitmap - Bitmap_add in mergeLandBitmaps");

+            }

+

+            int x, y;

+            for (y = 0; y < 64; y++)

+            {

+                for (x = 0; x < 64; x++)

+                {

+                    if (bitmap_add[x, y])

+                    {

+                        bitmap_base[x, y] = true;

+                    }

+                }

+            }

+            return bitmap_base;

+        }

+

+        /// <summary>

+        /// Converts the land bitmap to a packet friendly byte array

+        /// </summary>

+        /// <returns></returns>

+        private byte[] ConvertLandBitmapToBytes()

+        {

+            byte[] tempConvertArr = new byte[512];

+            byte tempByte = 0;

+            int x, y, i, byteNum = 0;

+            i = 0;

+            for (y = 0; y < 64; y++)

+            {

+                for (x = 0; x < 64; x++)

+                {

+                    tempByte = Convert.ToByte(tempByte | Convert.ToByte(LandBitmap[x, y]) << (i++ % 8));

+                    if (i % 8 == 0)

+                    {

+                        tempConvertArr[byteNum] = tempByte;

+                        tempByte = (byte) 0;

+                        i = 0;

+                        byteNum++;

+                    }

+                }

+            }

+            return tempConvertArr;

+        }

+

+        private bool[,] ConvertBytesToLandBitmap()

+        {

+            bool[,] tempConvertMap = new bool[landArrayMax, landArrayMax];

+            tempConvertMap.Initialize();

+            byte tempByte = 0;

+            int x = 0, y = 0, i = 0, bitNum = 0;

+            for (i = 0; i < 512; i++)

+            {

+                tempByte = LandData.Bitmap[i];

+                for (bitNum = 0; bitNum < 8; bitNum++)

+                {

+                    bool bit = Convert.ToBoolean(Convert.ToByte(tempByte >> bitNum) & (byte) 1);

+                    tempConvertMap[x, y] = bit;

+                    x++;

+                    if (x > 63)

+                    {

+                        x = 0;

+                        y++;

+                    }

+                }

+            }

+            return tempConvertMap;

+        }

+

+        #endregion

+

+        #region Object Select and Object Owner Listing

+

+        public void SendForceObjectSelect(int local_id, int request_type, List<UUID> returnIDs, IClientAPI remote_client)

+        {

+            if (m_scene.Permissions.CanEditParcel(remote_client.AgentId, this))

+            {

+                List<uint> resultLocalIDs = new List<uint>();

+                try

+                {

+                    lock (primsOverMe)

+                    {

+                        foreach (SceneObjectGroup obj in primsOverMe)

+                        {

+                            if (obj.LocalId > 0)

+                            {

+                                if (request_type == LandChannel.LAND_SELECT_OBJECTS_OWNER && obj.OwnerID == LandData.OwnerID)

+                                {

+                                    resultLocalIDs.Add(obj.LocalId);

+                                }

+                                else if (request_type == LandChannel.LAND_SELECT_OBJECTS_GROUP && obj.GroupID == LandData.GroupID && LandData.GroupID != UUID.Zero)

+                                {

+                                    resultLocalIDs.Add(obj.LocalId);

+                                }

+                                else if (request_type == LandChannel.LAND_SELECT_OBJECTS_OTHER &&

+                                         obj.OwnerID != remote_client.AgentId)

+                                {

+                                    resultLocalIDs.Add(obj.LocalId);

+                                }

+                                else if (request_type == (int)ObjectReturnType.List && returnIDs.Contains(obj.OwnerID))

+                                {

+                                    resultLocalIDs.Add(obj.LocalId);

+                                }

+                            }

+                        }

+                    }

+                } catch (InvalidOperationException)

+                {

+                    m_log.Error("[LAND]: Unable to force select the parcel objects. Arr.");

+                }

+

+                remote_client.SendForceClientSelectObjects(resultLocalIDs);

+            }

+        }

+

+        /// <summary>

+        /// Notify the parcel owner each avatar that owns prims situated on their land.  This notification includes

+        /// aggreagete details such as the number of prims.

+        ///

+        /// </summary>

+        /// <param name="remote_client">

+        /// A <see cref="IClientAPI"/>

+        /// </param>

+        public void SendLandObjectOwners(IClientAPI remote_client)

+        {

+            if (m_scene.Permissions.CanEditParcel(remote_client.AgentId, this))

+            {

+                Dictionary<UUID, int> primCount = new Dictionary<UUID, int>();

+                List<UUID> groups = new List<UUID>();

+

+                lock (primsOverMe)

+                {

+                    try

+                    {

+

+                        foreach (SceneObjectGroup obj in primsOverMe)

+                        {

+                            try

+                            {

+                                if (!primCount.ContainsKey(obj.OwnerID))

+                                {

+                                    primCount.Add(obj.OwnerID, 0);

+                                }

+                            }

+                            catch (NullReferenceException)

+                            {

+                                m_log.Info("[LAND]: " + "Got Null Reference when searching land owners from the parcel panel");

+                            }

+                            try

+                            {

+                                primCount[obj.OwnerID] += obj.PrimCount;

+                            }

+                            catch (KeyNotFoundException)

+                            {

+                                m_log.Error("[LAND]: Unable to match a prim with it's owner.");

+                            }

+                            if (obj.OwnerID == obj.GroupID && (!groups.Contains(obj.OwnerID)))

+                                groups.Add(obj.OwnerID);

+                        }

+                    }

+                    catch (InvalidOperationException)

+                    {

+                        m_log.Error("[LAND]: Unable to Enumerate Land object arr.");

+                    }

+                }

+

+                remote_client.SendLandObjectOwners(LandData, groups, primCount);

+            }

+        }

+

+        public Dictionary<UUID, int> GetLandObjectOwners()

+        {

+            Dictionary<UUID, int> ownersAndCount = new Dictionary<UUID, int>();

+            lock (primsOverMe)

+            {

+                try

+                {

+

+                    foreach (SceneObjectGroup obj in primsOverMe)

+                    {

+                        if (!ownersAndCount.ContainsKey(obj.OwnerID))

+                        {

+                            ownersAndCount.Add(obj.OwnerID, 0);

+                        }

+                        ownersAndCount[obj.OwnerID] += obj.PrimCount;

+                    }

+                }

+                catch (InvalidOperationException)

+                {

+                    m_log.Error("[LAND]: Unable to enumerate land owners. arr.");

+                }

+

+            }

+            return ownersAndCount;

+        }

+

+        #endregion

+

+        #region Object Returning

+

+        public void ReturnObject(SceneObjectGroup obj)

+        {

+            SceneObjectGroup[] objs = new SceneObjectGroup[1];

+            objs[0] = obj;

+            m_scene.returnObjects(objs, obj.OwnerID);

+        }

+

+        public void ReturnLandObjects(uint type, UUID[] owners, UUID[] tasks, IClientAPI remote_client)

+        {

+            Dictionary<UUID,List<SceneObjectGroup>> returns =

+                    new Dictionary<UUID,List<SceneObjectGroup>>();

+

+            lock (primsOverMe)

+            {

+                if (type == (uint)ObjectReturnType.Owner)

+                {

+                    foreach (SceneObjectGroup obj in primsOverMe)

+                    {

+                        if (obj.OwnerID == m_landData.OwnerID)

+                        {

+                            if (!returns.ContainsKey(obj.OwnerID))

+                                returns[obj.OwnerID] =

+                                        new List<SceneObjectGroup>();

+                            returns[obj.OwnerID].Add(obj);

+                        }

+                    }

+                }

+                else if (type == (uint)ObjectReturnType.Group && m_landData.GroupID != UUID.Zero)

+                {

+                    foreach (SceneObjectGroup obj in primsOverMe)

+                    {

+                        if (obj.GroupID == m_landData.GroupID)

+                        {

+                            if (!returns.ContainsKey(obj.OwnerID))

+                                returns[obj.OwnerID] =

+                                        new List<SceneObjectGroup>();

+                            returns[obj.OwnerID].Add(obj);

+                        }

+                    }

+                }

+                else if (type == (uint)ObjectReturnType.Other)

+                {

+                    foreach (SceneObjectGroup obj in primsOverMe)

+                    {

+                        if (obj.OwnerID != m_landData.OwnerID &&

+                            (obj.GroupID != m_landData.GroupID ||

+                            m_landData.GroupID == UUID.Zero))

+                        {

+                            if (!returns.ContainsKey(obj.OwnerID))

+                                returns[obj.OwnerID] =

+                                        new List<SceneObjectGroup>();

+                            returns[obj.OwnerID].Add(obj);

+                        }

+                    }

+                }

+                else if (type == (uint)ObjectReturnType.List)

+                {

+                    List<UUID> ownerlist = new List<UUID>(owners);

+

+                    foreach (SceneObjectGroup obj in primsOverMe)

+                    {

+                        if (ownerlist.Contains(obj.OwnerID))

+                        {

+                            if (!returns.ContainsKey(obj.OwnerID))

+                                returns[obj.OwnerID] =

+                                        new List<SceneObjectGroup>();

+                            returns[obj.OwnerID].Add(obj);

+                        }

+                    }

+                }

+            }

+

+            foreach (List<SceneObjectGroup> ol in returns.Values)

+            {

+                if (m_scene.Permissions.CanReturnObjects(this, remote_client.AgentId, ol))

+                    m_scene.returnObjects(ol.ToArray(), remote_client.AgentId);

+            }

+        }

+

+        #endregion

+

+        #region Object Adding/Removing from Parcel

+

+        public void ResetLandPrimCounts()

+        {

+            LandData.GroupPrims = 0;

+            LandData.OwnerPrims = 0;

+            LandData.OtherPrims = 0;

+            LandData.SelectedPrims = 0;

+

+

+            lock (primsOverMe)

+                primsOverMe.Clear();

+        }

+

+        public void AddPrimToCount(SceneObjectGroup obj)

+        {

+

+            UUID prim_owner = obj.OwnerID;

+            int prim_count = obj.PrimCount;

+

+            if (obj.IsSelected)

+            {

+                LandData.SelectedPrims += prim_count;

+            }

+            else

+            {

+                if (prim_owner == LandData.OwnerID)

+                {

+                    LandData.OwnerPrims += prim_count;

+                }

+                else if ((obj.GroupID == LandData.GroupID ||

+                          prim_owner  == LandData.GroupID) &&

+                          LandData.GroupID != UUID.Zero)

+                {

+                    LandData.GroupPrims += prim_count;

+                }

+                else

+                {

+                    LandData.OtherPrims += prim_count;

+                }

+            }

+

+            lock (primsOverMe)

+                primsOverMe.Add(obj);

+        }

+

+        public void RemovePrimFromCount(SceneObjectGroup obj)

+        {

+            lock (primsOverMe)

+            {

+                if (primsOverMe.Contains(obj))

+                {

+                    UUID prim_owner = obj.OwnerID;

+                    int prim_count = obj.PrimCount;

+

+                    if (prim_owner == LandData.OwnerID)

+                    {

+                        LandData.OwnerPrims -= prim_count;

+                    }

+                    else if (obj.GroupID == LandData.GroupID ||

+                             prim_owner  == LandData.GroupID)

+                    {

+                        LandData.GroupPrims -= prim_count;

+                    }

+                    else

+                    {

+                        LandData.OtherPrims -= prim_count;

+                    }

+

+                    primsOverMe.Remove(obj);

+                }

+            }

+        }

+

+        #endregion

+

+        #endregion

+

+        #endregion

+        

+        /// <summary>

+        /// Set the media url for this land parcel

+        /// </summary>

+        /// <param name="url"></param>

+        public void SetMediaUrl(string url)

+        {

+            LandData.MediaURL = url;

+            SendLandUpdateToAvatarsOverMe();

+        }

+        

+        /// <summary>

+        /// Set the music url for this land parcel

+        /// </summary>

+        /// <param name="url"></param>

+        public void SetMusicUrl(string url)

+        {

+            LandData.MusicURL = url;

+            SendLandUpdateToAvatarsOverMe();

+        }

+    }

+}

diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
index bc54997..b1747ef 100644
--- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
+++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
@@ -412,7 +412,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
 
         public string Name
         {
-            get { return "PermissionsModule"; }
+            get { return "DefaultPermissionsModule"; }
         }
 
         public bool IsSharedModule
diff --git a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
index cb80111..d4166d0 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
@@ -549,6 +549,8 @@ namespace OpenSim.Region.CoreModules.World.Terrain
                 m_scene.PhysicsScene.SetTerrain(m_channel.GetFloatsSerialised());
                 m_scene.SaveTerrain();
 
+                m_scene.EventManager.TriggerTerrainUpdate();
+
                 // Clients who look at the map will never see changes after they looked at the map, so i've commented this out.
                 //m_scene.CreateTerrainTexture(true);
             }