39 files changed, 1639 insertions, 609 deletions
diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
index 9d8082b..ff4ec4c 100644
--- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
+++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
@@ -168,6 +168,19 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
        {
            if (XferUploaders.ContainsKey(transactionID))
            {
+//                m_log.DebugFormat("[XFER]: Asked to update item {0} ({1})",
+//                        item.Name, item.ID);
+                // Here we need to get the old asset to extract the
+                // texture UUIDs if it's a wearable.
+                if (item.AssetType == (int)AssetType.Bodypart ||
+                    item.AssetType == (int)AssetType.Clothing)
+                {
+                    AssetBase oldAsset = m_Scene.AssetService.Get(item.AssetID.ToString());
+                    if (oldAsset != null)
+                        XferUploaders[transactionID].SetOldData(oldAsset.Data);
+                }
                AssetBase asset = GetTransactionAsset(transactionID);
                if (asset != null)
@@ -182,6 +195,9 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
                    IInventoryService invService = m_Scene.InventoryService;
                    invService.UpdateItem(item);
+//                    m_log.DebugFormat("[XFER]: Updated item {0} ({1}) with asset {2}",
+//                            item.Name, item.ID, asset.FullID);
                }
            }
        }
diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
index a7929ba..a5dcdcc 100644
--- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
+++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
@@ -28,6 +28,7 @@
 using System;
 using System.IO;
 using System.Reflection;
+using System.Collections.Generic;
 using log4net;
 using OpenMetaverse;
 using OpenSim.Framework;
@@ -38,6 +39,13 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
 {
    public class AssetXferUploader
    {
+        // Viewer's notion of the default texture
+        private List<UUID> defaultIDs = new List<UUID> {
+                new UUID("5748decc-f629-461c-9a36-a35a221fe21f"),
+                new UUID("7ca39b4c-bd19-4699-aff7-f93fd03d3e7b"),
+                new UUID("6522e74d-1660-4e7f-b601-6f48c1659a77"),
+                new UUID("c228d1cf-4b5d-4ba8-84f4-899a0796aa97")
+                };
        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
        private AssetBase m_asset;
@@ -55,6 +63,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
        private UUID TransactionID = UUID.Zero;
        private sbyte type = 0;
        private byte wearableType = 0;
+        private byte[] m_oldData = null;
        public ulong XferID;
        private Scene m_Scene;
@@ -219,6 +228,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
        private void DoCreateItem(uint callbackID)
        {
+            ValidateAssets();
            m_Scene.AssetService.Store(m_asset);
            InventoryItemBase item = new InventoryItemBase();
@@ -239,12 +249,84 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
            item.Flags = (uint) wearableType;
            item.CreationDate = Util.UnixTimeSinceEpoch();
+            m_log.DebugFormat("[XFER]: Created item {0} with asset {1}",
+                    item.ID, item.AssetID);
            if (m_Scene.AddInventoryItem(item))
                ourClient.SendInventoryItemCreateUpdate(item, callbackID);
            else
                ourClient.SendAlertMessage("Unable to create inventory item");
        }
+        private void ValidateAssets()
+        {
+            if (m_asset.Type == (sbyte)AssetType.Clothing ||
+                m_asset.Type == (sbyte)AssetType.Bodypart)
+            {
+                string content = System.Text.Encoding.ASCII.GetString(m_asset.Data);
+                string[] lines = content.Split(new char[] {'\n'});
+                List<string> validated = new List<string>();
+                Dictionary<int, UUID> allowed = ExtractTexturesFromOldData();
+                int textures = 0;
+                foreach (string line in lines)
+                {
+                    try
+                    {
+                        if (line.StartsWith("textures "))
+                        {
+                            textures = Convert.ToInt32(line.Substring(9));
+                            validated.Add(line);
+                        }
+                        else if (textures > 0)
+                        {
+                            string[] parts = line.Split(new char[] {' '});
+                            UUID tx = new UUID(parts[1]);
+                            int id = Convert.ToInt32(parts[0]);
+                            if (defaultIDs.Contains(tx) || tx == UUID.Zero ||
+                                (allowed.ContainsKey(id) && allowed[id] == tx))
+                            {
+                                validated.Add(parts[0] + " " + tx.ToString());
+                            }
+                            else
+                            {
+                                int perms = m_Scene.InventoryService.GetAssetPermissions(ourClient.AgentId, tx);
+                                int full = (int)(PermissionMask.Modify | PermissionMask.Transfer | PermissionMask.Copy);
+                                if ((perms & full) != full)
+                                {
+                                    m_log.ErrorFormat("[ASSET UPLOADER]: REJECTED update with texture {0} from {1} because they do not own the texture", tx, ourClient.AgentId);
+                                    validated.Add(parts[0] + " " + UUID.Zero.ToString());
+                                }
+                                else
+                                {
+                                    validated.Add(line);
+                                }
+                            }
+                            textures--;
+                        }
+                        else
+                        {
+                            validated.Add(line);
+                        }
+                    }
+                    catch
+                    {
+                        // If it's malformed, skip it
+                    }
+                }
+                string final = String.Join("\n", validated.ToArray());
+                m_asset.Data = System.Text.Encoding.ASCII.GetBytes(final);
+            }
+        }
        /// <summary>
        /// Get the asset data uploaded in this transfer.
        /// </summary>
@@ -253,10 +335,55 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
        {
            if (m_finished)
            {
+                ValidateAssets();
                return m_asset;
            }
            return null;
        }
+        public void SetOldData(byte[] d)
+        {
+            m_oldData = d;
+        }
+        private Dictionary<int,UUID> ExtractTexturesFromOldData()
+        {
+            Dictionary<int,UUID> result = new Dictionary<int,UUID>();
+            if (m_oldData == null)
+                return result;
+            string content = System.Text.Encoding.ASCII.GetString(m_oldData);
+            string[] lines = content.Split(new char[] {'\n'});
+            int textures = 0;
+            foreach (string line in lines)
+            {
+                try
+                {
+                    if (line.StartsWith("textures "))
+                    {
+                        textures = Convert.ToInt32(line.Substring(9));
+                    }
+                    else if (textures > 0)
+                    {
+                        string[] parts = line.Split(new char[] {' '});
+                        UUID tx = new UUID(parts[1]);
+                        int id = Convert.ToInt32(parts[0]);
+                        result[id] = tx;
+                        textures--;
+                    }
+                }
+                catch
+                {
+                    // If it's malformed, skip it
+                }
+            }
+            return result;
+        }
    }
 }
diff --git a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
index 9adb68b..7cba702 100644
--- a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
+++ b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
@@ -262,7 +262,16 @@ namespace Flotsam.RegionModules.AssetCache
                    // If the file is already cached, don't cache it, just touch it so access time is updated
                    if (File.Exists(filename))
                    {
-                        File.SetLastAccessTime(filename, DateTime.Now);
+                        // We don't really want to know about sharing
+                        // violations here. If the file is locked, then
+                        // the other thread has updated the time for us.
+                        try
+                        {
+                            File.SetLastAccessTime(filename, DateTime.Now);
+                        }
+                        catch
+                        {
+                        }
                    } else { 
                        
                        // Once we start writing, make sure we flag that we're writing
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index 520d794..47476a9 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;
@@ -118,6 +119,13 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                    return;
                }
+                if (part.OwnerID != remoteClient.AgentId) // Not ours
+                {
+                    remoteClient.SendAgentAlertMessage(
+                        "You don't have sufficient permissions to attach this object", false);
+                    return;
+                }
                // TODO: this short circuits multiple attachments functionality  in  LL viewer 2.1+ and should
                // be removed when that functionality is implemented in opensim
                AttachmentPt &= 0x7f;
@@ -226,15 +234,17 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
        public UUID RezSingleAttachmentFromInventory(
            IClientAPI remoteClient, UUID itemID, uint AttachmentPt, bool updateInventoryStatus)
        {
-            m_log.DebugFormat(
+            return RezSingleAttachmentFromInventory(remoteClient, itemID, AttachmentPt, true, null);
-                "[ATTACHMENTS MODULE]: Rezzing attachment to point {0} from item {1} for {2}", 
+        }
-                (AttachmentPoint)AttachmentPt, itemID, remoteClient.Name);
-            
+        public UUID RezSingleAttachmentFromInventory(
+            IClientAPI remoteClient, UUID itemID, uint AttachmentPt, bool updateInventoryStatus, XmlDocument doc)
+        {
            // TODO: this short circuits multiple attachments functionality  in  LL viewer 2.1+ and should
            // be removed when that functionality is implemented in opensim
            AttachmentPt &= 0x7f;
-            SceneObjectGroup att = RezSingleAttachmentFromInventoryInternal(remoteClient, itemID, AttachmentPt);
+            SceneObjectGroup att = RezSingleAttachmentFromInventoryInternal(remoteClient, itemID, AttachmentPt, doc);
            if (updateInventoryStatus)
            {
@@ -251,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)
@@ -289,13 +299,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
                {
@@ -332,7 +348,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);
                bool changed = presence.Appearance.SetAttachment((int)AttachmentPt, itemID, item.AssetID);
                if (changed && m_scene.AvatarFactory != null)
@@ -379,6 +396,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);
                bool changed = presence.Appearance.SetAttachment((int)AttachmentPt, itemID, item.AssetID);
                if (changed && m_scene.AvatarFactory != null)
@@ -465,6 +488,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());
@@ -482,22 +507,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
            }
        }
        
-        public void UpdateAttachmentPosition(SceneObjectGroup sog, Vector3 pos)
-        {
-            // First we save the
-            // attachment point information, then we update the relative 
-            // positioning. Then we have to mark the object as NOT an
-            // attachment. This is necessary in order to correctly save
-            // and retrieve GroupPosition information for the attachment.
-            // Finally, we restore the object's attachment status.
-            byte attachmentPoint = sog.GetAttachmentPoint();
-            sog.UpdateGroupPosition(pos);
-            sog.RootPart.IsAttachment = false;
-            sog.AbsolutePosition = sog.RootPart.AttachedPos;
-            sog.SetAttachmentPoint(attachmentPoint);                                       
-            sog.HasGroupChanged = true;            
-        }
-        
        /// <summary>
        /// Update the attachment asset for the new sog details if they have changed.
        /// </summary>
@@ -600,15 +609,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
            if (!silent)
            {
-                // Killing it here will cause the client to deselect it
-                // It then reappears on the avatar, deselected
-                // through the full update below
-                //
-                if (so.IsSelected)
-                {
-                    m_scene.SendKillObject(so.RootPart.LocalId);
-                }
                so.IsSelected = false; // fudge....
                so.ScheduleGroupForFullUpdate();
            }
diff --git a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
index 4359c01..35a3f43 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:
@@ -231,8 +245,20 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
                s.ForEachScenePresence(
                    delegate(ScenePresence presence)
                    {
-                        if (TrySendChatMessage(presence, fromPos, regionPos, fromID, fromName, c.Type, message, sourceType))
+                        ILandObject Presencecheck = s.LandChannel.GetLandObject(presence.AbsolutePosition.X, presence.AbsolutePosition.Y);
-                            receiverIDs.Add(presence.UUID);
+                        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)
+                            {
+                                if (TrySendChatMessage(presence, fromPos, regionPos, fromID, fromNamePrefix + fromName, c.Type, message, sourceType))
+                                    receiverIDs.Add(presence.UUID);
+                            }
+                        }
                    }
                );
            }
@@ -276,31 +302,34 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
            }
            
            // m_log.DebugFormat("[CHAT] Broadcast: fromID {0} fromName {1}, cType {2}, sType {3}", fromID, fromName, cType, sourceType);
            HashSet<UUID> receiverIDs = new HashSet<UUID>();
            
-            ((Scene)c.Scene).ForEachScenePresence(
+            if (c.Scene != null)
-                delegate(ScenePresence presence)
+            {
-                {
+                ((Scene)c.Scene).ForEachScenePresence
-                    // ignore chat from child agents
+                (
-                    if (presence.IsChildAgent) return;
+                    delegate(ScenePresence presence)
-                    
+                    {
-                    IClientAPI client = presence.ControllingClient;
+                        // ignore chat from child agents
-                    
+                        if (presence.IsChildAgent) return;
-                    // don't forward SayOwner chat from objects to
+                        
-                    // non-owner agents
+                        IClientAPI client = presence.ControllingClient;
-                    if ((c.Type == ChatTypeEnum.Owner) &&
+                        
-                        (null != c.SenderObject) &&
+                        // don't forward SayOwner chat from objects to
-                        (((SceneObjectPart)c.SenderObject).OwnerID != client.AgentId))
+                        // non-owner agents
-                        return;
+                        if ((c.Type == ChatTypeEnum.Owner) &&
-                    
+                            (null != c.SenderObject) &&
-                    client.SendChatMessage(c.Message, (byte)cType, CenterOfRegion, fromName, fromID, 
+                            (((SceneObjectPart)c.SenderObject).OwnerID != client.AgentId))
-                                           (byte)sourceType, (byte)ChatAudibleLevel.Fully);
+                            return;
-                    receiverIDs.Add(presence.UUID);
+                        
-                });
+                        client.SendChatMessage(c.Message, (byte)cType, CenterOfRegion, fromName, fromID, 
-            
+                                               (byte)sourceType, (byte)ChatAudibleLevel.Fully);
-            (c.Scene as Scene).EventManager.TriggerOnChatToClients(
+                        receiverIDs.Add(presence.UUID);
-                fromID, receiverIDs, c.Message, cType, CenterOfRegion, fromName, sourceType, ChatAudibleLevel.Fully);
+                    }
+                );
+                (c.Scene as Scene).EventManager.TriggerOnChatToClients(
+                    fromID, receiverIDs, c.Message, cType, CenterOfRegion, fromName, sourceType, ChatAudibleLevel.Fully);
+             }
        }
        /// <summary>
@@ -343,5 +372,35 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
            
            return true;
        }
+        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 8a977c9..ded8743 100644
--- a/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs
@@ -215,4 +215,4 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog
            return result;
        }
    }
-}
-\ No newline at end of file
+}
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
index 5baf078..0cd05e3 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
@@ -273,7 +273,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)
                m_NeedsListOfFriends.Add(agentID);
@@ -516,6 +516,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
            FriendsService.StoreFriend(agentID, friendID.ToString(), 1);
            FriendsService.StoreFriend(friendID, agentID.ToString(), 1);
+            ICallingCardModule ccm = client.Scene.RequestModuleInterface<ICallingCardModule>();
+            if (ccm != null)
+            {
+                ccm.CreateCallingCard(agentID, friendID, UUID.Zero);
+            }
            // Update the local cache
            UpdateFriendsCache(agentID);
@@ -679,6 +685,13 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
                    (byte)OpenMetaverse.InstantMessageDialog.FriendshipAccepted, userID.ToString(), false, Vector3.Zero);
                friendClient.SendInstantMessage(im);
+                ICallingCardModule ccm = friendClient.Scene.RequestModuleInterface<ICallingCardModule>();
+                if (ccm != null)
+                {
+                    ccm.CreateCallingCard(friendID, userID, UUID.Zero);
+                }
                // Update the local cache
                UpdateFriendsCache(friendID);
@@ -701,7 +714,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
                // we're done
                return true;
            }
-            
            return false;
        }
diff --git a/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs b/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
index 5ec64d5..a83b3df 100644
--- a/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
@@ -31,16 +31,40 @@ using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Framework.Interfaces;
+using System;
+using System.Reflection;
+using System.Collections;
+using System.Collections.Specialized;
+using System.Reflection;
+using System.IO;
+using System.Web;
+using System.Xml;
+using log4net;
+using Mono.Addins;
+using OpenMetaverse.Messages.Linden;
+using OpenMetaverse.StructuredData;
+using OpenSim.Framework.Capabilities;
+using OpenSim.Framework.Servers;
+using OpenSim.Framework.Servers.HttpServer;
+using Caps = OpenSim.Framework.Capabilities.Caps;
+using OSDArray = OpenMetaverse.StructuredData.OSDArray;
+using OSDMap = OpenMetaverse.StructuredData.OSDMap;
 namespace OpenSim.Region.CoreModules.Avatar.Gods
 {
    public class GodsModule : IRegionModule, IGodsModule
    {
+        private static readonly ILog m_log =
+            LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
        /// <summary>Special UUID for actions that apply to all agents</summary>
        private static readonly UUID ALL_AGENTS = new UUID("44e87126-e794-4ded-05b3-7c42da3d5cdb");
        protected Scene m_scene;
        protected IDialogModule m_dialogModule;
+        protected Dictionary<UUID, string> m_capsDict =
+                new Dictionary<UUID, string>();
        
        public void Initialise(Scene scene, IConfigSource source)
        {
@@ -48,6 +72,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Gods
            m_dialogModule = m_scene.RequestModuleInterface<IDialogModule>();
            m_scene.RegisterModuleInterface<IGodsModule>(this);
            m_scene.EventManager.OnNewClient += SubscribeToClientEvents;
+            m_scene.EventManager.OnRegisterCaps += OnRegisterCaps;
+            m_scene.EventManager.OnClientClosed += OnClientClosed;
+            scene.EventManager.OnIncomingInstantMessage +=
+                    OnIncomingInstantMessage;
        }
        
        public void PostInitialise() {}
@@ -67,6 +95,54 @@ namespace OpenSim.Region.CoreModules.Avatar.Gods
            client.OnRequestGodlikePowers -= RequestGodlikePowers;
        }
        
+        private void OnClientClosed(UUID agentID, Scene scene)
+        {
+            m_capsDict.Remove(agentID);
+        }
+        private void OnRegisterCaps(UUID agentID, Caps caps)
+        {
+            string uri = "/CAPS/" + UUID.Random();
+            m_capsDict[agentID] = uri;
+            caps.RegisterHandler("UntrustedSimulatorMessage",
+                    new RestStreamHandler("POST", uri,
+                    HandleUntrustedSimulatorMessage));
+        }
+        private string HandleUntrustedSimulatorMessage(string request,
+                string path, string param, OSHttpRequest httpRequest,
+                OSHttpResponse httpResponse)
+        {
+            OSDMap osd = (OSDMap)OSDParser.DeserializeLLSDXml(request);
+            string message = osd["message"].AsString();
+            if (message == "GodKickUser")
+            {
+                OSDMap body = (OSDMap)osd["body"];
+                OSDArray userInfo = (OSDArray)body["UserInfo"];
+                OSDMap userData = (OSDMap)userInfo[0];
+                UUID agentID = userData["AgentID"].AsUUID();
+                UUID godID = userData["GodID"].AsUUID();
+                UUID godSessionID = userData["GodSessionID"].AsUUID();
+                uint kickFlags = userData["KickFlags"].AsUInteger();
+                string reason = userData["Reason"].AsString();
+                ScenePresence god = m_scene.GetScenePresence(godID);
+                if (god == null || god.ControllingClient.SessionId != godSessionID)
+                    return String.Empty;
+                KickUser(godID, godSessionID, agentID, kickFlags, Util.StringToBytes1024(reason));
+            }
+            else
+            {
+                m_log.ErrorFormat("[GOD]: Unhandled UntrustedSimulatorMessage: {0}", message);
+            }
+            return String.Empty;
+        }
        public void RequestGodlikePowers(
            UUID agentID, UUID sessionID, UUID token, bool godLike, IClientAPI controllingClient)
        {
@@ -115,71 +191,85 @@ namespace OpenSim.Region.CoreModules.Avatar.Gods
        /// <param name="reason">The message to send to the user after it's been turned into a field</param>
        public void KickUser(UUID godID, UUID sessionID, UUID agentID, uint kickflags, byte[] reason)
        {
-            UUID kickUserID = ALL_AGENTS;
+            if (!m_scene.Permissions.IsGod(godID))
-            
+                return;
            ScenePresence sp = m_scene.GetScenePresence(agentID);
-            if (sp != null || agentID == kickUserID)
+            if (sp == null && agentID != ALL_AGENTS)
            {
-                if (m_scene.Permissions.IsGod(godID))
+                IMessageTransferModule transferModule =
+                        m_scene.RequestModuleInterface<IMessageTransferModule>();
+                if (transferModule != null)
                {
-                    if (kickflags == 0)
+                    m_log.DebugFormat("[GODS]: Sending nonlocal kill for agent {0}", agentID);
-                    {
+                    transferModule.SendInstantMessage(new GridInstantMessage(
-                        if (agentID == kickUserID)
+                            m_scene, godID, "God", agentID, (byte)250, false,
-                        {
+                            Utils.BytesToString(reason), UUID.Zero, true,
-                            string reasonStr = Utils.BytesToString(reason);
+                            new Vector3(), new byte[] {(byte)kickflags}),
+                            delegate(bool success) {} );
-                            m_scene.ForEachClient(
+                }
-                                delegate(IClientAPI controller)
+                return;
-                                {
+            }
-                                    if (controller.AgentId != godID)
-                                        controller.Kick(reasonStr);
-                                }
-                            );
-                            // This is a bit crude. It seems the client will be null before it actually stops the thread
-                            // The thread will kill itself eventually :/
-                            // Is there another way to make sure *all* clients get this 'inter region' message?
-                            m_scene.ForEachScenePresence(
-                                delegate(ScenePresence p)
-                                {
-                                    if (p.UUID != godID && !p.IsChildAgent)
-                                    {
-                                        // Possibly this should really be p.Close() though that method doesn't send a close
-                                        // to the client
-                                        p.ControllingClient.Close();
-                                    }
-                                }
-                            );
-                        }
-                        else
-                        {
-                            m_scene.SceneGraph.removeUserCount(!sp.IsChildAgent);
-                            sp.ControllingClient.Kick(Utils.BytesToString(reason));
+            switch (kickflags)
-                            sp.ControllingClient.Close();
+            {
-                        }
+            case 0:
-                    }
+                if (sp != null)
-                    
+                {
-                    if (kickflags == 1)
+                    KickPresence(sp, Utils.BytesToString(reason));
-                    {
-                        sp.AllowMovement = false;
-                        m_dialogModule.SendAlertToUser(agentID, Utils.BytesToString(reason));
-                        m_dialogModule.SendAlertToUser(godID, "User Frozen");
-                    }
-                    
-                    if (kickflags == 2)
-                    {
-                        sp.AllowMovement = true;
-                        m_dialogModule.SendAlertToUser(agentID, Utils.BytesToString(reason));
-                        m_dialogModule.SendAlertToUser(godID, "User Unfrozen");
-                    }
                }
-                else
+                else if (agentID == ALL_AGENTS)
                {
-                    m_dialogModule.SendAlertToUser(godID, "Kick request denied");
+                    m_scene.ForEachScenePresence(
+                            delegate(ScenePresence p)
+                            {
+                                if (p.UUID != godID && (!m_scene.Permissions.IsGod(p.UUID)))
+                                    KickPresence(p, Utils.BytesToString(reason));
+                            }
+                    );
                }
+                break;
+            case 1:
+                if (sp != null)
+                {
+                    sp.AllowMovement = false;
+                    m_dialogModule.SendAlertToUser(agentID, Utils.BytesToString(reason));
+                    m_dialogModule.SendAlertToUser(godID, "User Frozen");
+                }
+                break;
+            case 2:
+                if (sp != null)
+                {
+                    sp.AllowMovement = true;
+                    m_dialogModule.SendAlertToUser(agentID, Utils.BytesToString(reason));
+                    m_dialogModule.SendAlertToUser(godID, "User Unfrozen");
+                }
+                break;
+            default:
+                break;
+            }
+        }
+        private void KickPresence(ScenePresence sp, string reason)
+        {
+            if (sp.IsChildAgent)
+                return;
+            sp.ControllingClient.Kick(reason);
+            sp.Scene.IncomingCloseAgent(sp.UUID);
+        }
+        private void OnIncomingInstantMessage(GridInstantMessage msg)
+        {
+            if (msg.dialog == (uint)250) // Nonlocal kick
+            {
+                UUID agentID = new UUID(msg.toAgentID);
+                string reason = msg.message;
+                UUID godID = new UUID(msg.fromAgentID);
+                uint kickMode = (uint)msg.binaryBucket[0];
+                KickUser(godID, UUID.Zero, agentID, kickMode, Util.StringToBytes1024(reason));
            }
        }
    }
-}
-\ No newline at end of file
+}
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
index af39565..feb5fb8 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
@@ -156,6 +156,32 @@ 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);
+            // If client is null, this message comes from storage and IS offline
+            if (client != null)
+                im.offline = 0;
+            if (im.offline == 0)
+                im.timestamp = (uint)Util.UnixTimeSinceEpoch();
            if (m_TransferModule != null)
            {
                if (client != null)
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
index 77c7147..c1caf44 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
@@ -47,6 +47,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
        private bool m_Enabled = false;
+        protected string m_MessageKey = String.Empty;
        protected List<Scene> m_Scenes = new List<Scene>();
        protected Dictionary<UUID, UUID> m_UserRegionMap = new Dictionary<UUID, UUID>();
@@ -66,14 +67,17 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
        public virtual void Initialise(IConfigSource config)
        {
            IConfig cnf = config.Configs["Messaging"];
-            if (cnf != null && cnf.GetString(
+            if (cnf != null)
-                    "MessageTransferModule", "MessageTransferModule") !=
-                    "MessageTransferModule")
            {
-                m_log.Debug("[MESSAGE TRANSFER]: Disabled by configuration");
+                if (cnf.GetString("MessageTransferModule",
-                return;
+                        "MessageTransferModule") != "MessageTransferModule")
-            }
+                {
+                    return;
+                }
+                m_MessageKey = cnf.GetString("MessageKey", String.Empty);
+            }
+            m_log.Debug("[MESSAGE TRANSFER]: Module enabled");
            m_Enabled = true;
        }
@@ -145,8 +149,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
                    ScenePresence user = (ScenePresence) scene.Entities[toAgentID];
                    if (!user.IsChildAgent)
                    {
-                        // Local message
+              //          m_log.DebugFormat("[INSTANT MESSAGE]: Delivering to client");
-//                        m_log.DebugFormat("[INSTANT MESSAGE]: Delivering IM to root agent {0} {1}", user.Name, toAgentID);
                        user.ControllingClient.SendInstantMessage(im);
                        // Message sent
@@ -168,7 +171,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
                    // Local message
                    ScenePresence user = (ScenePresence) scene.Entities[toAgentID];
-//                    m_log.DebugFormat("[INSTANT MESSAGE]: Delivering IM to child agent {0} {1}", user.Name, toAgentID);
+               //     m_log.DebugFormat("[INSTANT MESSAGE]: Delivering to client");
                    user.ControllingClient.SendInstantMessage(im);
                    // Message sent
@@ -251,6 +254,19 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
                        && requestData.ContainsKey("position_z") && requestData.ContainsKey("region_id")
                        && requestData.ContainsKey("binary_bucket"))
                {
+                    if (m_MessageKey != String.Empty)
+                    {
+                        XmlRpcResponse error_resp = new XmlRpcResponse();
+                        Hashtable error_respdata = new Hashtable();
+                        error_respdata["success"] = "FALSE";
+                        error_resp.Value = error_respdata;
+                        if (!requestData.Contains("message_key"))
+                            return error_resp;
+                        if (m_MessageKey != (string)requestData["message_key"])
+                            return error_resp;
+                    }
                    // Do the easy way of validating the UUIDs
                    UUID.TryParse((string)requestData["from_agent_id"], out fromAgentID);
                    UUID.TryParse((string)requestData["to_agent_id"], out toAgentID);
@@ -433,24 +449,37 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
            return resp;
        }
-        /// <summary>
+        private delegate void GridInstantMessageDelegate(GridInstantMessage im, MessageResultNotification result);
-        /// delegate for sending a grid instant message asynchronously
-        /// </summary>
-        public delegate void GridInstantMessageDelegate(GridInstantMessage im, MessageResultNotification result, UUID prevRegionID);
-        protected virtual void GridInstantMessageCompleted(IAsyncResult iar)
+        private class GIM {
-        {
+            public GridInstantMessage im;
-            GridInstantMessageDelegate icon =
+            public MessageResultNotification result;
-                    (GridInstantMessageDelegate)iar.AsyncState;
+        };
-            icon.EndInvoke(iar);
-        }
+        private Queue<GIM> pendingInstantMessages = new Queue<GIM>();
+        private int numInstantMessageThreads = 0;
-        protected virtual void SendGridInstantMessageViaXMLRPC(GridInstantMessage im, MessageResultNotification result)
+        private void SendGridInstantMessageViaXMLRPC(GridInstantMessage im, MessageResultNotification result)
        {
-            GridInstantMessageDelegate d = SendGridInstantMessageViaXMLRPCAsync;
+            lock (pendingInstantMessages) {
+                if (numInstantMessageThreads >= 4) {
+                    GIM gim = new GIM();
+                    gim.im = im;
+                    gim.result = result;
+                    pendingInstantMessages.Enqueue(gim);
+                } else {
+                    ++ numInstantMessageThreads;
+                    //m_log.DebugFormat("[SendGridInstantMessageViaXMLRPC]: ++numInstantMessageThreads={0}", numInstantMessageThreads);
+                    GridInstantMessageDelegate d = SendGridInstantMessageViaXMLRPCAsyncMain;
+                    d.BeginInvoke(im, result, GridInstantMessageCompleted, d);
+                }
+            }
+        }
-            d.BeginInvoke(im, result, UUID.Zero, GridInstantMessageCompleted, d);
+        private void GridInstantMessageCompleted(IAsyncResult iar)
+        {
+            GridInstantMessageDelegate d = (GridInstantMessageDelegate)iar.AsyncState;
+            d.EndInvoke(iar);
        }
        /// <summary>
@@ -465,8 +494,31 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
        /// Pass in 0 the first time this method is called.  It will be called recursively with the last 
        /// regionhandle tried
        /// </param>
-        protected virtual void SendGridInstantMessageViaXMLRPCAsync(GridInstantMessage im, MessageResultNotification result, UUID prevRegionID)
+        private void SendGridInstantMessageViaXMLRPCAsyncMain(GridInstantMessage im, MessageResultNotification result)
        {
+            GIM gim;
+            do {
+                try {
+                    SendGridInstantMessageViaXMLRPCAsync(im, result, UUID.Zero);
+                } catch (Exception e) {
+                    m_log.Error("[SendGridInstantMessageViaXMLRPC]: exception " + e.Message);
+                }
+                lock (pendingInstantMessages) {
+                    if (pendingInstantMessages.Count > 0) {
+                        gim = pendingInstantMessages.Dequeue();
+                        im = gim.im;
+                        result = gim.result;
+                    } else {
+                        gim = null;
+                        -- numInstantMessageThreads;
+                        //m_log.DebugFormat("[SendGridInstantMessageViaXMLRPC]: --numInstantMessageThreads={0}", numInstantMessageThreads);
+                    }
+                }
+            } while (gim != null);
+        }
+        private void SendGridInstantMessageViaXMLRPCAsync(GridInstantMessage im, MessageResultNotification result, UUID prevRegionID)
+        {
            UUID toAgentID = new UUID(im.toAgentID);
            PresenceInfo upd = null;
@@ -533,7 +585,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
            if (upd != null)
            {
-                GridRegion reginfo = m_Scenes[0].GridService.GetRegionByUUID(m_Scenes[0].RegionInfo.ScopeID,
+                GridRegion reginfo = m_Scenes[0].GridService.GetRegionByUUID(UUID.Zero,
                    upd.RegionID);
                if (reginfo != null)
                {
@@ -682,6 +734,8 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
            gim["position_z"] = msg.Position.Z.ToString();
            gim["region_id"] = msg.RegionID.ToString();
            gim["binary_bucket"] = Convert.ToBase64String(msg.binaryBucket,Base64FormattingOptions.None);
+            if (m_MessageKey != String.Empty)
+                gim["message_key"] = m_MessageKey;
            return gim;
        }
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
index 321b38b..1a0b914 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
@@ -171,16 +171,16 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
        private void RetrieveInstantMessages(IClientAPI client)
        {
-            if (m_RestURL != "")
+            if (m_RestURL == String.Empty)
-            {
+                return;
-                m_log.DebugFormat("[OFFLINE MESSAGING] Retrieving stored messages for {0}", client.AgentId);
-                List<GridInstantMessage> msglist = SynchronousRestObjectPoster.BeginPostObject<UUID, List<GridInstantMessage>>(
+            m_log.DebugFormat("[OFFLINE MESSAGING] Retrieving stored messages for {0}", client.AgentId);
-                        "POST", m_RestURL + "/RetrieveMessages/", client.AgentId);
-                if (msglist == null)
+            List<GridInstantMessage> msglist = SynchronousRestObjectPoster.BeginPostObject<UUID, List<GridInstantMessage>>(
-                    m_log.WarnFormat("[OFFLINE MESSAGING]: WARNING null message list.");
+                        "POST", m_RestURL + "/RetrieveMessages/", client.AgentId);
+            if (msglist != null)
+            {
                foreach (GridInstantMessage im in msglist)
                {
                    // client.SendInstantMessage(im);
@@ -191,6 +191,9 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
                    // Needed for proper state management for stored group
                    // invitations
                    //
+                    im.offline = 1;
                    Scene s = FindScene(client.AgentId);
                    if (s != null)
                        s.EventManager.TriggerIncomingInstantMessage(im);
@@ -200,26 +203,38 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
        private void UndeliveredMessage(GridInstantMessage im)
        {
-            if ((im.offline != 0)
+            if (im.dialog != (byte)InstantMessageDialog.MessageFromObject &&
-                && (!im.fromGroup || (im.fromGroup && m_ForwardOfflineGroupMessages)))
+                im.dialog != (byte)InstantMessageDialog.MessageFromAgent &&
+                im.dialog != (byte)InstantMessageDialog.GroupNotice &&
+                im.dialog != (byte)InstantMessageDialog.GroupInvitation &&
+                im.dialog != (byte)InstantMessageDialog.InventoryOffered)
            {
-                bool success = SynchronousRestObjectPoster.BeginPostObject<GridInstantMessage, bool>(
+                return;
-                        "POST", m_RestURL+"/SaveMessage/", im);
+            }
-                if (im.dialog == (byte)InstantMessageDialog.MessageFromAgent)
+            // It's not delivered. Make sure the scope id is saved
-                {
+            // We don't need the imSessionID here anymore, overwrite it
-                    IClientAPI client = FindClient(new UUID(im.fromAgentID));
+            Scene scene = FindScene(new UUID(im.fromAgentID));
-                    if (client == null)
+            if (scene == null)
-                        return;
+                scene = m_SceneList[0];
-                    client.SendInstantMessage(new GridInstantMessage(
+            bool success = SynchronousRestObjectPoster.BeginPostObject<GridInstantMessage, bool>(
-                            null, new UUID(im.toAgentID),
+                    "POST", m_RestURL+"/SaveMessage/?scope=" +
-                            "System", new UUID(im.fromAgentID),
+                    scene.RegionInfo.ScopeID.ToString(), im);
-                            (byte)InstantMessageDialog.MessageFromAgent,
-                            "User is not logged in. "+
+            if (im.dialog == (byte)InstantMessageDialog.MessageFromAgent)
-                            (success ? "Message saved." : "Message not saved"),
+            {
-                            false, new Vector3()));
+                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/Archiver/InventoryArchiveReadRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
index 6b24718..a19bbfd 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
@@ -632,4 +632,4 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
            m_assetsLoaded = true;            
        }                 
    }
-}
-\ No newline at end of file
+}
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
index c039b5a..dd16bfe 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
@@ -139,9 +139,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
        protected void SaveInvItem(InventoryItemBase inventoryItem, string path, Dictionary<string, object> options, IUserAccountService userAccountService)
        {
-            if (options.ContainsKey("verbose"))
-                m_log.InfoFormat("[INVENTORY ARCHIVER]: Saving item {0} with asset {1}", inventoryItem.ID, inventoryItem.AssetID);
            string filename = path + CreateArchiveItemName(inventoryItem);
            // Record the creator of this item for user record purposes (which might go away soon)
@@ -165,9 +162,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
            InventoryFolderBase inventoryFolder, string path, bool saveThisFolderItself, 
            Dictionary<string, object> options, IUserAccountService userAccountService)
        {
-            if (options.ContainsKey("verbose"))
-                m_log.InfoFormat("[INVENTORY ARCHIVER]: Saving folder {0}", inventoryFolder.Name);
- 
            if (saveThisFolderItself)
            {
                path += CreateArchiveFolderName(inventoryFolder);
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
index 576a154..613f0ed 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
@@ -122,7 +122,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                
                scene.AddCommand(
                    this, "save iar",
-                    "save iar [--p|-profile=<url>] <first> <last> <inventory path> <password> [<IAR path>] [--v|-verbose]",
+                    "save iar [--p|-profile=<url>] <first> <last> <inventory path> <password> [<IAR path>]",
                    "Save user inventory archive (IAR).", 
                    "<first> is the user's first name." + Environment.NewLine
                    + "<last> is the user's last name." + Environment.NewLine
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
index e3d4969..528bc8d 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
@@ -175,8 +175,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
                if (im.binaryBucket.Length < 17) // Invalid
                    return;
            
-                UUID receipientID = new UUID(im.toAgentID);
+                UUID recipientID = new UUID(im.toAgentID);
-                ScenePresence user = scene.GetScenePresence(receipientID);
+                ScenePresence user = scene.GetScenePresence(recipientID);
                UUID copyID;
                // First byte is the asset type
@@ -191,7 +191,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
                            folderID, new UUID(im.toAgentID));
                    
                    InventoryFolderBase folderCopy 
-                        = scene.GiveInventoryFolder(receipientID, client.AgentId, folderID, UUID.Zero);
+                        = scene.GiveInventoryFolder(recipientID, client.AgentId, folderID, UUID.Zero);
                    
                    if (folderCopy == null)
                    {
@@ -248,6 +248,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.
@@ -417,22 +419,67 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
        ///
        /// </summary>
        /// <param name="msg"></param>
-        private void OnGridInstantMessage(GridInstantMessage msg)
+        private void OnGridInstantMessage(GridInstantMessage im)
        {
            // Check if this is ours to handle
            //
-            Scene scene = FindClientScene(new UUID(msg.toAgentID));
+            Scene scene = FindClientScene(new UUID(im.toAgentID));
            if (scene == null)
                return;
            // Find agent to deliver to
            //
-            ScenePresence user = scene.GetScenePresence(new UUID(msg.toAgentID));
+            ScenePresence user = scene.GetScenePresence(new UUID(im.toAgentID));
+            if (user == null)
+                return;
+            // This requires a little bit of processing because we have to make the
+            // new item visible in the recipient's inventory here
+            //
+            if (im.dialog == (byte) InstantMessageDialog.InventoryOffered)
+            {
+                if (im.binaryBucket.Length < 17) // Invalid
+                    return;
+            
+                UUID recipientID = new UUID(im.toAgentID);
+                // First byte is the asset type
+                AssetType assetType = (AssetType)im.binaryBucket[0];
+                
+                if (AssetType.Folder == assetType)
+                {
+                    UUID folderID = new UUID(im.binaryBucket, 1);
+                    InventoryFolderBase given =
+                            new InventoryFolderBase(folderID, recipientID);
+                    InventoryFolderBase folder =
+                            scene.InventoryService.GetFolder(given);
+                    if (folder != null)
+                        user.ControllingClient.SendBulkUpdateInventory(folder);
+                }
+                else
+                {
+                    UUID itemID = new UUID(im.binaryBucket, 1);
-            // Just forward to local handling
+                    InventoryItemBase given =
-            OnInstantMessage(user.ControllingClient, msg);
+                            new InventoryItemBase(itemID, recipientID);
+                    InventoryItemBase item =
+                            scene.InventoryService.GetItem(given);
+                    if (item != null)
+                    {
+                        user.ControllingClient.SendBulkUpdateInventory(item);
+                    }
+                }
+                user.ControllingClient.SendInstantMessage(im);
+            }
+            else if (im.dialog == (byte) InstantMessageDialog.InventoryAccepted ||
+                     im.dialog == (byte) InstantMessageDialog.InventoryDeclined)
+            {
+                user.ControllingClient.SendInstantMessage(im);
+            }
        }
    }
 }
diff --git a/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs b/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
index d1d7df2..a12b57a 100644
--- a/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
@@ -146,16 +146,29 @@ namespace OpenSim.Region.CoreModules.Avatar.Lure
                    scene.RegionInfo.RegionHandle,
                    (uint)presence.AbsolutePosition.X,
                    (uint)presence.AbsolutePosition.Y,
-                    (uint)presence.AbsolutePosition.Z);
+                    (uint)presence.AbsolutePosition.Z + 2);
-            m_log.DebugFormat("TP invite with message {0}", message);
+            m_log.DebugFormat("[LURE]: TP invite with message {0}", message);
+            GridInstantMessage m;
+            if (scene.Permissions.IsAdministrator(client.AgentId) && presence.GodLevel >= 200 && (!scene.Permissions.IsAdministrator(targetid)))
+            {
+                m = new GridInstantMessage(scene, client.AgentId,
+                        client.FirstName+" "+client.LastName, targetid,
+                        (byte)InstantMessageDialog.GodLikeRequestTeleport, false,
+                        message, dest, false, presence.AbsolutePosition,
+                        new Byte[0]);
+            }
+            else
+            {
+                m = new GridInstantMessage(scene, client.AgentId,
+                        client.FirstName+" "+client.LastName, targetid,
+                        (byte)InstantMessageDialog.RequestTeleport, false,
+                        message, dest, false, presence.AbsolutePosition,
+                        new Byte[0]);
+            }
-            GridInstantMessage m = new GridInstantMessage(scene, client.AgentId,
-                    client.FirstName+" "+client.LastName, targetid,
-                    (byte)InstantMessageDialog.RequestTeleport, false,
-                    message, dest, false, presence.AbsolutePosition,
-                    new Byte[0]);
-                    
            if (m_TransferModule != null)
            {
                m_TransferModule.SendInstantMessage(m,
@@ -190,7 +203,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Lure
        {
            // Forward remote teleport requests
            //
-            if (msg.dialog != 22)
+            if (msg.dialog != (byte)InstantMessageDialog.RequestTeleport &&
+                msg.dialog != (byte)InstantMessageDialog.GodLikeRequestTeleport)
                return;
            if (m_TransferModule != null)
diff --git a/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs b/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
index eb776fe..7ae304c 100644
--- a/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
@@ -97,7 +97,8 @@ namespace OpenSim.Region.CoreModules.Framework
        public void CreateCaps(UUID agentId)
        {
-            if (m_scene.RegionInfo.EstateSettings.IsBanned(agentId))
+            int flags = m_scene.GetUserFlags(agentId);
+            if (m_scene.RegionInfo.EstateSettings.IsBanned(agentId, flags))
                return;
            String capsObjectPath = GetCapsPath(agentId);
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 6e4ec81..1fb346e 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -102,7 +102,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
        protected virtual void OnNewClient(IClientAPI client)
        {
-            client.OnTeleportHomeRequest += TeleportHome;
+            client.OnTeleportHomeRequest += TeleportHomeFired;
        }
        public virtual void Close()
@@ -180,6 +180,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                    sp.ControllingClient.SendTeleportStart(teleportFlags);
                    sp.ControllingClient.SendLocalTeleport(position, lookAt, teleportFlags);
+                    sp.TeleportFlags = (TeleportFlags)teleportFlags;
                    sp.Teleport(position);
                    foreach (SceneObjectGroup grp in sp.Attachments)
@@ -271,7 +272,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
@@ -520,7 +521,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
        protected void KillEntity(Scene scene, uint localID)
        {
-            scene.SendKillObject(localID);
+            scene.SendKillObject(new List<uint>() { localID });
        }
        protected virtual GridRegion GetFinalDestination(GridRegion region)
@@ -558,7 +559,12 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
        #region Teleport Home
-        public virtual void TeleportHome(UUID id, IClientAPI client)
+        public void TeleportHomeFired(UUID id, IClientAPI client)
+        {
+            TeleportHome(id, client);
+        }
+        public virtual bool TeleportHome(UUID id, IClientAPI client)
        {
            m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Request to teleport {0} {1} home", client.FirstName, client.LastName);
@@ -567,12 +573,18 @@ 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 false;
+                }
                GridRegion regionInfo = m_aScene.GridService.GetRegionByUUID(UUID.Zero, uinfo.HomeRegionID);
                if (regionInfo == null)
                {
                    // can't find the Home region: Tell viewer and abort
                    client.SendTeleportFailed("Your home region could not be found.");
-                    return;
+                    return false;
                }
                
                m_log.DebugFormat("[ENTITY TRANSFER MODULE]: User's home region is {0} {1} ({2}-{3})", 
@@ -583,6 +595,13 @@ 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 false;
+            }
+            return true;
        }
        #endregion
@@ -919,15 +938,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)
+                IPEndPoint neighbourExternal = neighbourRegion.ExternalEndPoint;
-                {
+                if (neighbourExternal != null)
-                    eq.CrossRegion(neighbourHandle, pos, agent.Velocity, neighbourRegion.ExternalEndPoint,
-                                   capsPath, agent.UUID, agent.ControllingClient.SessionId);
-                }
-                else
                {
-                    agent.ControllingClient.CrossRegion(neighbourHandle, pos, agent.Velocity, neighbourRegion.ExternalEndPoint,
+                    if (eq != null)
-                                                capsPath);
+                    {
+                        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))
@@ -1039,10 +1062,14 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                agent.Id0 = currentAgentCircuit.Id0;
            }
-            InformClientOfNeighbourDelegate d = InformClientOfNeighbourAsync;
+            IPEndPoint external = region.ExternalEndPoint;
-            d.BeginInvoke(sp, agent, region, region.ExternalEndPoint, true,
+            if (external != null)
+            {
+                InformClientOfNeighbourDelegate d = InformClientOfNeighbourAsync;
+                d.BeginInvoke(sp, agent, region, external, true,
                          InformClientOfNeighbourCompleted,
                          d);
+            }
        }
        #endregion
@@ -1175,6 +1202,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);
@@ -1278,8 +1306,6 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                m_log.Debug("[ENTITY TRANSFER MODULE]: Completed inform client about neighbour " + endPoint.ToString());
            }
-            if (!regionAccepted)
-                m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Region {0} did not accept agent: {1}", reg.RegionName, reason);
        }
        /// <summary>
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
index 5c53f78..1ccbcfd 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
@@ -86,7 +86,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
        protected override void OnNewClient(IClientAPI client)
        {
-            client.OnTeleportHomeRequest += TeleportHome;
+            client.OnTeleportHomeRequest += TeleportHomeFired;
            client.OnConnectionClosed += new Action<IClientAPI>(OnConnectionClosed);
        }
@@ -178,7 +178,12 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
            return m_aScene.SimulationService.CreateAgent(reg, agentCircuit, teleportFlags, out reason);
        }
-        public override void TeleportHome(UUID id, IClientAPI client)
+        public void TeleportHomeFired(UUID id, IClientAPI client)
+        {
+            TeleportHome(id, client);
+        }
+        public override bool TeleportHome(UUID id, IClientAPI client)
        {
            m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: Request to teleport {0} {1} home", client.FirstName, client.LastName);
@@ -188,8 +193,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
            {
                // local grid user
                m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: User is local");
-                base.TeleportHome(id, client);
+                return base.TeleportHome(id, client);
-                return;
            }
            // Foreign user wants to go home
@@ -199,7 +203,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
            {
                client.SendTeleportFailed("Your information has been lost");
                m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: Unable to locate agent's gateway information");
-                return;
+                return false;
            }
            IUserAgentService userAgentService = new UserAgentServiceConnector(aCircuit.ServiceURLs["HomeURI"].ToString());
@@ -209,7 +213,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
            {
                client.SendTeleportFailed("Your home region could not be found");
                m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: Agent's home region not found");
-                return;
+                return false;
            }
            ScenePresence sp = ((Scene)(client.Scene)).GetScenePresence(client.AgentId);
@@ -217,7 +221,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
            {
                client.SendTeleportFailed("Internal error");
                m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: Agent not found in the scene where it is supposed to be");
-                return;
+                return false;
            }
            IEventQueue eq = sp.Scene.RequestModuleInterface<IEventQueue>();
@@ -227,6 +231,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                aCircuit.firstname, aCircuit.lastname, finalDestination.RegionName, homeGatekeeper.ExternalHostName, homeGatekeeper.HttpPort, homeGatekeeper.RegionName);
            DoTeleport(sp, homeGatekeeper, finalDestination, position, lookAt, (uint)(Constants.TeleportFlags.SetLastToTarget | Constants.TeleportFlags.ViaHome), eq);
+            return true;
        }
        #endregion
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
index 1370b1f..184b223 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
@@ -243,7 +243,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                }
            }
-            // This is method scoped and will be returned. It will be the
+            // This is pethod scoped and will be returned. It will be the
            // last created asset id
            UUID assetID = UUID.Zero;
@@ -272,6 +272,9 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
            CoalescedSceneObjects coa = new CoalescedSceneObjects(UUID.Zero);                
            Dictionary<UUID, Vector3> originalPositions = new Dictionary<UUID, Vector3>();
+            Dictionary<UUID, string> xmlStrings =
+                    new Dictionary<UUID, string>();
            foreach (SceneObjectGroup objectGroup in objlist)
            {
                Vector3 inventoryStoredPosition = new Vector3
@@ -284,7 +287,12 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                                 : objectGroup.AbsolutePosition.Y,
                             objectGroup.AbsolutePosition.Z);
-                originalPositions[objectGroup.UUID] = objectGroup.AbsolutePosition;
+                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;
@@ -298,159 +306,60 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                         (uint)PermissionMask.Modify);
                objectGroup.RootPart.NextOwnerMask |=
                        (uint)PermissionMask.Move;
-                
-                coa.Add(objectGroup);
-            }
-            string itemXml;
+                string sceneObjectXml = SceneObjectSerializer.ToOriginalXmlFormat(objectGroup);
-            if (objlist.Count > 1)
+                objectGroup.AbsolutePosition = originalPosition;
-                itemXml = CoalescedSceneObjectsSerializer.ToXml(coa);
-            else
-                itemXml = SceneObjectSerializer.ToOriginalXmlFormat(objlist[0]);
-            
-            // Restore the position of each group now that it has been stored to inventory.
-            foreach (SceneObjectGroup objectGroup in objlist)
-                objectGroup.AbsolutePosition = originalPositions[objectGroup.UUID];
-            InventoryItemBase item = CreateItemForObject(action, remoteClient, objlist[0], folderID);
+                xmlStrings[objectGroup.UUID] = sceneObjectXml;
-            if (item == null)
-                return UUID.Zero;
-                            
-            // Can't know creator is the same, so null it in inventory
-            if (objlist.Count > 1)
-            {
-                item.CreatorId = UUID.Zero.ToString();
-                item.Flags = (uint)InventoryItemFlags.ObjectHasMultipleItems;
            }
-            else
-            {
-                item.CreatorId = objlist[0].RootPart.CreatorID.ToString();                
-                item.SaleType = objlist[0].RootPart.ObjectSaleType;
-                item.SalePrice = objlist[0].RootPart.SalePrice;                    
-            }              
-            AssetBase asset = CreateAsset(
+            string itemXml;
-                objlist[0].GetPartName(objlist[0].RootPart.LocalId),
-                objlist[0].GetPartDescription(objlist[0].RootPart.LocalId),
-                (sbyte)AssetType.Object,
-                Utils.StringToBytes(itemXml),
-                objlist[0].OwnerID.ToString());
-            m_Scene.AssetService.Store(asset);
-            
-            item.AssetID = asset.FullID;  
-            assetID = asset.FullID;                              
-            if (DeRezAction.SaveToExistingUserInventoryItem == action)
+            if (objlist.Count > 1)
-            {
-                m_Scene.InventoryService.UpdateItem(item);
-            }
-            else
            {
-                AddPermissions(item, objlist[0], objlist, remoteClient);
+                float minX, minY, minZ;
+                float maxX, maxY, maxZ;
-                item.CreationDate = Util.UnixTimeSinceEpoch();
+                Vector3[] offsets = Scene.GetCombinedBoundingBox(objlist,
-                item.Description = asset.Description;
+                        out minX, out maxX, out minY, out maxY,
-                item.Name = asset.Name;
+                        out minZ, out maxZ);
-                item.AssetType = asset.Type;
-                m_Scene.AddInventoryItem(item);
+                // CreateWrapper
+                XmlDocument itemDoc = new XmlDocument();
+                XmlElement root = itemDoc.CreateElement("", "CoalescedObject", "");
+                itemDoc.AppendChild(root);
-                if (remoteClient != null && item.Owner == remoteClient.AgentId)
+                // Embed the offsets into the group XML
-                {
+                for ( int i = 0 ; i < objlist.Count ; i++ )
-                    remoteClient.SendInventoryItemCreateUpdate(item, 0);
-                }
-                else
                {
-                    ScenePresence notifyUser = m_Scene.GetScenePresence(item.Owner);
+                    XmlDocument doc = new XmlDocument();
-                    if (notifyUser != null)
+                    SceneObjectGroup g = objlist[i];
-                    {
+                    doc.LoadXml(xmlStrings[g.UUID]);
-                        notifyUser.ControllingClient.SendInventoryItemCreateUpdate(item, 0);
+                    XmlElement e = (XmlElement)doc.SelectSingleNode("/SceneObjectGroup");
-                    }
+                    e.SetAttribute("offsetx", offsets[i].X.ToString());
+                    e.SetAttribute("offsety", offsets[i].Y.ToString());
+                    e.SetAttribute("offsetz", offsets[i].Z.ToString());
+                    XmlNode objectNode = itemDoc.ImportNode(e, true);
+                    root.AppendChild(objectNode);
                }
-            }
-            // This is a hook to do some per-asset post-processing for subclasses that need that
-            if (remoteClient != null)
-                ExportAsset(remoteClient.AgentId, assetID);
-            
-            return assetID;
-        }
-        protected virtual void ExportAsset(UUID agentID, UUID assetID)
+                float sizeX = maxX - minX;
-        {
+                float sizeY = maxY - minY;
-            // nothing to do here
+                float sizeZ = maxZ - minZ;
-        }
-        /// <summary>
+                root.SetAttribute("x", sizeX.ToString());
-        /// Add relevant permissions for an object to the item.
+                root.SetAttribute("y", sizeY.ToString());
-        /// </summary>
+                root.SetAttribute("z", sizeZ.ToString());
-        /// <param name="item"></param>
-        /// <param name="so"></param>
-        /// <param name="objsForEffectivePermissions"></param>
-        /// <param name="remoteClient"></param>
-        /// <returns></returns>
-        protected InventoryItemBase AddPermissions(
-            InventoryItemBase item, SceneObjectGroup so, List<SceneObjectGroup> objsForEffectivePermissions, 
-            IClientAPI remoteClient)
-        {
-            uint effectivePerms = (uint)(PermissionMask.Copy | PermissionMask.Transfer | PermissionMask.Modify | PermissionMask.Move) | 7;
-            foreach (SceneObjectGroup grp in objsForEffectivePermissions)
-                effectivePerms &= grp.GetEffectivePermissions();
-            effectivePerms |= (uint)PermissionMask.Move;
-            if (remoteClient != null && (remoteClient.AgentId != so.RootPart.OwnerID) && m_Scene.Permissions.PropagatePermissions())
+                itemXml = itemDoc.InnerXml;
-            {
-                uint perms = effectivePerms;
-                uint nextPerms = (perms & 7) << 13;
-                if ((nextPerms & (uint)PermissionMask.Copy) == 0)
-                    perms &= ~(uint)PermissionMask.Copy;
-                if ((nextPerms & (uint)PermissionMask.Transfer) == 0)
-                    perms &= ~(uint)PermissionMask.Transfer;
-                if ((nextPerms & (uint)PermissionMask.Modify) == 0)
-                    perms &= ~(uint)PermissionMask.Modify;
-                item.BasePermissions = perms & so.RootPart.NextOwnerMask;
-                item.CurrentPermissions = item.BasePermissions;
-                item.NextPermissions = perms & so.RootPart.NextOwnerMask;
-                item.EveryOnePermissions = so.RootPart.EveryoneMask & so.RootPart.NextOwnerMask;
-                item.GroupPermissions = so.RootPart.GroupMask & so.RootPart.NextOwnerMask;
-                
-                // Magic number badness. Maybe this deserves an enum.
-                // bit 4 (16) is the "Slam" bit, it means treat as passed
-                // and apply next owner perms on rez
-                item.CurrentPermissions |= 16; // Slam!
            }
            else
            {
-                item.BasePermissions = effectivePerms;
+                itemXml = xmlStrings[objlist[0].UUID];
-                item.CurrentPermissions = effectivePerms;
+            }
-                item.NextPermissions = so.RootPart.NextOwnerMask & effectivePerms;
-                item.EveryOnePermissions = so.RootPart.EveryoneMask & effectivePerms;
-                item.GroupPermissions = so.RootPart.GroupMask & effectivePerms;
-                item.CurrentPermissions &=
-                        ((uint)PermissionMask.Copy |
-                         (uint)PermissionMask.Transfer |
-                         (uint)PermissionMask.Modify |
-                         (uint)PermissionMask.Move |
-                         7); // Preserve folded permissions
-            }    
-            
-            return item;
-        }
-        
-        /// <summary>
-        /// Create an item using details for the given scene object.
-        /// </summary>
-        /// <param name="action"></param>
-        /// <param name="remoteClient"></param>
-        /// <param name="so"></param>
-        /// <param name="folderID"></param>
-        /// <returns></returns>
-        protected InventoryItemBase CreateItemForObject(
-            DeRezAction action, IClientAPI remoteClient, SceneObjectGroup so, UUID folderID)
-        {
            // Get the user info of the item destination
            //
            UUID userID = UUID.Zero;
@@ -462,7 +371,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                // Saving changes requires a local user
                //
                if (remoteClient == null)
-                    return null;
+                    return UUID.Zero;
                userID = remoteClient.AgentId;
            }
@@ -470,12 +379,13 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
            {
                // All returns / deletes go to the object owner
                //
-                userID = so.RootPart.OwnerID;
+                userID = objlist[0].RootPart.OwnerID;
            }
            if (userID == UUID.Zero) // Can't proceed
            {
-                return null;
+                return UUID.Zero;
            }
            // If we're returning someone's item, it goes back to the
@@ -483,13 +393,13 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
            // Delete is treated like return in this case
            // Deleting your own items makes them go to trash
            //
-            
            InventoryFolderBase folder = null;
            InventoryItemBase item = null;
            if (DeRezAction.SaveToExistingUserInventoryItem == action)
            {
-                item = new InventoryItemBase(so.RootPart.FromUserInventoryItemID, userID);
+                item = new InventoryItemBase(objlist[0].RootPart.FromUserInventoryItemID, userID);
                item = m_Scene.InventoryService.GetItem(item);
                //item = userInfo.RootFolder.FindItem(
@@ -499,9 +409,8 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                {
                    m_log.DebugFormat(
                        "[AGENT INVENTORY]: Object {0} {1} scheduled for save to inventory has already been deleted.",
-                        so.Name, so.UUID);
+                        objlist[0].Name, objlist[0].UUID);
-                    
+                    return UUID.Zero;
-                    return null;
                }
            }
            else
@@ -513,17 +422,19 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                    // Deleting someone else's item
                    //
                    if (remoteClient == null ||
-                        so.OwnerID != remoteClient.AgentId)
+                        objlist[0].OwnerID != remoteClient.AgentId)
                    {
                        folder = m_Scene.InventoryService.GetFolderForType(userID, AssetType.LostAndFoundFolder);
                    }
                    else
                    {
-                        folder = m_Scene.InventoryService.GetFolderForType(userID, AssetType.TrashFolder);
+                         folder = m_Scene.InventoryService.GetFolderForType(userID, AssetType.TrashFolder);
                    }
                }
                else if (action == DeRezAction.Return)
                {
                    // Dump to lost + found unconditionally
                    //
                    folder = m_Scene.InventoryService.GetFolderForType(userID, AssetType.LostAndFoundFolder);
@@ -539,7 +450,8 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                    }
                    else
                    {
-                        if (remoteClient == null || so.OwnerID != remoteClient.AgentId)
+                        if (remoteClient == null ||
+                            objlist[0].OwnerID != remoteClient.AgentId)
                        {
                            // Taking copy of another person's item. Take to
                            // Objects folder.
@@ -560,9 +472,9 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                //
                if (action == DeRezAction.Take || action == DeRezAction.TakeCopy)
                {
-                    if (so.RootPart.FromFolderID != UUID.Zero)
+                    if (objlist[0].RootPart.FromFolderID != UUID.Zero && objlist[0].OwnerID == remoteClient.AgentId)
                    {
-                        InventoryFolderBase f = new InventoryFolderBase(so.RootPart.FromFolderID, userID);
+                        InventoryFolderBase f = new InventoryFolderBase(objlist[0].RootPart.FromFolderID, userID);
                        folder = m_Scene.InventoryService.GetFolder(f);
                    }
                }
@@ -573,27 +485,133 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                    if (folder == null) // Nowhere to put it
                    {
-                        return null;
+                        return UUID.Zero;
                    }
                }
-                item = new InventoryItemBase();                
+                item = new InventoryItemBase();
+                // Can't know creator is the same, so null it in inventory
+                if (objlist.Count > 1)
+                {
+                    item.CreatorId = UUID.Zero.ToString();
+                    item.CreatorData = String.Empty;
+                }
+                else
+                {
+                    item.CreatorId = objlist[0].RootPart.CreatorID.ToString();
+                    item.CreatorData = objlist[0].RootPart.CreatorData;
+                }
                item.ID = UUID.Random();
                item.InvType = (int)InventoryType.Object;
                item.Folder = folder.ID;
                item.Owner = userID;
-            }   
+                if (objlist.Count > 1)
+                {
+                    item.Flags = (uint)InventoryItemFlags.ObjectHasMultipleItems;
+                }
+                else
+                {
+                    item.SaleType = objlist[0].RootPart.ObjectSaleType;
+                    item.SalePrice = objlist[0].RootPart.SalePrice;
+                }
+            }
+            AssetBase asset = CreateAsset(
+                objlist[0].GetPartName(objlist[0].RootPart.LocalId),
+                objlist[0].GetPartDescription(objlist[0].RootPart.LocalId),
+                (sbyte)AssetType.Object,
+                Utils.StringToBytes(itemXml),
+                objlist[0].OwnerID.ToString());
+            m_Scene.AssetService.Store(asset);
+            assetID = asset.FullID;
+            if (DeRezAction.SaveToExistingUserInventoryItem == action)
+            {
+                item.AssetID = asset.FullID;
+                m_Scene.InventoryService.UpdateItem(item);
+            }
+            else
+            {
+                item.AssetID = asset.FullID;
+                uint effectivePerms = (uint)(PermissionMask.Copy | PermissionMask.Transfer | PermissionMask.Modify | PermissionMask.Move) | 7;
+                foreach (SceneObjectGroup grp in objlist)
+                    effectivePerms &= grp.GetEffectivePermissions();
+                effectivePerms |= (uint)PermissionMask.Move;
+                if (remoteClient != null && (remoteClient.AgentId != objlist[0].RootPart.OwnerID) && m_Scene.Permissions.PropagatePermissions())
+                {
+                    uint perms = effectivePerms;
+                    uint nextPerms = (perms & 7) << 13;
+                    if ((nextPerms & (uint)PermissionMask.Copy) == 0)
+                        perms &= ~(uint)PermissionMask.Copy;
+                    if ((nextPerms & (uint)PermissionMask.Transfer) == 0)
+                        perms &= ~(uint)PermissionMask.Transfer;
+                    if ((nextPerms & (uint)PermissionMask.Modify) == 0)
+                        perms &= ~(uint)PermissionMask.Modify;
+                    item.BasePermissions = perms & objlist[0].RootPart.NextOwnerMask;
+                    item.CurrentPermissions = item.BasePermissions;
+                    item.NextPermissions = perms & objlist[0].RootPart.NextOwnerMask;
+                    item.EveryOnePermissions = objlist[0].RootPart.EveryoneMask & objlist[0].RootPart.NextOwnerMask;
+                    item.GroupPermissions = objlist[0].RootPart.GroupMask & objlist[0].RootPart.NextOwnerMask;
+                    
+                    item.Flags |= (uint)InventoryItemFlags.ObjectSlamPerm;
+                }
+                else
+                {
+                    item.BasePermissions = effectivePerms;
+                    item.CurrentPermissions = effectivePerms;
+                    item.NextPermissions = objlist[0].RootPart.NextOwnerMask & effectivePerms;
+                    item.EveryOnePermissions = objlist[0].RootPart.EveryoneMask & effectivePerms;
+                    item.GroupPermissions = objlist[0].RootPart.GroupMask & effectivePerms;
+                    item.CurrentPermissions &=
+                            ((uint)PermissionMask.Copy |
+                             (uint)PermissionMask.Transfer |
+                             (uint)PermissionMask.Modify |
+                             (uint)PermissionMask.Move |
+                             7); // Preserve folded permissions
+                }
+                item.CreationDate = Util.UnixTimeSinceEpoch();
+                item.Description = asset.Description;
+                item.Name = asset.Name;
+                item.AssetType = asset.Type;
+                m_Scene.AddInventoryItem(item);
+                if (remoteClient != null && item.Owner == remoteClient.AgentId)
+                {
+                    remoteClient.SendInventoryItemCreateUpdate(item, 0);
+                }
+                else
+                {
+                    ScenePresence notifyUser = m_Scene.GetScenePresence(item.Owner);
+                    if (notifyUser != null)
+                    {
+                        notifyUser.ControllingClient.SendInventoryItemCreateUpdate(item, 0);
+                    }
+                }
+            }
+            // This is a hook to do some per-asset post-processing for subclasses that need that
+            if (remoteClient != null)
+                ExportAsset(remoteClient.AgentId, assetID);
            
-            return item;
+            return assetID;
+        }
+        protected virtual void ExportAsset(UUID agentID, UUID assetID)
+        {
+            // nothing to do here
        }
        /// <summary>
        /// Rez an object into the scene from the user's inventory
        /// </summary>
-        /// <remarks>
        /// FIXME: It would be really nice if inventory access modules didn't also actually do the work of rezzing
        /// things to the scene.  The caller should be doing that, I think.
-        /// </remarks>
        /// <param name="remoteClient"></param>
        /// <param name="itemID"></param>
        /// <param name="RayEnd"></param>
@@ -610,10 +628,21 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                                    UUID RayTargetID, byte BypassRayCast, bool RayEndIsIntersection,
                                    bool RezSelected, bool RemoveItem, UUID fromTaskID, bool attachment)
        {
-//            m_log.DebugFormat("[INVENTORY ACCESS MODULE]: RezObject for {0}, item {1}", remoteClient.Name, itemID);
+            // Work out position details
-            
+            byte bRayEndIsIntersection = (byte)0;
-            byte bRayEndIsIntersection = (byte)(RayEndIsIntersection ? 1 : 0);
+            if (RayEndIsIntersection)
+            {
+                bRayEndIsIntersection = (byte)1;
+            }
+            else
+            {
+                bRayEndIsIntersection = (byte)0;
+            }
            Vector3 scale = new Vector3(0.5f, 0.5f, 0.5f);
            Vector3 pos = m_Scene.GetNewRezLocation(
                      RayStart, RayEnd, RayTargetID, Quaternion.Identity,
                      BypassRayCast, bRayEndIsIntersection, true, scale, false);
@@ -624,6 +653,10 @@ 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");
+                }
                item.Owner = remoteClient.AgentId;
                AssetBase rezAsset = m_Scene.AssetService.Get(item.AssetID.ToString());
@@ -652,6 +685,11 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                        }
                    }
+                    if (item.ID == UUID.Zero)
+                    {
+                        m_log.Debug("[InventoryAccessModule]: Inventory object has UUID.Zero! Position 2");
+                    }
                    string xmlData = Utils.BytesToString(rezAsset.Data);
                    List<SceneObjectGroup> objlist =
                            new List<SceneObjectGroup>();
@@ -697,18 +735,9 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                                    itemId, n.OuterXml);
                            objlist.Add(g);
                            XmlElement el = (XmlElement)n;
-                            
+                            float x = Convert.ToSingle(el.GetAttribute("offsetx"));
-                            string rawX = el.GetAttribute("offsetx");
+                            float y = Convert.ToSingle(el.GetAttribute("offsety"));
-                            string rawY = el.GetAttribute("offsety");
+                            float z = Convert.ToSingle(el.GetAttribute("offsetz"));
-                            string rawZ = el.GetAttribute("offsetz");
-//                        
-//                            m_log.DebugFormat(
-//                                "[INVENTORY ACCESS MODULE]: Converting coalesced object {0} offset <{1}, {2}, {3}>", 
-//                                g.Name, rawX, rawY, rawZ);
-                            
-                            float x = Convert.ToSingle(rawX);
-                            float y = Convert.ToSingle(rawY);
-                            float z = Convert.ToSingle(rawZ);
                            veclist.Add(new Vector3(x, y, z));
                        }
                    }
@@ -751,21 +780,27 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                            foreach (SceneObjectPart child in group.Parts)
                                child.CreateSelected = true;
                        }
                        group.ResetIDs();
                        if (attachment)
                        {
                            group.RootPart.Flags |= PrimFlags.Phantom;
                            group.RootPart.IsAttachment = true;
-                        }
-                        // If we're rezzing an attachment then don't ask
+                            // If we're rezzing an attachment then don't ask
-                        // AddNewSceneObject() to update the client since
+                            // AddNewSceneObject() to update the client since
-                        // we'll be doing that later on.  Scheduling more than
+                            // we'll be doing that later on.  Scheduling more
-                        // one full update during the attachment
+                            // than one full update during the attachment
-                        // process causes some clients to fail to display the
+                            // process causes some clients to fail to display
-                        // attachment properly.
+                            // the attachment properly.
-                        m_Scene.AddNewSceneObject(group, true, false);
+                            // Also, don't persist attachments.
+                            m_Scene.AddNewSceneObject(group, false, false);
+                        }
+                        else
+                        {
+                            m_Scene.AddNewSceneObject(group, true, false);
+                        }
                        // if attachment we set it's asset id so object updates
                        // can reflect that, if not, we set it's position in world.
@@ -800,19 +835,24 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                        // affect the name stored in the serialization, transfer
                        // the correct name from the inventory to the
                        // object itself before we rez.
-                        //
+                        // On coalesced objects, do the first one
-                        // Only do these for the first object if we are rezzing a coalescence.
+                        if (((item.Flags & (uint)InventoryItemFlags.ObjectHasMultipleItems) == 0) || i == 0)
-                        if (i == 0)
                        {
                            rootPart.Name = item.Name;
                            rootPart.Description = item.Description;
+                        }
+                        if ((item.Flags & (uint)InventoryItemFlags.ObjectSlamSale) != 0)
+                        {
                            rootPart.ObjectSaleType = item.SaleType;
                            rootPart.SalePrice = item.SalePrice;
                        }
                        group.SetGroup(remoteClient.ActiveGroupId, remoteClient);
+                        // TODO: Remove the magic number badness
                        if ((rootPart.OwnerID != item.Owner) ||
-                            (item.CurrentPermissions & 16) != 0)
+                            (item.CurrentPermissions & 16) != 0 || // Magic number
+                            (item.Flags & (uint)InventoryItemFlags.ObjectSlamPerm) != 0)
                        {
                            //Need to kill the for sale here
                            rootPart.ObjectSaleType = 0;
@@ -824,28 +864,34 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                                {
                                    if ((item.Flags & (uint)InventoryItemFlags.ObjectHasMultipleItems) == 0)
                                    {
-                                        part.EveryoneMask = item.EveryOnePermissions;
+                                        if ((item.Flags & (uint)InventoryItemFlags.ObjectOverwriteEveryone) != 0)
-                                        part.NextOwnerMask = item.NextPermissions;
+                                            part.EveryoneMask = item.EveryOnePermissions;
+                                        if ((item.Flags & (uint)InventoryItemFlags.ObjectOverwriteNextOwner) != 0)
+                                            part.NextOwnerMask = item.NextPermissions;
+                                        if ((item.Flags & (uint)InventoryItemFlags.ObjectOverwriteGroup) != 0)
+                                            part.GroupMask = item.GroupPermissions;
                                    }
-                                    part.GroupMask = 0; // DO NOT propagate here
                                }
                                
+                                foreach (SceneObjectPart part in group.Parts)
+                                {
+                                    part.LastOwnerID = part.OwnerID;
+                                    part.OwnerID = item.Owner;
+                                    part.Inventory.ChangeInventoryOwner(item.Owner);
+                                }
                                group.ApplyNextOwnerPermissions();
                            }
                        }
                        foreach (SceneObjectPart part in group.Parts)
                        {
-                            if ((part.OwnerID != item.Owner) ||
+                            if ((item.Flags & (uint)InventoryItemFlags.ObjectOverwriteEveryone) != 0)
-                                (item.CurrentPermissions & 16) != 0)
+                                part.EveryoneMask = item.EveryOnePermissions;
-                            {
+                            if ((item.Flags & (uint)InventoryItemFlags.ObjectOverwriteNextOwner) != 0)
-                                part.LastOwnerID = part.OwnerID;
+                                part.NextOwnerMask = item.NextPermissions;
-                                part.OwnerID = item.Owner;
+                            if ((item.Flags & (uint)InventoryItemFlags.ObjectOverwriteGroup) != 0)
-                                part.Inventory.ChangeInventoryOwner(item.Owner);
+                                part.GroupMask = item.GroupPermissions;
-                                part.GroupMask = 0; // DO NOT propagate here
-                            }
-                            part.EveryoneMask = item.EveryOnePermissions;
-                            part.NextOwnerMask = item.NextPermissions;
                        }
                        rootPart.TrimPermissions();
@@ -853,7 +899,13 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                        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();
+                            }
                            
                            // Fire on_rez
                            group.CreateScriptInstances(0, true, m_Scene.DefaultScriptEngine, 1);
diff --git a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
index 43672d1..5e28ee1 100644
--- a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
+++ b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
@@ -366,6 +366,10 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
            try
            {
                Request = (HttpWebRequest) WebRequest.Create(Url);
+                //This works around some buggy HTTP Servers like Lighttpd
+                Request.ServicePoint.Expect100Continue = false;
                Request.Method = HttpMethod;
                Request.ContentType = HttpMIMEType;
@@ -440,7 +444,17 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
                {
                    HttpWebResponse webRsp = (HttpWebResponse)((WebException)e).Response;
                    Status = (int)webRsp.StatusCode;
-                    ResponseBody = webRsp.StatusDescription;
+                    try
+                    {
+                        using (Stream responseStream = webRsp.GetResponseStream())
+                        {
+                            ResponseBody = responseStream.GetStreamString();
+                        }
+                    }
+                    catch
+                    {
+                        ResponseBody = webRsp.StatusDescription;
+                    }
                }
                else
                {
diff --git a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
index a552a28..fa17fb6 100644
--- a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
@@ -60,6 +60,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
        //public ManualResetEvent ev;
        public bool requestDone;
        public int startTime;
+        public bool responseSent;
        public string uri;
    }
@@ -76,7 +77,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
                new Dictionary<string, UrlData>();
-        private int m_TotalUrls = 100;
+        private int m_TotalUrls = 5000;
        private uint https_port = 0;
        private IHttpServer m_HttpServer = null;
@@ -155,7 +156,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;
@@ -165,10 +166,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,
@@ -246,10 +246,14 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
            if (m_RequestMap.ContainsKey(request))
            {
                UrlData urlData = m_RequestMap[request];
-                urlData.requests[request].responseCode = status;
+                if (!urlData.requests[request].responseSent)
-                urlData.requests[request].responseBody = body;
+                {
-                //urlData.requests[request].ev.Set();
+                    urlData.requests[request].responseCode = status;
-                urlData.requests[request].requestDone =true;
+                    urlData.requests[request].responseBody = body;
+                    //urlData.requests[request].ev.Set();
+                    urlData.requests[request].requestDone = true;
+                    urlData.requests[request].responseSent = true;
+                }
            }
            else
            {
@@ -432,6 +436,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
            return response;
        }
        public void HttpRequestHandler(UUID requestID, Hashtable request)
        {
            lock (request)
@@ -447,8 +452,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>/
+                    int pos3 = pos2 + 37; // /lslhttp/urlcode
-                    string uri_tmp = uri.Substring(0, pos3 + 1);
+                    string uri_tmp = uri.Substring(0, pos3);
                    //HTTP server code doesn't provide us with QueryStrings
                    string pathInfo;
                    string queryString;
@@ -490,7 +495,14 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
                                if (request.ContainsKey(key))
                                {
                                    string val = (String)request[key];
-                                    queryString = queryString + key + "=" + val + "&";
+                                    if (key != "")
+                                    {
+                                        queryString = queryString + key + "=" + val + "&";
+                                    }
+                                    else
+                                    {
+                                        queryString = queryString + val + "&";
+                                    }                                    
                                }
                            }
                            if (queryString.Length > 1)
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs
index 18db9fa..7128d2b 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs
@@ -56,9 +56,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_1", "DefaultRegion");
-            config.Configs["GridService"].Set("Region_Test_Region_2", "FallbackRegion");
+            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_3", "FallbackRegion");
            config.Configs["GridService"].Set("Region_Other_Region_4", "FallbackRegion");
            m_LocalConnector = new LocalGridServicesConnector(config);
@@ -127,8 +127,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, r2);
-            m_LocalConnector.RegisterRegion(UUID.Zero, r3);
+            m_LocalConnector.RegisterRegion(UUID.Zero, r3);
            m_LocalConnector.RegisterRegion(UUID.Zero, r4);
            result = m_LocalConnector.GetRegionByUUID(UUID.Zero, new UUID(1));
@@ -153,38 +153,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);
+            results = m_LocalConnector.GetDefaultRegions(UUID.Zero);
-            Assert.IsNotNull(results, "Retrieved GetDefaultRegions collection is null");
+            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.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");
+            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);
+            results = m_LocalConnector.GetFallbackRegions(UUID.Zero, r1.RegionLocX, r1.RegionLocY);
-            Assert.IsNotNull(results, "Retrieved GetFallbackRegions collection for region 1 is null");
+            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.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[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[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");
+            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);
+            results = m_LocalConnector.GetFallbackRegions(UUID.Zero, r2.RegionLocX, r2.RegionLocY);
-            Assert.IsNotNull(results, "Retrieved GetFallbackRegions collection for region 2 is null");
+            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.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[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[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");
+            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);
+            results = m_LocalConnector.GetFallbackRegions(UUID.Zero, r3.RegionLocX, r3.RegionLocY);
-            Assert.IsNotNull(results, "Retrieved GetFallbackRegions collection for region 3 is null");
+            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.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[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[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");
+            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);
+            results = m_LocalConnector.GetFallbackRegions(UUID.Zero, r4.RegionLocX, r4.RegionLocY);
-            Assert.IsNotNull(results, "Retrieved GetFallbackRegions collection for region 4 is null");
+            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.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[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[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");
+            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 2cf02b5..9714c36 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
@@ -272,7 +272,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
                if (s.RegionInfo.RegionID == destination.RegionID)
                    return s.QueryAccess(id, position, out reason);
            }
-            //m_log.Debug("[LOCAL COMMS]: region not found for QueryAccess");
            return false;
        }
@@ -302,10 +301,24 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
                if (s.RegionInfo.RegionID == destination.RegionID)
                {
                    //m_log.Debug("[LOCAL COMMS]: Found region to SendCloseAgent");
-                    // Let's spawn a threadlet right here, because this may take
+                    return s.IncomingCloseAgent(id);
-                    // a while
+                }
-                    Util.FireAndForget(delegate { s.IncomingCloseAgent(id); });
+            }
-                    return true;
+            //m_log.Debug("[LOCAL COMMS]: region not found in SendCloseAgent");
+            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");
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
index f8cea71..391b1a1 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
@@ -261,6 +261,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/LocalUserAccountServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/LocalUserAccountServiceConnector.cs
index 30ebb21..535a637 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/LocalUserAccountServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/LocalUserAccountServiceConnector.cs
@@ -120,6 +120,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts
                return;
            scene.RegisterModuleInterface<IUserAccountService>(m_UserService);
+            scene.RegisterModuleInterface<IUserAccountCacheModule>(m_Cache);
        }
        public void RemoveRegion(Scene scene)
@@ -172,6 +173,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts
            return m_UserService.GetUserAccount(scopeID, Email);
        }
+        public List<UserAccount> GetUserAccountsWhere(UUID scopeID, string query)
+        {
+            return null;
+        }
        public List<UserAccount> GetUserAccounts(UUID scopeID, string query)
        {
            return m_UserService.GetUserAccounts(scopeID, query);
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/RemoteUserAccountServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/RemoteUserAccountServiceConnector.cs
index 3321b38..f6b6aeb 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/RemoteUserAccountServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/RemoteUserAccountServiceConnector.cs
@@ -33,6 +33,7 @@ using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Services.Interfaces;
 using OpenSim.Services.Connectors;
+using OpenSim.Framework;
 using OpenMetaverse;
@@ -101,6 +102,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts
                return;
            scene.RegisterModuleInterface<IUserAccountService>(this);
+            scene.RegisterModuleInterface<IUserAccountCacheModule>(m_Cache);
+            scene.EventManager.OnNewClient += OnNewClient;
        }
        public void RemoveRegion(Scene scene)
@@ -115,6 +119,14 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts
                return;
        }
+        // When a user actually enters the sim, clear them from
+        // cache so the sim will have the current values for
+        // flags, title, etc. And country, don't forget country!
+        private void OnNewClient(IClientAPI client)
+        {
+            m_Cache.Remove(client.Name);
+        }
        #region Overwritten methods from IUserAccountService
        public override UserAccount GetUserAccount(UUID scopeID, UUID userID)
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/UserAccountCache.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/UserAccountCache.cs
index ddef75f..cbe2eaa 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/UserAccountCache.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/UserAccountCache.cs
@@ -34,7 +34,7 @@ using log4net;
 namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts
 {
-    public class UserAccountCache
+    public class UserAccountCache : IUserAccountCacheModule
    {
        private const double CACHE_EXPIRATION_SECONDS = 120000.0; // 33 hours!
@@ -92,5 +92,18 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts
            return null;
        }
+        public void Remove(string name)
+        {
+            if (!m_NameCache.Contains(name))
+                return;
+            UUID uuid = UUID.Zero;
+            if (m_NameCache.TryGetValue(name, out uuid))
+            {
+                m_NameCache.Remove(name);
+                m_UUIDCache.Remove(uuid);
+            }
+        }
    }
 }
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
index 82bef48..930a117 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
@@ -292,6 +292,23 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                    // being no copy/no mod for everyone
                    lock (part.TaskInventory)
                    {
+                        if (!ResolveUserUuid(part.CreatorID))
+                            part.CreatorID = m_scene.RegionInfo.EstateSettings.EstateOwner;
+    
+                        if (!ResolveUserUuid(part.OwnerID))
+                            part.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner;
+    
+                        if (!ResolveUserUuid(part.LastOwnerID))
+                            part.LastOwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner;
+    
+                        // And zap any troublesome sit target information
+                        part.SitTargetOrientation = new Quaternion(0, 0, 0, 1);
+                        part.SitTargetPosition    = new Vector3(0, 0, 0);
+    
+                        // Fix ownership/creator of inventory items
+                        // Not doing so results in inventory items
+                        // being no copy/no mod for everyone
+                        part.TaskInventory.LockItemsForRead(true);
                        TaskInventoryDictionary inv = part.TaskInventory;
                        foreach (KeyValuePair<UUID, TaskInventoryItem> kvp in inv)
                        {
@@ -307,6 +324,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                            if (UserManager != null)
                                UserManager.AddUser(kvp.Value.CreatorID, kvp.Value.CreatorData);
                        }
+                        part.TaskInventory.LockItemsForRead(false);
                    }
                }
diff --git a/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs
index b888698..5da1656 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs
@@ -249,18 +249,14 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                                                           
                    if (asset != null)
                    {
-                        if (m_options.ContainsKey("verbose"))
+//                        m_log.DebugFormat("[ARCHIVER]: Writing asset {0}", id);
-                            m_log.InfoFormat("[ARCHIVER]: Writing asset {0}", id);
                        m_foundAssetUuids.Add(asset.FullID);
                        m_assetsArchiver.WriteAsset(PostProcess(asset));
                    }
                    else
                    {
-                        if (m_options.ContainsKey("verbose"))
+//                        m_log.DebugFormat("[ARCHIVER]: Recording asset {0} as not found", id);
-                            m_log.InfoFormat("[ARCHIVER]: Recording asset {0} as not found", id);
                        m_notFoundAssetUuids.Add(new UUID(id));
                    }
        
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
index 3aed6ba..7d5f109 100644
--- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
@@ -30,6 +30,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Reflection;
 using System.Security;
+using System.Timers;
 using log4net;
 using Mono.Addins;
 using Nini.Config;
@@ -47,6 +48,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
        private delegate void LookupUUIDS(List<UUID> uuidLst);
+        private Timer m_regionChangeTimer = new Timer();
        public Scene Scene { get; private set; }
        public IUserManagement UserManager { get; private set; }
        
@@ -256,7 +258,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
                        timeInSeconds -= 15;
                }
-                restartModule.ScheduleRestart(UUID.Zero, "Region will restart in {0}", times.ToArray(), true);
+                restartModule.ScheduleRestart(UUID.Zero, "Region will restart in {0}", times.ToArray(), false);
            }
        }
@@ -463,7 +465,11 @@ namespace OpenSim.Region.CoreModules.World.Estate
                        {
                            if (!s.IsChildAgent)
                            {
-                                Scene.TeleportClientHome(user, s.ControllingClient);
+                                if (!Scene.TeleportClientHome(user, s.ControllingClient))
+                                {
+                                    s.ControllingClient.Kick("Your access to the region was revoked and TP home failed - you have been logged out.");
+                                    s.ControllingClient.Close();
+                                }
                            }
                        }
@@ -472,7 +478,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
                    {
                        remote_client.SendAlertMessage("User is already on the region ban list");
                    }
-                    //m_scene.RegionInfo.regionBanlist.Add(Manager(user);
+                    //Scene.RegionInfo.regionBanlist.Add(Manager(user);
                    remote_client.SendBannedUserList(invoice, Scene.RegionInfo.EstateSettings.EstateBans, Scene.RegionInfo.EstateSettings.EstateID);
                }
                else
@@ -527,7 +533,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
                        remote_client.SendAlertMessage("User is not on the region ban list");
                    }
                    
-                    //m_scene.RegionInfo.regionBanlist.Add(Manager(user);
+                    //Scene.RegionInfo.regionBanlist.Add(Manager(user);
                    remote_client.SendBannedUserList(invoice, Scene.RegionInfo.EstateSettings.EstateBans, Scene.RegionInfo.EstateSettings.EstateID);
                }
                else
@@ -648,7 +654,11 @@ namespace OpenSim.Region.CoreModules.World.Estate
                ScenePresence s = Scene.GetScenePresence(prey);
                if (s != null)
                {
-                    Scene.TeleportClientHome(prey, s.ControllingClient);
+                    if (!Scene.TeleportClientHome(prey, s.ControllingClient))
+                    {
+                        s.ControllingClient.Kick("You were teleported home by the region owner, but the TP failed - you have been logged out.");
+                        s.ControllingClient.Close();
+                    }
                }
            }
        }
@@ -667,7 +677,11 @@ namespace OpenSim.Region.CoreModules.World.Estate
                    // Also make sure they are actually in the region
                    if (p != null && !p.IsChildAgent)
                    {
-                        Scene.TeleportClientHome(p.UUID, p.ControllingClient);
+                        if (!Scene.TeleportClientHome(p.UUID, p.ControllingClient))
+                        {
+                            p.ControllingClient.Kick("You were teleported home by the region owner, but the TP failed - you have been logged out.");
+                            p.ControllingClient.Close();
+                        }
                    }
                }
            });
@@ -918,7 +932,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
            for (int i = 0; i < uuidarr.Length; i++)
            {
-                // string lookupname = m_scene.CommsManager.UUIDNameRequestString(uuidarr[i]);
+                // string lookupname = Scene.CommsManager.UUIDNameRequestString(uuidarr[i]);
                IUserManagement userManager = Scene.RequestModuleInterface<IUserManagement>();
                if (userManager != null)
@@ -1055,6 +1069,10 @@ namespace OpenSim.Region.CoreModules.World.Estate
        
        public void AddRegion(Scene scene)
        {
+            m_regionChangeTimer.AutoReset = false;
+            m_regionChangeTimer.Interval = 2000;
+            m_regionChangeTimer.Elapsed += RaiseRegionInfoChange;
            Scene = scene;
            Scene.RegisterModuleInterface<IEstateModule>(this);
            Scene.EventManager.OnNewClient += EventManager_OnNewClient;
@@ -1161,11 +1179,15 @@ namespace OpenSim.Region.CoreModules.World.Estate
                flags |= RegionFlags.Sandbox;
            if (Scene.RegionInfo.EstateSettings.AllowVoice)
                flags |= RegionFlags.AllowVoice;
+            if (Scene.RegionInfo.EstateSettings.AllowLandmark)
+                flags |= RegionFlags.AllowLandmark;
+            if (Scene.RegionInfo.EstateSettings.AllowSetHome)
+                flags |= RegionFlags.AllowSetHome;
+            if (Scene.RegionInfo.EstateSettings.BlockDwell)
+                flags |= RegionFlags.BlockDwell;
+            if (Scene.RegionInfo.EstateSettings.ResetHomeOnTeleport)
+                flags |= RegionFlags.ResetHomeOnTeleport;
-            // Fudge these to always on, so the menu options activate
-            //
-            flags |= RegionFlags.AllowLandmark;
-            flags |= RegionFlags.AllowSetHome;
            // TODO: SkipUpdateInterestList
@@ -1206,6 +1228,12 @@ namespace OpenSim.Region.CoreModules.World.Estate
                flags |= RegionFlags.ResetHomeOnTeleport;
            if (Scene.RegionInfo.EstateSettings.TaxFree)
                flags |= RegionFlags.TaxFree;
+            if (Scene.RegionInfo.EstateSettings.AllowLandmark)
+                flags |= RegionFlags.AllowLandmark;
+            if (Scene.RegionInfo.EstateSettings.AllowParcelChanges)
+                flags |= RegionFlags.AllowParcelChanges;
+            if (Scene.RegionInfo.EstateSettings.AllowSetHome)
+                flags |= RegionFlags.AllowSetHome;
            if (Scene.RegionInfo.EstateSettings.DenyMinors)
                flags |= (RegionFlags)(1 << 30);
@@ -1226,6 +1254,12 @@ namespace OpenSim.Region.CoreModules.World.Estate
        public 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 bfab7b8..f28faed 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
@@ -91,11 +91,11 @@ 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;
-        private Dictionary<UUID, Vector3> forcedPosition =
-                new Dictionary<UUID, Vector3>();
        #region INonSharedRegionModule Members
@@ -106,6 +106,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)
@@ -157,13 +163,6 @@ namespace OpenSim.Region.CoreModules.World.Land
            m_scene.UnregisterModuleCommander(m_commander.Name);            
        }
-//        private bool OnVerifyUserConnection(ScenePresence scenePresence, out string reason)
-//        {
-//            ILandObject nearestParcel = m_scene.GetNearestAllowedParcel(scenePresence.UUID, scenePresence.AbsolutePosition.X, scenePresence.AbsolutePosition.Y);
-//            reason = "You are not allowed to enter this sim.";
-//            return nearestParcel != null;
-//        }
-        
        /// <summary>
        /// Processes commandline input. Do not call directly.
        /// </summary>
@@ -215,36 +214,6 @@ namespace OpenSim.Region.CoreModules.World.Land
        void ClientOnPreAgentUpdate(IClientAPI remoteClient, AgentUpdateArgs agentData)
        {
-            //If we are forcing a position for them to go
-            if (forcedPosition.ContainsKey(remoteClient.AgentId))
-            {
-                ScenePresence clientAvatar = m_scene.GetScenePresence(remoteClient.AgentId);
-                //Putting the user into flying, both keeps the avatar in fligth when it bumps into something and stopped from going another direction AND
-                //When the avatar walks into a ban line on the ground, it prevents getting stuck
-                agentData.ControlFlags = (uint)AgentManager.ControlFlags.AGENT_CONTROL_FLY;
-                //Make sure we stop if they get about to the right place to prevent yoyo and prevents getting stuck on banlines
-                if (Vector3.Distance(clientAvatar.AbsolutePosition, forcedPosition[remoteClient.AgentId]) < .2)
-                {
-                    Debug.WriteLine(string.Format("Stopping force position because {0} is close enough to position {1}", forcedPosition[remoteClient.AgentId], clientAvatar.AbsolutePosition));
-                    forcedPosition.Remove(remoteClient.AgentId);
-                }
-                //if we are far away, teleport
-                else if (Vector3.Distance(clientAvatar.AbsolutePosition, forcedPosition[remoteClient.AgentId]) > 3)
-                {
-                    Debug.WriteLine(string.Format("Teleporting out because {0} is too far from avatar position {1}", forcedPosition[remoteClient.AgentId], clientAvatar.AbsolutePosition));
-                    clientAvatar.Teleport(forcedPosition[remoteClient.AgentId]);
-                    forcedPosition.Remove(remoteClient.AgentId);
-                }
-                else
-                {
-                    //Forces them toward the forced position we want if they aren't there yet
-                    agentData.UseClientAgentPosition = true;
-                    agentData.ClientAgentPosition = forcedPosition[remoteClient.AgentId];
-                }
-            }
        }
        public void Close()
@@ -363,10 +332,16 @@ namespace OpenSim.Region.CoreModules.World.Land
        private void ForceAvatarToPosition(ScenePresence avatar, Vector3? position)
        {
            if (m_scene.Permissions.IsGod(avatar.UUID)) return;
-            if (position.HasValue)
-            {
+            if (!position.HasValue)
-                forcedPosition[avatar.ControllingClient.AgentId] = (Vector3)position;
+                return;
-            }
+            bool isFlying = avatar.PhysicsActor.Flying;
+            avatar.RemoveFromPhysicalScene();
+            avatar.AbsolutePosition = (Vector3)position;
+            avatar.AddToPhysicalScene(isFlying);
        }
        public void SendYouAreRestrictedNotice(ScenePresence avatar)
@@ -386,29 +361,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                }
                if (parcelAvatarIsEntering != null)
-                {
+                    EnforceBans(parcelAvatarIsEntering, avatar);
-                    if (avatar.AbsolutePosition.Z < LandChannel.BAN_LINE_SAFETY_HIEGHT)
-                    {
-                        if (parcelAvatarIsEntering.IsBannedFromLand(avatar.UUID))
-                        {
-                            SendYouAreBannedNotice(avatar);
-                            ForceAvatarToPosition(avatar, m_scene.GetNearestAllowedPosition(avatar));
-                        }
-                        else if (parcelAvatarIsEntering.IsRestrictedFromLand(avatar.UUID))
-                        {
-                            SendYouAreRestrictedNotice(avatar);
-                            ForceAvatarToPosition(avatar, m_scene.GetNearestAllowedPosition(avatar));
-                        }
-                        else
-                        {
-                            avatar.sentMessageAboutRestrictedParcelFlyingDown = true;
-                        }
-                    }
-                    else
-                    {
-                        avatar.sentMessageAboutRestrictedParcelFlyingDown = true;
-                    }
-                }
            }
        }
@@ -480,43 +433,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                SendOutNearestBanLine(remote_client);
                ILandObject parcel = GetLandObject(clientAvatar.AbsolutePosition.X, clientAvatar.AbsolutePosition.Y);
                if (parcel != null)
-                {
+                    EnforceBans(parcel, clientAvatar);
-                    if (clientAvatar.AbsolutePosition.Z < LandChannel.BAN_LINE_SAFETY_HIEGHT &&
-                        clientAvatar.sentMessageAboutRestrictedParcelFlyingDown)
-                    {
-                        EventManagerOnAvatarEnteringNewParcel(clientAvatar, parcel.LandData.LocalID,
-                                                              m_scene.RegionInfo.RegionID);
-                        //They are going under the safety line!
-                        if (!parcel.IsBannedFromLand(clientAvatar.UUID))
-                        {
-                            clientAvatar.sentMessageAboutRestrictedParcelFlyingDown = false;
-                        }
-                    }
-                    else if (clientAvatar.AbsolutePosition.Z < LandChannel.BAN_LINE_SAFETY_HIEGHT &&
-                             parcel.IsBannedFromLand(clientAvatar.UUID))
-                    {
-                        //once we've sent the message once, keep going toward the target until we are done
-                        if (forcedPosition.ContainsKey(clientAvatar.ControllingClient.AgentId))
-                        {
-                            SendYouAreBannedNotice(clientAvatar);
-                            ForceAvatarToPosition(clientAvatar, m_scene.GetNearestAllowedPosition(clientAvatar));
-                        }
-                    }
-                    else if (parcel.IsRestrictedFromLand(clientAvatar.UUID))
-                    {
-                        //once we've sent the message once, keep going toward the target until we are done
-                        if (forcedPosition.ContainsKey(clientAvatar.ControllingClient.AgentId))
-                        {
-                            SendYouAreRestrictedNotice(clientAvatar);
-                            ForceAvatarToPosition(clientAvatar, m_scene.GetNearestAllowedPosition(clientAvatar));
-                        }
-                    }
-                    else
-                    {
-                        //when we are finally in a safe place, lets release the forced position lock
-                        forcedPosition.Remove(clientAvatar.ControllingClient.AgentId);
-                    }
-                }
            }
        }
@@ -722,7 +639,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
@@ -772,14 +689,13 @@ namespace OpenSim.Region.CoreModules.World.Land
            {
                try
                {
-                    return m_landList[m_landIDList[x / 4, y / 4]];
+                    //if (m_landList.ContainsKey(m_landIDList[x / 4, y / 4]))
+                        return m_landList[m_landIDList[x / 4, y / 4]];
+                    //else
+                    //    return null;
                }
                catch (IndexOutOfRangeException)
                {
-//                    m_log.WarnFormat(
-//                        "[LAND MANAGEMENT MODULE]: Tried to retrieve land object from out of bounds co-ordinate ({0},{1}) in {2}", 
-//                        x, y, m_scene.RegionInfo.RegionName);
-                    
                    return null;
                }
            }
@@ -1062,6 +978,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))
@@ -1362,18 +1282,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)
@@ -1648,6 +1581,322 @@ 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.UserLevel != 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.UserLevel == 0)
+            {
+                ILandObject land = ((Scene)client.Scene).LandChannel.GetLandObject(targetAvatar.AbsolutePosition.X, targetAvatar.AbsolutePosition.Y);
+                if (!((Scene)client.Scene).Permissions.CanEditParcelProperties(client.AgentId, land, GroupPowers.LandEjectAndFreeze))
+                    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.UserLevel == 0)
+                {
+                    ILandObject land = ((Scene)client.Scene).LandChannel.GetLandObject(targetAvatar.AbsolutePosition.X, targetAvatar.AbsolutePosition.Y);
+                    if (!((Scene)client.Scene).Permissions.CanEditParcelProperties(client.AgentId, land, GroupPowers.LandEjectAndFreeze))
+                        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.UserLevel == 0)
+                {
+                    ILandObject land = ((Scene)client.Scene).LandChannel.GetLandObject(targetAvatar.AbsolutePosition.X, targetAvatar.AbsolutePosition.Y);
+                    if (!((Scene)client.Scene).Permissions.CanEditParcelProperties(client.AgentId, land, GroupPowers.LandEjectAndFreeze))
+                        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;
+                        }
+                    }
+                }
+            }
+        }
        
        protected void InstallInterfaces()
        {
@@ -1710,5 +1959,27 @@ namespace OpenSim.Region.CoreModules.World.Land
            
            MainConsole.Instance.Output(report.ToString());
        }         
+        public void EnforceBans(ILandObject land, ScenePresence avatar)
+        {
+            if (avatar.AbsolutePosition.Z > LandChannel.BAN_LINE_SAFETY_HIEGHT)
+                return;
+            if (land.IsEitherBannedOrRestricted(avatar.UUID))
+            {
+                if (land.ContainsPoint(Convert.ToInt32(avatar.lastKnownAllowedPosition.X), Convert.ToInt32(avatar.lastKnownAllowedPosition.Y)))
+                {
+                    Vector3? pos = m_scene.GetNearestAllowedPosition(avatar);
+                    if (pos == null)
+                        m_scene.TeleportClientHome(avatar.UUID, avatar.ControllingClient);
+                    else
+                        ForceAvatarToPosition(avatar, (Vector3)pos);
+                }
+                else
+                {
+                    ForceAvatarToPosition(avatar, avatar.lastKnownAllowedPosition);
+                }
+            }
+        }
    }
-}
-\ No newline at end of file
+}
diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
index c2f104e..0fbc93c 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
@@ -415,11 +415,45 @@ namespace OpenSim.Region.CoreModules.World.Land
            return false;
        }
+        public bool HasGroupAccess(UUID avatar)
+        {
+            if (LandData.GroupID != UUID.Zero && (LandData.Flags & (uint)ParcelFlags.UseAccessGroup) == (uint)ParcelFlags.UseAccessGroup)
+            {
+                ScenePresence sp;
+                if (!m_scene.TryGetScenePresence(avatar, out sp))
+                {
+                    IGroupsModule groupsModule = m_scene.RequestModuleInterface<IGroupsModule>();
+                    if (groupsModule == null)
+                        return false;
+                    GroupMembershipData[] membership = groupsModule.GetMembershipData(avatar);
+                    if (membership == null || membership.Length == 0)
+                        return false;
+                    foreach (GroupMembershipData d in membership)
+                    {
+                        if (d.GroupID == LandData.GroupID)
+                            return true;
+                    }
+                    return false;
+                }
+                if (!sp.ControllingClient.IsGroupMember(LandData.GroupID))
+                    return false;
+                
+                return true;
+            }
+            return false;
+        }
        public bool IsBannedFromLand(UUID avatar)
        {
            if (m_scene.Permissions.IsAdministrator(avatar))
                return false;
+            if (m_scene.RegionInfo.EstateSettings.IsEstateManager(avatar))
+                return false;
            if ((LandData.Flags & (uint) ParcelFlags.UseBanList) > 0)
            {
                if (LandData.ParcelAccessList.FindIndex(
@@ -441,6 +475,9 @@ namespace OpenSim.Region.CoreModules.World.Land
            if (m_scene.Permissions.IsAdministrator(avatar))
                return false;
+            if (m_scene.RegionInfo.EstateSettings.IsEstateManager(avatar))
+                return false;
            if ((LandData.Flags & (uint) ParcelFlags.UseAccessList) > 0)
            {
                if (LandData.ParcelAccessList.FindIndex(
@@ -451,9 +488,13 @@ namespace OpenSim.Region.CoreModules.World.Land
                            return false;
                        }) == -1 && LandData.OwnerID != avatar)
                {
-                    return true;
+                    if (!HasGroupAccess(avatar))
+                    {
+                        return true;
+                    }
                }
            }
            return false;
        }
diff --git a/OpenSim/Region/CoreModules/World/Land/PrimCountModule.cs b/OpenSim/Region/CoreModules/World/Land/PrimCountModule.cs
index dca842a..f466194 100644
--- a/OpenSim/Region/CoreModules/World/Land/PrimCountModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/PrimCountModule.cs
@@ -206,7 +206,7 @@ namespace OpenSim.Region.CoreModules.World.Land
            if (m_ParcelCounts.TryGetValue(landData.GlobalID, out parcelCounts))
            {
                UUID landOwner = landData.OwnerID;
-                int partCount = obj.Parts.Length;
+                int partCount = obj.GetPartCount();
                m_SimwideCounts[landOwner] += partCount;
                if (parcelCounts.Users.ContainsKey(obj.OwnerID))
@@ -593,4 +593,4 @@ namespace OpenSim.Region.CoreModules.World.Land
            }
        }
    }
-}
-\ No newline at end of file
+}
diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
index 170c35f..a098ff6 100644
--- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
+++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
@@ -362,7 +362,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/Region/RestartModule.cs b/OpenSim/Region/CoreModules/World/Region/RestartModule.cs
index e983239..c2934cd 100644
--- a/OpenSim/Region/CoreModules/World/Region/RestartModule.cs
+++ b/OpenSim/Region/CoreModules/World/Region/RestartModule.cs
@@ -28,6 +28,8 @@
 using System;
 using System.Reflection;
 using System.Timers;
+using System.IO;
+using System.Diagnostics;
 using System.Threading;
 using System.Collections.Generic;
 using log4net;
@@ -56,13 +58,23 @@ namespace OpenSim.Region.CoreModules.World.Region
        protected UUID m_Initiator;
        protected bool m_Notice = false;
        protected IDialogModule m_DialogModule = null;
+        protected string m_MarkerPath = String.Empty;
        public void Initialise(IConfigSource config)
        {
+            IConfig restartConfig = config.Configs["RestartModule"];
+            if (restartConfig != null)
+            {
+                m_MarkerPath = restartConfig.GetString("MarkerPath", String.Empty);
+            }
        }
        public void AddRegion(Scene scene)
        {
+            if (m_MarkerPath != String.Empty)
+                File.Delete(Path.Combine(m_MarkerPath,
+                        scene.RegionInfo.RegionID.ToString()));
            m_Scene = scene;
            
            scene.RegisterModuleInterface<IRestartModule>(this);
@@ -121,6 +133,7 @@ namespace OpenSim.Region.CoreModules.World.Region
            if (alerts == null)
            {
+                CreateMarkerFile();
                m_Scene.RestartNow();
                return;
            }
@@ -134,6 +147,7 @@ namespace OpenSim.Region.CoreModules.World.Region
            if (m_Alerts[0] == 0)
            {
+                CreateMarkerFile();
                m_Scene.RestartNow();
                return;
            }
@@ -147,6 +161,7 @@ namespace OpenSim.Region.CoreModules.World.Region
        {
            if (m_Alerts.Count == 0 || m_Alerts[0] == 0)
            {
+                CreateMarkerFile();
                m_Scene.RestartNow();
                return 0;
            }
@@ -266,5 +281,25 @@ namespace OpenSim.Region.CoreModules.World.Region
            ScheduleRestart(UUID.Zero, args[3], times.ToArray(), notice);
        }
+        protected void CreateMarkerFile()
+        {
+            if (m_MarkerPath == String.Empty)
+                return;
+            string path = Path.Combine(m_MarkerPath, m_Scene.RegionInfo.RegionID.ToString());
+            try
+            {
+                string pidstring = System.Diagnostics.Process.GetCurrentProcess().Id.ToString();
+                FileStream fs = File.Create(path);
+                System.Text.ASCIIEncoding enc = new System.Text.ASCIIEncoding();
+                Byte[] buf = enc.GetBytes(pidstring);
+                fs.Write(buf, 0, buf.Length);
+                fs.Close();
+            }
+            catch (Exception)
+            {
+            }
+        }
    }
 }
diff --git a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
index 9c7b2fa..2da6458 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
@@ -584,6 +584,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);
            }
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
index 00959b0..56c59bd 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
@@ -86,9 +86,9 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
        private void OnMapNameRequest(IClientAPI remoteClient, string mapName, uint flags)
        {
-            if (mapName.Length < 3)
+            if (mapName.Length < 2)
            {
-                remoteClient.SendAlertMessage("Use a search string with at least 3 characters");
+                remoteClient.SendAlertMessage("Use a search string with at least 2 characters");
                return;
            }
            
@@ -106,7 +106,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
            else if (regionInfos.Count == 0 && mapName.StartsWith("http://"))
                remoteClient.SendAlertMessage("Hyperlink could not be established.");
-            m_log.DebugFormat("[MAPSEARCHMODULE]: search {0} returned {1} regions. Flags={2}", mapName, regionInfos.Count, flags);
+            //m_log.DebugFormat("[MAPSEARCHMODULE]: search {0} returned {1} regions", mapName, regionInfos.Count);
            List<MapBlockData> blocks = new List<MapBlockData>();
            MapBlockData data;
@@ -135,7 +135,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
            data.Agents = 0;
            data.Access = 255;
            data.MapImageId = UUID.Zero;
-            data.Name = ""; // mapName;
+            data.Name = mapName;
            data.RegionFlags = 0;
            data.WaterHeight = 0; // not used
            data.X = 0;
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
index 0cacf2d..cd40c5d 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
@@ -1057,7 +1057,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
            }
            else
            {
-                OSDArray responsearr = new OSDArray(m_scene.GetRootAgentCount());
+                OSDArray responsearr = new OSDArray(); // Don't preallocate. MT (m_scene.GetRootAgentCount());
                m_scene.ForEachScenePresence(delegate(ScenePresence sp)
                {
                    OSDMap responsemapdata = new OSDMap();