86 files changed, 4622 insertions, 2843 deletions

diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
index f56d17d..1a19585 100644
--- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
+++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
@@ -152,7 +152,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
             }
         }
 
-        public void RequestCreateInventoryItem(IClientAPI remoteClient,
+        public bool RequestCreateInventoryItem(IClientAPI remoteClient,
                 UUID transactionID, UUID folderID, uint callbackID,
                 string description, string name, sbyte invType,
                sbyte type, byte wearableType, uint nextOwnerMask)
@@ -162,6 +162,8 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
             uploader.RequestCreateInventoryItem(
                 remoteClient, folderID, callbackID,
                 description, name, invType, type, wearableType, nextOwnerMask);
+
+            return true;
         }
 
         public void RequestUpdateTaskInventoryItem(IClientAPI remoteClient,
@@ -170,6 +172,17 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
         {
             AssetXferUploader uploader = RequestXferUploader(transactionID);
 
+            // Here we need to get the old asset to extract the
+            // texture UUIDs if it's a wearable.
+            if (item.Type == (int)AssetType.Bodypart ||
+                item.Type == (int)AssetType.Clothing ||
+                item.Type == (int)CustomAssetType.AnimationSet)
+            {
+                AssetBase oldAsset = m_Scene.AssetService.Get(item.AssetID.ToString());
+                if (oldAsset != null)
+                    uploader.SetOldData(oldAsset.Data);
+            }
+
             uploader.RequestUpdateTaskInventoryItem(remoteClient, item);
         }
 
@@ -178,7 +191,18 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
         {
             AssetXferUploader uploader = RequestXferUploader(transactionID);
 
+            // 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 ||
+                item.AssetType == (int)CustomAssetType.AnimationSet)
+            {
+                AssetBase oldAsset = m_Scene.AssetService.Get(item.AssetID.ToString());
+                if (oldAsset != null)
+                    uploader.SetOldData(oldAsset.Data);
+            }
+
             uploader.RequestUpdateInventoryItem(remoteClient, item);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs
index b67c0df..f489262 100644
--- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs
+++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs
@@ -158,7 +158,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
         /// <param name="type"></param>
         /// <param name="wearableType"></param>
         /// <param name="nextOwnerMask"></param>
-        public void HandleItemCreationFromTransaction(IClientAPI remoteClient,
+        public bool HandleItemCreationFromTransaction(IClientAPI remoteClient,
                 UUID transactionID, UUID folderID, uint callbackID,
                 string description, string name, sbyte invType,
                 sbyte type, byte wearableType, uint nextOwnerMask)
@@ -169,7 +169,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
             AgentAssetTransactions transactions =
                     GetUserTransactions(remoteClient.AgentId);
 
-            transactions.RequestCreateInventoryItem(remoteClient, transactionID,
+            return transactions.RequestCreateInventoryItem(remoteClient, transactionID,
                     folderID, callbackID, description, name, invType, type,
                     wearableType, nextOwnerMask);
         }
diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
index 49a96f4..fdff199 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;
@@ -40,6 +41,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);
 
         /// <summary>
@@ -87,6 +95,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
 
         private sbyte type = 0;
         private byte wearableType = 0;
+        private byte[] m_oldData = null;
         public ulong XferID;
         private Scene m_Scene;
 
@@ -129,18 +138,27 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
 
             if (XferID == xferID)
             {
-                if (m_asset.Data.Length > 1)
+                lock (this)
                 {
-                    byte[] destinationArray = new byte[m_asset.Data.Length + data.Length];
-                    Array.Copy(m_asset.Data, 0, destinationArray, 0, m_asset.Data.Length);
-                    Array.Copy(data, 0, destinationArray, m_asset.Data.Length, data.Length);
-                    m_asset.Data = destinationArray;
-                }
-                else
-                {
-                    byte[] buffer2 = new byte[data.Length - 4];
-                    Array.Copy(data, 4, buffer2, 0, data.Length - 4);
-                    m_asset.Data = buffer2;
+                    int assetLength = m_asset.Data.Length;
+                    int dataLength = data.Length;
+
+                    if (m_asset.Data.Length > 1)
+                    {
+                        byte[] destinationArray = new byte[assetLength + dataLength];
+                        Array.Copy(m_asset.Data, 0, destinationArray, 0, assetLength);
+                        Array.Copy(data, 0, destinationArray, assetLength, dataLength);
+                        m_asset.Data = destinationArray;
+                    }
+                    else
+                    {
+                        if (dataLength > 4)
+                        {
+                            byte[] buffer2 = new byte[dataLength - 4];
+                            Array.Copy(data, 4, buffer2, 0, dataLength - 4);
+                            m_asset.Data = buffer2;
+                        }
+                    }
                 }
 
                 ourClient.SendConfirmXfer(xferID, packetID);
@@ -244,10 +262,10 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
                 {
                     CompleteTaskItemUpdate(m_updateTaskItemData);
                 }
-//                else if (m_storeLocal)
-//                {
-//                    m_Scene.AssetService.Store(m_asset);
-//                }
+                else if (m_asset.Local)
+                {
+                    m_Scene.AssetService.Store(m_asset);
+                }
             }
 
             m_log.DebugFormat(
@@ -374,7 +392,13 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
 //                "[ASSET XFER UPLOADER]: Storing asset {0} for earlier item update for {1} for {2}",
 //                m_asset.FullID, item.Name, ourClient.Name);
 
+            ValidateAssets();
             m_Scene.AssetService.Store(m_asset);
+            if (m_asset.FullID != UUID.Zero)
+            {
+                item.AssetID = m_asset.FullID;
+                m_Scene.InventoryService.UpdateItem(item);
+            }
 
             m_transactions.RemoveXferUploader(m_transactionID);
 
@@ -391,6 +415,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
 //                "[ASSET XFER UPLOADER]: Storing asset {0} for earlier task item update for {1} for {2}",
 //                m_asset.FullID, taskItem.Name, ourClient.Name);
 
+            ValidateAssets();
             m_Scene.AssetService.Store(m_asset);
 
             m_transactions.RemoveXferUploader(m_transactionID);
@@ -398,6 +423,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
 
         private void CompleteCreateItem(uint callbackID)
         {
+            ValidateAssets();
             m_Scene.AssetService.Store(m_asset);
 
             InventoryItemBase item = new InventoryItemBase();
@@ -418,6 +444,9 @@ 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
@@ -426,5 +455,148 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
             m_transactions.RemoveXferUploader(m_transactionID);
         }
 
+
+        private void ValidateAssets()
+        {
+            if (m_asset.Type == (sbyte)CustomAssetType.AnimationSet)
+            {
+                AnimationSet animSet = new AnimationSet(m_asset.Data);
+
+                bool allOk = animSet.Validate(x => {
+                    int perms = m_Scene.InventoryService.GetAssetPermissions(ourClient.AgentId, x);
+                    int required = (int)(PermissionMask.Transfer | PermissionMask.Copy);
+                    if ((perms & required) != required)
+                        return false;
+                    return true;
+                    });
+
+                if (!allOk)
+                    m_asset.Data = animSet.ToBytes();
+            }
+
+            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>
+        /// <returns>null if the asset has not finished uploading</returns>
+        public AssetBase GetAssetData()
+        {
+            if (m_uploadState == UploadState.Complete)
+            {
+                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;
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/CoreModules/Agent/Xfer/XferModule.cs b/OpenSim/Region/CoreModules/Agent/Xfer/XferModule.cs
index 4299726..7113f4f 100644
--- a/OpenSim/Region/CoreModules/Agent/Xfer/XferModule.cs
+++ b/OpenSim/Region/CoreModules/Agent/Xfer/XferModule.cs
@@ -160,6 +160,8 @@ namespace OpenSim.Region.CoreModules.Agent.Xfer
                     {
                         byte[] fileData = NewFiles[fileName].Data;
                         XferDownLoad transaction = new XferDownLoad(fileName, fileData, xferID, remoteClient);
+                        if (fileName.StartsWith("inventory_"))
+                            transaction.isTaskInventory = true;
 
                         Transfers.Add(xferID, transaction);
 
@@ -243,6 +245,7 @@ namespace OpenSim.Region.CoreModules.Agent.Xfer
             public uint Packet = 0;
             public uint Serial = 1;
             public ulong XferID = 0;
+            public bool isTaskInventory = false;
 
             public XferDownLoad(string fileName, byte[] data, ulong xferID, IClientAPI client)
             {
@@ -268,7 +271,7 @@ namespace OpenSim.Region.CoreModules.Agent.Xfer
                     byte[] transferData = new byte[Data.Length + 4];
                     Array.Copy(Utils.IntToBytes(Data.Length), 0, transferData, 0, 4);
                     Array.Copy(Data, 0, transferData, 4, Data.Length);
-                    Client.SendXferPacket(XferID, 0 + 0x80000000, transferData);
+                    Client.SendXferPacket(XferID, 0 + 0x80000000, transferData, isTaskInventory);
                     complete = true;
                 }
                 else
@@ -276,7 +279,7 @@ namespace OpenSim.Region.CoreModules.Agent.Xfer
                     byte[] transferData = new byte[1000 + 4];
                     Array.Copy(Utils.IntToBytes(Data.Length), 0, transferData, 0, 4);
                     Array.Copy(Data, 0, transferData, 4, 1000);
-                    Client.SendXferPacket(XferID, 0, transferData);
+                    Client.SendXferPacket(XferID, 0, transferData, isTaskInventory);
                     Packet++;
                     DataPointer = 1000;
                 }
@@ -297,7 +300,7 @@ namespace OpenSim.Region.CoreModules.Agent.Xfer
                     {
                         byte[] transferData = new byte[1000];
                         Array.Copy(Data, DataPointer, transferData, 0, 1000);
-                        Client.SendXferPacket(XferID, Packet, transferData);
+                        Client.SendXferPacket(XferID, Packet, transferData, isTaskInventory);
                         Packet++;
                         DataPointer += 1000;
                     }
@@ -306,7 +309,7 @@ namespace OpenSim.Region.CoreModules.Agent.Xfer
                         byte[] transferData = new byte[Data.Length - DataPointer];
                         Array.Copy(Data, DataPointer, transferData, 0, Data.Length - DataPointer);
                         uint endPacket = Packet |= (uint) 0x80000000;
-                        Client.SendXferPacket(XferID, endPacket, transferData);
+                        Client.SendXferPacket(XferID, endPacket, transferData, isTaskInventory);
                         Packet++;
                         DataPointer += (Data.Length - DataPointer);
 
diff --git a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
index 7d9c9a9..c4abc99 100644
--- a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
+++ b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
@@ -594,6 +594,11 @@ namespace OpenSim.Region.CoreModules.Asset
                         dir, dirSize);
                 }
             }
+            catch (DirectoryNotFoundException)
+            {
+                // If we get here, another node on the same box has
+                // already removed the directory. Continue with next.
+            }
             catch (Exception e)
             {
                 m_log.Warn(
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index 2f67c4e..92beed2 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -41,6 +41,7 @@ using OpenSim.Region.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Framework.Scenes.Serialization;
+using OpenSim.Services.Interfaces;
 
 namespace OpenSim.Region.CoreModules.Avatar.Attachments
 {
@@ -303,6 +304,40 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
             if (DebugLevel > 0)
                 m_log.DebugFormat("[ATTACHMENTS MODULE]: Rezzing any attachments for {0} from simulator-side", sp.Name);
 
+            XmlDocument doc = new XmlDocument();
+            string stateData = String.Empty;
+
+            IAttachmentsService attServ = m_scene.RequestModuleInterface<IAttachmentsService>();
+            if (attServ != null)
+            {
+                m_log.DebugFormat("[ATTACHMENT]: Loading attachment data from attachment service");
+                stateData = attServ.Get(sp.UUID.ToString());
+                if (stateData != String.Empty)
+                {
+                    try
+                    {
+                        doc.LoadXml(stateData);
+                    }
+                    catch { }
+                }
+            }
+
+            Dictionary<UUID, string> itemData = new Dictionary<UUID, string>();
+
+            XmlNodeList nodes = doc.GetElementsByTagName("Attachment");
+            if (nodes.Count > 0)
+            {
+                foreach (XmlNode n in nodes)
+                {
+                    XmlElement elem = (XmlElement)n;
+                    string itemID = elem.GetAttribute("ItemID");
+                    string xml = elem.InnerXml;
+
+                    itemData[new UUID(itemID)] = xml;
+                }
+            }
+
+
             List<AvatarAttachment> attachments = sp.Appearance.GetAttachments();
 
             // Let's get all items at once, so they get cached
@@ -330,10 +365,20 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
 
                 try
                 {
+                    string xmlData;
+                    XmlDocument d = null;
+                    UUID asset;
+                    if (itemData.TryGetValue(attach.ItemID, out xmlData))
+                    {
+                        d = new XmlDocument();
+                        d.LoadXml(xmlData);
+                        m_log.InfoFormat("[ATTACHMENT]: Found saved state for item {0}, loading it", attach.ItemID);
+                    }
+
                     // If we're an NPC then skip all the item checks and manipulations since we don't have an
                     // inventory right now.
                     RezSingleAttachmentFromInventoryInternal(
-                        sp, sp.PresenceType == PresenceType.Npc ? UUID.Zero : attach.ItemID, attach.AssetID, attachmentPt, true);
+                        sp, sp.PresenceType == PresenceType.Npc ? UUID.Zero : attach.ItemID, attach.AssetID, attachmentPt, true, d);
                 }
                 catch (Exception e)
                 {
@@ -361,27 +406,35 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
 
             Dictionary<SceneObjectGroup, string> scriptStates = new Dictionary<SceneObjectGroup, string>();
 
-            foreach (SceneObjectGroup so in attachments)
-            {
-                // Scripts MUST be snapshotted before the object is
-                // removed from the scene because doing otherwise will
-                // clobber the run flag
-                // This must be done outside the sp.AttachmentSyncLock so that there is no risk of a deadlock from
-                // scripts performing attachment operations at the same time.  Getting object states stops the scripts.
-                scriptStates[so] = PrepareScriptInstanceForSave(so, false);
 
-//                m_log.DebugFormat(
-//                    "[ATTACHMENTS MODULE]: For object {0} for {1} in {2} got saved state {3}", 
-//                    so.Name, sp.Name, m_scene.Name, scriptStates[so]);
-            }
-
-            lock (sp.AttachmentsSyncLock)
+            if (sp.PresenceType != PresenceType.Npc)
             {
                 foreach (SceneObjectGroup so in attachments)
-                    UpdateDetachedObject(sp, so, scriptStates[so]);
-    
-                sp.ClearAttachments();
+                {
+                    // Scripts MUST be snapshotted before the object is
+                    // removed from the scene because doing otherwise will
+                    // clobber the run flag
+                    // This must be done outside the sp.AttachmentSyncLock so that there is no risk of a deadlock from
+                    // scripts performing attachment operations at the same time.  Getting object states stops the scripts.
+                    scriptStates[so] = PrepareScriptInstanceForSave(so, false);
+                }
+
+                lock (sp.AttachmentsSyncLock)
+                {
+                    foreach (SceneObjectGroup so in attachments)
+                        UpdateDetachedObject(sp, so, scriptStates[so]);
+                    sp.ClearAttachments();
+                }
             }
+            else
+            {
+                lock (sp.AttachmentsSyncLock)
+                {
+                    foreach (SceneObjectGroup so in attachments)
+                        UpdateDetachedObject(sp, so, String.Empty);
+                    sp.ClearAttachments();
+                }
+            }           
         }
 
         public void DeleteAttachmentsFromScene(IScenePresence sp, bool silent)
@@ -402,20 +455,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
             sp.ClearAttachments();
         }
         
-        public bool AttachObject(
-            IScenePresence sp, SceneObjectGroup group, uint attachmentPt, bool silent, bool addToInventory, bool append)
+        public bool AttachObject(IScenePresence sp, SceneObjectGroup group, uint attachmentPt, bool silent, bool useAttachData, bool addToInventory, bool append)
         {
             if (!Enabled)
                 return false;
 
-            group.DetachFromBackup();
-
-            bool success = AttachObjectInternal(sp, group, attachmentPt, silent, addToInventory, false, append);
-
-            if (!success)
-                group.AttachToBackup();
-
-            return success;
+            return AttachObjectInternal(sp, group, attachmentPt, silent, useAttachData, addToInventory, false, append);
         }
 
         /// <summary>
@@ -428,10 +473,21 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
         /// <param name='silent'></param>
         /// <param name='addToInventory'>If true then add object to user inventory.</param>
         /// <param name='resumeScripts'>If true then scripts are resumed on the attached object.</param>
-        /// <param name='append'>Append to attachment point rather than replace.</param>
-        private bool AttachObjectInternal(
-            IScenePresence sp, SceneObjectGroup group, uint attachmentPt, bool silent, bool addToInventory, bool resumeScripts, bool append)
+        private bool AttachObjectInternal(IScenePresence sp, SceneObjectGroup group, uint attachmentPt, bool silent, bool useAttachData, bool addToInventory, bool resumeScripts, bool append)
         {
+//                m_log.DebugFormat(
+//                    "[ATTACHMENTS MODULE]: Attaching object {0} {1} to {2} point {3} from ground (silent = {4})",
+//                    group.Name, group.LocalId, sp.Name, attachmentPt, silent);
+
+            if (sp.GetAttachments().Contains(group))
+            {
+//                m_log.WarnFormat(
+//                    "[ATTACHMENTS MODULE]: Ignoring request to attach {0} {1} to {2} on {3} since it's already attached",
+//                    group.Name, group.LocalId, sp.Name, AttachmentPt);
+
+                return false;
+            }
+
             if (group.GetSittingAvatarsCount() != 0)
             {
                 if (DebugLevel > 0)
@@ -443,6 +499,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
             }
 
             Vector3 attachPos = group.AbsolutePosition;
+
+            // 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;
+            
             // If the attachment point isn't the same as the one previously used
             // set it's offset position = 0 so that it appears on the attachment point
             // and not in a weird location somewhere unknown.
@@ -481,9 +542,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                 attachPos = Vector3.Zero;
             }
 
-            group.AttachmentPoint = attachmentPt;
-            group.AbsolutePosition = attachPos;
-
             List<SceneObjectGroup> attachments = sp.GetAttachments(attachmentPt);
 
             if (attachments.Contains(group))
@@ -516,6 +574,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
 
             lock (sp.AttachmentsSyncLock)
             {
+                group.AttachmentPoint = attachmentPt;
+                group.AbsolutePosition = attachPos;
+
                 if (addToInventory && sp.PresenceType != PresenceType.Npc)
                     UpdateUserInventoryWithAttachment(sp, group, attachmentPt, append);
     
@@ -546,7 +607,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
             ShowAttachInUserInventory(sp, attachmentPt, newAttachmentItemID, group, append);
         }
 
-        public SceneObjectGroup RezSingleAttachmentFromInventory(IScenePresence sp, UUID itemID, uint AttachmentPt)
+        public ISceneEntity RezSingleAttachmentFromInventory(IScenePresence sp, UUID itemID, uint AttachmentPt)
+                {
+                        return RezSingleAttachmentFromInventory(sp, itemID, AttachmentPt, null);
+                }
+
+                public ISceneEntity RezSingleAttachmentFromInventory(IScenePresence sp, UUID itemID, uint AttachmentPt, XmlDocument doc)
         {
             if (!Enabled)
                 return null;
@@ -584,7 +650,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
             bool append = (AttachmentPt & 0x80) != 0;
             AttachmentPt &= 0x7f;
 
-            return RezSingleAttachmentFromInventoryInternal(sp, itemID, UUID.Zero, AttachmentPt, append);
+            return RezSingleAttachmentFromInventoryInternal(sp, itemID, UUID.Zero, AttachmentPt, append, doc);
         }
 
         public void RezMultipleAttachmentsFromInventory(IScenePresence sp, List<KeyValuePair<UUID, uint>> rezlist)
@@ -649,26 +715,36 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                 if (changed && m_scene.AvatarFactory != null)
                     m_scene.AvatarFactory.QueueAppearanceSave(sp.UUID);
 
+                so.RootPart.Shape.LastAttachPoint = (byte)so.AttachmentPoint;
+                
                 sp.RemoveAttachment(so);
                 so.FromItemID = UUID.Zero;
 
+                so.AttachedAvatar = UUID.Zero;
+                so.ClearPartAttachmentData();
+
                 SceneObjectPart rootPart = so.RootPart;
+
+                rootPart.SetParentLocalId(0);
                 so.AbsolutePosition = absolutePos;
                 if (absoluteRot != Quaternion.Identity)
                 {
                     so.UpdateGroupRotationR(absoluteRot);
                 }
-                so.AttachedAvatar = UUID.Zero;
-                rootPart.SetParentLocalId(0);
-                so.ClearPartAttachmentData();
-                rootPart.ApplyPhysics(rootPart.GetEffectiveObjectFlags(), rootPart.VolumeDetectActive);
+
+                rootPart.RemFlag(PrimFlags.TemporaryOnRez);
+                
+                // not physical, not temporary, phaton, not volume detector
+//                so.UpdatePrimFlags(rootPart.LocalId,false,false,true,rootPart.VolumeDetectActive);
+
+                // restore full physical state instead
+                so.ApplyPhysics();
+
                 so.HasGroupChanged = true;
-                so.RootPart.Shape.LastAttachPoint = (byte)so.AttachmentPoint;
                 rootPart.Rezzed = DateTime.Now;
-                rootPart.RemFlag(PrimFlags.TemporaryOnRez);
                 so.AttachToBackup();
                 m_scene.EventManager.TriggerParcelPrimCountTainted();
-                rootPart.ScheduleFullUpdate();
+
                 rootPart.ClearUndoState();
 
                 List<UUID> uuids = new List<UUID>();
@@ -678,6 +754,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
             }
 
             m_scene.EventManager.TriggerOnAttach(so.LocalId, so.UUID, UUID.Zero);
+
+            // Attach (NULL) stops scripts. We don't want that. Resume them.
+            so.ResumeScripts();
+            so.ScheduleGroupForTerseUpdate();
+            so.RootPart.ScheduleFullUpdate();
         }
 
         public void DetachSingleAttachmentToInv(IScenePresence sp, SceneObjectGroup so)
@@ -848,8 +929,16 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
 
             so.AttachedAvatar = sp.UUID;
 
-            if (so.RootPart.PhysActor != null)
-                so.RootPart.RemoveFromPhysics();
+            foreach (SceneObjectPart part in so.Parts)
+            {
+//                if (part.KeyframeMotion != null)
+//                    part.KeyframeMotion.Suspend();
+
+                if (part.PhysActor != null)
+                {
+                    part.RemoveFromPhysics();
+                }
+            }
 
             so.AbsolutePosition = attachOffset;
             so.RootPart.AttachedPos = attachOffset;
@@ -971,6 +1060,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
             // Remove the object from the scene so no more updates
             // are sent. Doing this before the below changes will ensure
             // updates can't cause "HUD artefacts"
+           
             m_scene.DeleteSceneObject(so, false, false);
 
             // Prepare sog for storage
@@ -992,7 +1082,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
         }
 
         protected SceneObjectGroup RezSingleAttachmentFromInventoryInternal(
-            IScenePresence sp, UUID itemID, UUID assetID, uint attachmentPt, bool append)
+            IScenePresence sp, UUID itemID, UUID assetID, uint attachmentPt, bool append, XmlDocument doc)
         {
             if (m_invAccessModule == null)
                 return null;
@@ -1043,7 +1133,13 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
             // This will throw if the attachment fails
             try
             {
-                AttachObjectInternal(sp, objatt, attachmentPt, false, true, true, append);
+                if (doc != null)
+                {
+                    objatt.LoadScriptState(doc);
+                    objatt.ResetOwnerChangeFlag();
+                }
+
+                AttachObjectInternal(sp, objatt, attachmentPt, false, true, true, true, append);
             }
             catch (Exception e)
             {
@@ -1197,7 +1293,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                 AttachmentPt &= 0x7f;
 
                 // Calls attach with a Zero position
-                if (AttachObject(sp, part.ParentGroup, AttachmentPt, false, true, append))
+                if (AttachObject(sp, part.ParentGroup, AttachmentPt, false, false, true, append))
                 {
                     if (DebugLevel > 0)
                         m_log.Debug(
@@ -1205,7 +1301,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                             + ", AttachmentPoint: " + AttachmentPt);
 
                     // Save avatar attachment information
-                    m_scene.EventManager.TriggerOnAttach(objectLocalID, part.ParentGroup.FromItemID, remoteClient.AgentId);
+                    m_scene.AvatarFactory.QueueAppearanceSave(sp.UUID);
                 }
             }
             catch (Exception e)
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
index 3e7e4ed..7d9609f 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
@@ -200,7 +200,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
             Assert.That(so.Backup, Is.True);
 
             m_numberOfAttachEventsFired = 0;
-            scene.AttachmentsModule.AttachObject(sp, so, (uint)AttachmentPoint.Chest, false, true, false);
+            scene.AttachmentsModule.AttachObject(sp, so, (uint)AttachmentPoint.Chest, false, true, false, false);
 
             // Check status on scene presence
             Assert.That(sp.HasAttachments(), Is.True);
@@ -248,7 +248,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
                 SceneObjectGroup so = SceneHelpers.AddSceneObject(scene, "att1", sp.UUID);
 
                 m_numberOfAttachEventsFired = 0;
-                scene.AttachmentsModule.AttachObject(sp, so, (uint)AttachmentPoint.Default, false, true, false);
+                scene.AttachmentsModule.AttachObject(sp, so, (uint)AttachmentPoint.Default, false, true, false, false);
 
                 // Check status on scene presence
                 Assert.That(sp.HasAttachments(), Is.True);
@@ -281,7 +281,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
 
             // Test wearing a different attachment from the ground.
             {
-                scene.AttachmentsModule.AttachObject(sp, so2, (uint)AttachmentPoint.Default, false, true, false);
+                scene.AttachmentsModule.AttachObject(sp, so2, (uint)AttachmentPoint.Default, false, true, false, false);
 
                 // Check status on scene presence
                 Assert.That(sp.HasAttachments(), Is.True);
@@ -314,7 +314,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
 
             // Test rewearing an already worn attachment from ground.  Nothing should happen.
             {
-                scene.AttachmentsModule.AttachObject(sp, so2, (uint)AttachmentPoint.Default, false, true, false);
+                scene.AttachmentsModule.AttachObject(sp, so2, (uint)AttachmentPoint.Default, false, true, false, false);
 
                 // Check status on scene presence
                 Assert.That(sp.HasAttachments(), Is.True);
@@ -372,7 +372,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
             sp2.AbsolutePosition = new Vector3(0, 0, 0);
             sp2.HandleAgentRequestSit(sp2.ControllingClient, sp2.UUID, so.UUID, Vector3.Zero);
 
-            scene.AttachmentsModule.AttachObject(sp, so, (uint)AttachmentPoint.Chest, false, true, false);
+            scene.AttachmentsModule.AttachObject(sp, so, (uint)AttachmentPoint.Chest, false, true, false, false);
 
             Assert.That(sp.HasAttachments(), Is.False);
             Assert.That(scene.GetSceneObjectGroups().Count, Is.EqualTo(1));
@@ -670,7 +670,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
             scene.EventManager.OnChatFromWorld += OnChatFromWorld;
 
             SceneObjectGroup rezzedSo
-                = scene.AttachmentsModule.RezSingleAttachmentFromInventory(sp, userItem.ID, (uint)AttachmentPoint.Chest);
+                = (SceneObjectGroup)(scene.AttachmentsModule.RezSingleAttachmentFromInventory(sp, userItem.ID, (uint)AttachmentPoint.Chest));
 
             // Wait for chat to signal rezzed script has been started.
             m_chatEvent.WaitOne(60000);
@@ -689,7 +689,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
             Assert.That(scriptStateNodes.Count, Is.EqualTo(1));
 
             // Re-rez the attachment to check script running state
-            SceneObjectGroup reRezzedSo = scene.AttachmentsModule.RezSingleAttachmentFromInventory(sp, userItem.ID, (uint)AttachmentPoint.Chest);
+            SceneObjectGroup reRezzedSo = (SceneObjectGroup)(scene.AttachmentsModule.RezSingleAttachmentFromInventory(sp, userItem.ID, (uint)AttachmentPoint.Chest));
 
             // Wait for chat to signal rezzed script has been started.
             m_chatEvent.WaitOne(60000);
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
index cfb082b..0d3b39e 100644
--- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
@@ -188,27 +188,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
                 // Process the visual params, this may change height as well
                 if (visualParams != null)
                 {
-                    //                    string[] visualParamsStrings = new string[visualParams.Length];
-                    //                    for (int i = 0; i < visualParams.Length; i++)
-                    //                        visualParamsStrings[i] = visualParams[i].ToString();
-                    //                    m_log.DebugFormat(
-                    //                        "[AVFACTORY]: Setting visual params for {0} to {1}",
-                    //                        client.Name, string.Join(", ", visualParamsStrings));
-/*
-                    float oldHeight = sp.Appearance.AvatarHeight;
-                    changed = sp.Appearance.SetVisualParams(visualParams);
-
-                    if (sp.Appearance.AvatarHeight != oldHeight && sp.Appearance.AvatarHeight > 0)
-                        ((ScenePresence)sp).SetHeight(sp.Appearance.AvatarHeight);
- */
-//                    float oldoff = sp.Appearance.AvatarFeetOffset;
-//                    Vector3 oldbox = sp.Appearance.AvatarBoxSize;
                     changed = sp.Appearance.SetVisualParams(visualParams);
-//                    float off = sp.Appearance.AvatarFeetOffset;
-//                    Vector3 box = sp.Appearance.AvatarBoxSize;
-//                    if(oldoff != off || oldbox != box)
-//                        ((ScenePresence)sp).SetSize(box,off);
-
                 }
             
                 // Process the baked texture array
@@ -222,9 +202,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
 
 //                    WriteBakedTexturesReport(sp, m_log.DebugFormat);
 
-                    // If bake textures are missing and this is not an NPC, request a rebake from client
-                    if (!ValidateBakedTextureCache(sp) && (((ScenePresence)sp).PresenceType != PresenceType.Npc))
-                        RequestRebake(sp, true);
+                    UpdateBakedTextureCache(sp, cacheItems);
 
                     // This appears to be set only in the final stage of the appearance
                     // update transaction. In theory, we should be able to do an immediate
@@ -251,7 +229,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
         private void SendAppearance(ScenePresence sp)
         {
             // Send the appearance to everyone in the scene
-            sp.SendAppearanceToAllOtherClients();
+            sp.SendAppearanceToAllOtherAgents();
 
             // Send animations back to the avatar as well
             sp.Animator.SendAnimPack();
@@ -377,114 +355,322 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
             }
         }
 
-        public bool ValidateBakedTextureCache(IScenePresence sp)
+        // called on textures update
+        public bool UpdateBakedTextureCache(IScenePresence sp, WearableCacheItem[] cacheItems)
         {
-            bool defonly = true; // are we only using default textures
-            IImprovedAssetCache cache = m_scene.RequestModuleInterface<IImprovedAssetCache>();
-            IBakedTextureModule bakedModule = m_scene.RequestModuleInterface<IBakedTextureModule>();
-            WearableCacheItem[] wearableCache = null;
-
-            // Cache wearable data for teleport.
-            // Only makes sense if there's a bake module and a cache module
-            if (bakedModule != null && cache != null)
+            // npcs dont have baked cache
+            if (((ScenePresence)sp).isNPC)
+                return true;
+
+            // uploaded baked textures will be in assets local cache
+            IAssetService cache = m_scene.AssetService;
+            IBakedTextureModule m_BakedTextureModule = m_scene.RequestModuleInterface<IBakedTextureModule>();
+
+            int validDirtyBakes = 0;
+            int hits = 0;
+
+            // our main cacheIDs mapper is p.Appearance.WearableCacheItems
+            WearableCacheItem[] wearableCache = sp.Appearance.WearableCacheItems;
+
+            if (wearableCache == null)
             {
-                try
+                wearableCache = WearableCacheItem.GetDefaultCacheItem();
+            }
+
+            List<UUID> missing = new List<UUID>();
+
+            // Process received baked textures
+            for (int i = 0; i < cacheItems.Length; i++)
+            {
+                int idx = (int)cacheItems[i].TextureIndex;
+                Primitive.TextureEntryFace face = sp.Appearance.Texture.FaceTextures[idx];
+
+                // No face
+                if (face == null)
                 {
-                    wearableCache = bakedModule.Get(sp.UUID);
+                    // for some reason viewer is cleaning this
+                    sp.Appearance.Texture.FaceTextures[idx] = sp.Appearance.Texture.CreateFace((uint) idx);
+                    sp.Appearance.Texture.FaceTextures[idx].TextureID = AppearanceManager.DEFAULT_AVATAR_TEXTURE;
+                    wearableCache[idx].CacheId = UUID.Zero;
+                    wearableCache[idx].TextureID = UUID.Zero;
+                    wearableCache[idx].TextureAsset = null;
+                    continue;
                 }
-                catch (Exception)
+                else
                 {
+                    if (face.TextureID == UUID.Zero || face.TextureID == AppearanceManager.DEFAULT_AVATAR_TEXTURE)
+                    {
+                        wearableCache[idx].CacheId = UUID.Zero;
+                        wearableCache[idx].TextureID = UUID.Zero;
+                        wearableCache[idx].TextureAsset = null;
+                        continue;
+                    }
 
-                }
-                if (wearableCache != null)
-                {
-                    for (int i = 0; i < wearableCache.Length; i++)
+/*
+                    if (face.TextureID == wearableCache[idx].TextureID && m_BakedTextureModule != null)
+                    {
+                        if (wearableCache[idx].CacheId != cacheItems[i].CacheId)
+                        {
+                            wearableCache[idx].CacheId = cacheItems[i].CacheId;
+                            validDirtyBakes++;
+
+                            //assuming this can only happen if asset is in cache
+                        }
+                        hits++;
+                        continue;
+                    }
+*/
+                    wearableCache[idx].TextureAsset = null;
+                    if (cache != null)
+                       wearableCache[idx].TextureAsset = cache.GetCached(face.TextureID.ToString());
+
+                    if (wearableCache[idx].TextureAsset != null)
+                    {
+                        if ( wearableCache[idx].TextureID != face.TextureID ||
+                                wearableCache[idx].CacheId != cacheItems[i].CacheId)
+                            validDirtyBakes++;
+
+                        wearableCache[idx].TextureID = face.TextureID;
+                        wearableCache[idx].CacheId = cacheItems[i].CacheId;
+                        hits++;
+                    }
+                    else
                     {
-                       cache.Cache(wearableCache[i].TextureAsset);
+                        wearableCache[idx].CacheId = UUID.Zero;
+                        wearableCache[idx].TextureID = UUID.Zero;
+                        wearableCache[idx].TextureAsset = null;
+                        missing.Add(face.TextureID);
+                        continue;
                     }
                 }
             }
-            /*
-             IBakedTextureModule bakedModule = m_scene.RequestModuleInterface<IBakedTextureModule>();
-            if (invService.GetRootFolder(userID) != null)
+
+            sp.Appearance.WearableCacheItems = wearableCache;
+           
+            if (missing.Count > 0)
+            {
+                foreach (UUID id in missing)
+                    sp.ControllingClient.SendRebakeAvatarTextures(id);
+            }
+
+            if (validDirtyBakes > 0 && hits == cacheItems.Length)
             {
-                WearableCacheItem[] wearableCache = null;
-                if (bakedModule != null)
+                // if we got a full set of baked textures save all in BakedTextureModule
+                if (m_BakedTextureModule != null)
                 {
-                    try
+                    m_log.Debug("[UpdateBakedCache] uploading to bakedModule cache");
+
+                    m_BakedTextureModule.Store(sp.UUID, wearableCache);
+                }
+            }
+
+
+            // debug
+            m_log.Debug("[UpdateBakedCache] cache hits: " + hits.ToString() + " changed entries: " + validDirtyBakes.ToString() + " rebakes " + missing.Count);
+/*
+            for (int iter = 0; iter < AvatarAppearance.BAKE_INDICES.Length; iter++)
+            {
+                int j = AvatarAppearance.BAKE_INDICES[iter];
+                m_log.Debug("[UpdateBCache] {" + iter + "/" + 
+                                    sp.Appearance.WearableCacheItems[j].TextureIndex + "}: c-" +
+                                    sp.Appearance.WearableCacheItems[j].CacheId + ", t-" +
+                                    sp.Appearance.WearableCacheItems[j].TextureID);
+            }
+*/
+            return (hits == cacheItems.Length);
+        }
+
+        // called when we get a new root avatar
+        public bool ValidateBakedTextureCache(IScenePresence sp)
+        {
+            int hits = 0;
+
+            if (((ScenePresence)sp).isNPC)
+                return true;
+
+            lock (m_setAppearanceLock)
+            {
+                IAssetService cache = m_scene.AssetService;
+                IBakedTextureModule bakedModule = m_scene.RequestModuleInterface<IBakedTextureModule>();
+                WearableCacheItem[] bakedModuleCache = null;
+
+                if (cache == null)
+                    return false;
+
+                WearableCacheItem[] wearableCache = sp.Appearance.WearableCacheItems;
+
+                // big debug
+                m_log.DebugFormat("[AVFACTORY]: ValidateBakedTextureCache start for {0} {1}", sp.Name, sp.UUID);
+/*
+                for (int iter = 0; iter < AvatarAppearance.BAKE_INDICES.Length; iter++)
+                {
+                    int j = AvatarAppearance.BAKE_INDICES[iter];
+                    Primitive.TextureEntryFace face = sp.Appearance.Texture.FaceTextures[j];
+                    if (wearableCache == null)
+                    {
+                        if (face != null)
+                            m_log.Debug("[ValidateBakedCache] {" + iter + "/" + j + " t- " + face.TextureID);
+                        else
+                            m_log.Debug("[ValidateBakedCache] {" + iter + "/" + j + " t- No texture");
+                    }
+                    else
+                    {
+                        if (face != null)
+                            m_log.Debug("[ValidateBakedCache] {" + iter + "/" + j + " ft- " + face.TextureID +
+                                   "}: cc-" +
+                                    wearableCache[j].CacheId + ", ct-" +
+                                    wearableCache[j].TextureID
+                                );
+                        else
+                            m_log.Debug("[ValidateBakedCache] {" + iter + "/" + j + " t - No texture" +
+                                    "}: cc-" +
+                                    wearableCache[j].CacheId + ", ct-" +
+                                    wearableCache[j].TextureID
+                                );
+                    }
+                }
+*/
+                bool wearableCacheValid = false;
+                if (wearableCache == null)
+                {
+                    wearableCache = WearableCacheItem.GetDefaultCacheItem();
+                }
+                else
+                {
+                    // we may have received a full cache
+                    // check same coerence and store
+                    wearableCacheValid = true;
+                    for (int i = 0; i < AvatarAppearance.BAKE_INDICES.Length; i++)
                     {
-                        wearableCache = bakedModule.Get(userID);
-                        appearance.WearableCacheItems = wearableCache;
-                        appearance.WearableCacheItemsDirty = false;
-                        foreach (WearableCacheItem item in wearableCache)
+                        int idx = AvatarAppearance.BAKE_INDICES[i];
+                        Primitive.TextureEntryFace face = sp.Appearance.Texture.FaceTextures[idx];
+                        if (face != null)
                         {
-                            appearance.Texture.FaceTextures[item.TextureIndex].TextureID = item.TextureID;
+                            if (face.TextureID == wearableCache[idx].TextureID &&
+                                face.TextureID != UUID.Zero)
+                            {
+                                if (wearableCache[idx].TextureAsset != null)
+                                {
+                                    hits++;
+                                    wearableCache[idx].TextureAsset.Temporary = true;
+                                    wearableCache[idx].TextureAsset.Local = true;
+                                    cache.Store(wearableCache[idx].TextureAsset);
+                                    continue;
+                                }
+                                if (cache.GetCached((wearableCache[idx].TextureID).ToString()) != null)
+                                {
+                                    hits++;
+                                    continue;
+                                }
+                            }
+                            wearableCacheValid = false;
                         }
                     }
-                    catch (Exception)
+                   
+                    wearableCacheValid = (wearableCacheValid && (hits >= AvatarAppearance.BAKE_INDICES.Length - 1));
+                    if (wearableCacheValid)
+                        m_log.Debug("[ValidateBakedCache] have valid local cache");
+                }
+
+                bool checkExternal = false;
+
+                if (!wearableCacheValid)
+                {
+                    // only use external bake module on login condition check                  
+//                    ScenePresence ssp = null;
+//                    if (sp is ScenePresence)
                     {
-                        
+//                        ssp = (ScenePresence)sp;
+//                        checkExternal = (((uint)ssp.TeleportFlags & (uint)TeleportFlags.ViaLogin) != 0) &&
+//                            bakedModule != null;
+
+                        // or do it anytime we dont have the cache
+                        checkExternal = bakedModule != null;
                     }
                 }
-             */
 
-            // Process the texture entry
-            for (int i = 0; i < AvatarAppearance.BAKE_INDICES.Length; i++)
-            {
-                int idx = AvatarAppearance.BAKE_INDICES[i];
-                Primitive.TextureEntryFace face = sp.Appearance.Texture.FaceTextures[idx];
-
-                // No face, so lets check our baked service cache, teleport or login.
-                if (face == null)
+                if (checkExternal)
                 {
-                    if (wearableCache != null)
+                    hits = 0;
+                    bool gotbacked = false;
+
+                    m_log.Debug("[ValidateBakedCache] local cache invalid, checking bakedModule");
+                    try
                     {
-                        // If we find the an appearance item, set it as the textureentry and the face
-                        WearableCacheItem searchitem = WearableCacheItem.SearchTextureIndex((uint) idx, wearableCache);
-                        if (searchitem != null)
+                        bakedModuleCache = bakedModule.Get(sp.UUID);
+                    }
+                    catch (Exception e)
+                    {
+                        m_log.ErrorFormat(e.ToString());
+                        bakedModuleCache = null;
+                    }
+
+                    if (bakedModuleCache != null)
+                    {
+                        m_log.Debug("[ValidateBakedCache] got bakedModule " + bakedModuleCache.Length + " cached textures");
+
+                        for (int i = 0; i < bakedModuleCache.Length; i++)
                         {
-                            sp.Appearance.Texture.FaceTextures[idx] = sp.Appearance.Texture.CreateFace((uint) idx);
-                            sp.Appearance.Texture.FaceTextures[idx].TextureID = searchitem.TextureID;
-                            face = sp.Appearance.Texture.FaceTextures[idx];
+                            int j = (int)bakedModuleCache[i].TextureIndex;
+
+                            if (bakedModuleCache[i].TextureAsset != null)
+                            {
+                                wearableCache[j].TextureID = bakedModuleCache[i].TextureID;
+                                wearableCache[j].CacheId = bakedModuleCache[i].CacheId;
+                                wearableCache[j].TextureAsset = bakedModuleCache[i].TextureAsset;
+                                bakedModuleCache[i].TextureAsset.Temporary = true;
+                                bakedModuleCache[i].TextureAsset.Local = true;
+                                cache.Store(bakedModuleCache[i].TextureAsset);
+                            }
                         }
-                        else
+                        gotbacked = true;
+                    }
+
+                    if (gotbacked)
+                    {
+                        // force the ones we got
+                        for (int i = 0; i < AvatarAppearance.BAKE_INDICES.Length; i++)
                         {
-                            // if there is no texture entry and no baked cache, skip it
+                            int idx = AvatarAppearance.BAKE_INDICES[i];
+                            Primitive.TextureEntryFace face = sp.Appearance.Texture.FaceTextures[idx];
+
+                            if (sp.Appearance.Texture.FaceTextures[idx] == null)
+                                sp.Appearance.Texture.FaceTextures[idx] = sp.Appearance.Texture.CreateFace((uint)idx);
+                            sp.Appearance.Texture.FaceTextures[idx].TextureID = wearableCache[idx].TextureID;
+                            face = sp.Appearance.Texture.FaceTextures[idx];
+
+                            // this should be removed
+                            if (face.TextureID != UUID.Zero && face.TextureID != AppearanceManager.DEFAULT_AVATAR_TEXTURE)
+                                hits++;
                             continue;
                         }
                     }
-                    else
-                    {
-                        //No texture entry face and no cache.  Skip this face.
-                        continue;
-                    }
                 }
-                    
-//                m_log.DebugFormat(
-//                    "[AVFACTORY]: Looking for texture {0}, id {1} for {2} {3}",
-//                    face.TextureID, idx, client.Name, client.AgentId);
 
-                // if the texture is one of the "defaults" then skip it
-                // this should probably be more intelligent (skirt texture doesnt matter
-                // if the avatar isnt wearing a skirt) but if any of the main baked 
-                // textures is default then the rest should be as well
-                if (face.TextureID == UUID.Zero || face.TextureID == AppearanceManager.DEFAULT_AVATAR_TEXTURE)
-                    continue;
-                
-                defonly = false; // found a non-default texture reference
+                sp.Appearance.WearableCacheItems = wearableCache;
 
-                if (m_scene.AssetService.Get(face.TextureID.ToString()) == null)
-                    return false;
             }
 
-//            m_log.DebugFormat("[AVFACTORY]: Completed texture check for {0} {1}", sp.Name, sp.UUID);
-
-            // If we only found default textures, then the appearance is not cached
-            return (defonly ? false : true);
+            // debug
+            m_log.DebugFormat("[ValidateBakedCache]: Completed texture check for {0} {1} with {2} hits", sp.Name, sp.UUID, hits);
+/*
+            for (int iter = 0; iter < AvatarAppearance.BAKE_INDICES.Length; iter++)
+            {
+                int j = AvatarAppearance.BAKE_INDICES[iter];
+                m_log.Debug("[ValidateBakedCache] {" + iter + "/" +
+                                    sp.Appearance.WearableCacheItems[j].TextureIndex + "}: c-" +
+                                    sp.Appearance.WearableCacheItems[j].CacheId + ", t-" +
+                                    sp.Appearance.WearableCacheItems[j].TextureID);
+            }
+*/
+            return (hits >= AvatarAppearance.BAKE_INDICES.Length - 1); // skirt is optional
         }
 
         public int RequestRebake(IScenePresence sp, bool missingTexturesOnly)
         {
+            if (((ScenePresence)sp).isNPC)
+                return 0;
+
             int texturesRebaked = 0;
 //            IImprovedAssetCache cache = m_scene.RequestModuleInterface<IImprovedAssetCache>();
 
@@ -497,14 +683,6 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
                 if (face == null)
                     continue;
 
-//                m_log.DebugFormat(
-//                    "[AVFACTORY]: Looking for texture {0}, id {1} for {2} {3}",
-//                    face.TextureID, idx, client.Name, client.AgentId);
-
-                // if the texture is one of the "defaults" then skip it
-                // this should probably be more intelligent (skirt texture doesnt matter
-                // if the avatar isnt wearing a skirt) but if any of the main baked
-                // textures is default then the rest should be as well
                 if (face.TextureID == UUID.Zero || face.TextureID == AppearanceManager.DEFAULT_AVATAR_TEXTURE)
                     continue;
 
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/Tests/AvatarFactoryModuleTests.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/Tests/AvatarFactoryModuleTests.cs
index 9513408..dd93449 100644
--- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/Tests/AvatarFactoryModuleTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/Tests/AvatarFactoryModuleTests.cs
@@ -181,7 +181,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
             Primitive.TextureEntryFace eyesFace = bakedTextureEntry.CreateFace(eyesFaceIndex);
             eyesFace.TextureID = eyesTextureId;
 
-            afm.SetAppearance(sp, bakedTextureEntry, visualParams, null);
+            afm.SetAppearance(sp, bakedTextureEntry, visualParams, new WearableCacheItem[0]);
             afm.SaveBakedTextures(userId);
 //            Dictionary<BakeType, Primitive.TextureEntryFace> bakedTextures = afm.GetBakedTextureFaces(userId);
 
diff --git a/OpenSim/Region/CoreModules/Avatar/BakedTextures/XBakesModule.cs b/OpenSim/Region/CoreModules/Avatar/BakedTextures/XBakesModule.cs
index 414f06a..7bec18f 100644
--- a/OpenSim/Region/CoreModules/Avatar/BakedTextures/XBakesModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/BakedTextures/XBakesModule.cs
@@ -150,6 +150,14 @@ namespace OpenSim.Region.CoreModules.Avatar.BakedTextures
             }
         }
 
+        public void Store(UUID agentId)
+        {
+        }
+        public void UpdateMeshAvatar(UUID agentId)
+        {
+        }
+
+
         public void Store(UUID agentId, WearableCacheItem[] data)
         {
             if (m_URL == String.Empty)
diff --git a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
index a9d2de0..0b5d95b 100644
--- a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
@@ -51,7 +51,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
         private int m_saydistance = 20;
         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;
@@ -78,16 +80,23 @@ 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)
         {
-            if (!m_enabled) 
-                return;
+            if (!m_enabled) return;
 
-            scene.EventManager.OnNewClient += OnNewClient;
-            scene.EventManager.OnChatFromWorld += OnChatFromWorld;
-            scene.EventManager.OnChatBroadcast += OnChatBroadcast;
+            lock (m_syncy)
+            {
+                if (!m_scenes.Contains(scene))
+                {
+                    m_scenes.Add(scene);
+                    scene.EventManager.OnNewClient += OnNewClient;
+                    scene.EventManager.OnChatFromWorld += OnChatFromWorld;
+                    scene.EventManager.OnChatBroadcast += OnChatBroadcast;
+                }
+            }
 
             m_log.InfoFormat("[CHAT]: Initialized for {0} w:{1} s:{2} S:{3}", scene.RegionInfo.RegionName,
                              m_whisperdistance, m_saydistance, m_shoutdistance);
@@ -107,12 +116,18 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
 
         public virtual void RemoveRegion(Scene scene)
         {
-            if (!m_enabled) 
-                return;
+            if (!m_enabled) return;
 
-            scene.EventManager.OnNewClient -= OnNewClient;
-            scene.EventManager.OnChatFromWorld -= OnChatFromWorld;
-            scene.EventManager.OnChatBroadcast -= OnChatBroadcast;
+            lock (m_syncy)
+            {
+                if (m_scenes.Contains(scene))
+                {
+                    scene.EventManager.OnNewClient -= OnNewClient;
+                    scene.EventManager.OnChatFromWorld -= OnChatFromWorld;
+                    scene.EventManager.OnChatBroadcast -= OnChatBroadcast;
+                    m_scenes.Remove(scene);
+                }
+            }
         }
         
         public virtual void Close()
@@ -169,7 +184,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)
@@ -183,33 +206,61 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
         protected virtual void DeliverChatToAvatars(ChatSourceType sourceType, OSChatMessage c)
         {
             string fromName = c.From;
+            string fromNamePrefix = "";
             UUID fromID = UUID.Zero;
             UUID ownerID = UUID.Zero;
-            UUID targetID = c.TargetUUID;
             string message = c.Message;
-            Scene scene = (Scene)c.Scene;
+            IScene scene = c.Scene;
+            UUID destination = c.Destination;
             Vector3 fromPos = c.Position;
             Vector3 regionPos = new Vector3(scene.RegionInfo.WorldLocX, scene.RegionInfo.WorldLocY, 0);
 
+            bool checkParcelHide = false;
+            UUID sourceParcelID = UUID.Zero;
+            Vector3 hidePos = fromPos;
+
             if (c.Channel == DEBUG_CHANNEL) c.Type = ChatTypeEnum.DebugChannel;
 
             switch (sourceType) 
             {
             case ChatSourceType.Agent:
-                ScenePresence avatar = scene.GetScenePresence(c.Sender.AgentId);
+                if (!(scene is Scene))
+                {
+                    m_log.WarnFormat("[CHAT]: scene {0} is not a Scene object, cannot obtain scene presence for {1}",
+                                     scene.RegionInfo.RegionName, c.Sender.AgentId);
+                    return;
+                }
+                ScenePresence avatar = (scene as Scene).GetScenePresence(c.Sender.AgentId);
                 fromPos = avatar.AbsolutePosition;
                 fromName = avatar.Name;
                 fromID = c.Sender.AgentId;
+                if (avatar.GodLevel >= 200)
+                { // let gods speak to outside or things may get confusing
+                    fromNamePrefix = m_adminPrefix;
+                    checkParcelHide = false;
+                }
+                else
+                {
+                    checkParcelHide = true;
+                }
+                destination = UUID.Zero; // Avatars cant "SayTo"
                 ownerID = c.Sender.AgentId;
-
+                
+                hidePos = fromPos;
                 break;
 
             case ChatSourceType.Object:
                 fromID = c.SenderUUID;
 
                 if (c.SenderObject != null && c.SenderObject is SceneObjectPart)
+                {
                     ownerID = ((SceneObjectPart)c.SenderObject).OwnerID;
-
+                    if (((SceneObjectPart)c.SenderObject).ParentGroup.IsAttachment)
+                    {
+                        checkParcelHide = true;
+                        hidePos = ((SceneObjectPart)c.SenderObject).ParentGroup.AbsolutePosition;
+                    }
+                }
                 break;
             }
 
@@ -218,38 +269,68 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
                 message = message.Substring(0, 1000);
 
 //            m_log.DebugFormat(
-//                "[CHAT]: DCTA: fromID {0} fromName {1}, region{2}, cType {3}, sType {4}, targetID {5}",
-//                fromID, fromName, scene.RegionInfo.RegionName, c.Type, sourceType, targetID);
+//                "[CHAT]: DCTA: fromID {0} fromName {1}, region{2}, cType {3}, sType {4}", 
+//                fromID, fromName, scene.RegionInfo.RegionName, c.Type, sourceType);
 
             HashSet<UUID> receiverIDs = new HashSet<UUID>();
 
-            if (targetID == UUID.Zero)
+            if (checkParcelHide)
+            {
+                checkParcelHide = false;
+                if (c.Type < ChatTypeEnum.DebugChannel && destination == UUID.Zero)
+                {
+                    ILandObject srcland = (scene as Scene).LandChannel.GetLandObject(hidePos.X, hidePos.Y);
+                    if (srcland != null && !srcland.LandData.SeeAVs)
+                    {
+                        sourceParcelID = srcland.LandData.GlobalID;
+                        checkParcelHide = true;
+                    }
+                }
+            }
+
+            foreach (Scene s in m_scenes)
             {
                 // This should use ForEachClient, but clients don't have a position.
                 // If camera is moved into client, then camera position can be used
-                scene.ForEachScenePresence(
+                // MT: No, it can't, as chat is heard from the avatar position, not
+                // the camera position.
+
+                s.ForEachScenePresence(
                     delegate(ScenePresence presence)
                     {
-                        if (TrySendChatMessage(
-                            presence, fromPos, regionPos, fromID, ownerID, fromName, c.Type, message, sourceType, false))
-                            receiverIDs.Add(presence.UUID);
+                        if (destination != UUID.Zero && presence.UUID != destination)
+                            return;
+                        ILandObject Presencecheck = s.LandChannel.GetLandObject(presence.AbsolutePosition.X, presence.AbsolutePosition.Y);
+                        if (Presencecheck != null)
+                        {
+                            // This will pass all chat from objects. Not
+                            // perfect, but it will do. For now. Better
+                            // than the prior behavior of muting all
+                            // objects on a parcel with access restrictions
+                            if (checkParcelHide)
+                            {
+                                if (sourceParcelID != Presencecheck.LandData.GlobalID && presence.GodLevel < 200)
+                                    return;
+                            }
+                            if (c.Sender == null || Presencecheck.IsEitherBannedOrRestricted(c.Sender.AgentId) != true)
+                            {
+                                if (destination != UUID.Zero)
+                                {
+                                    if (TrySendChatMessage(presence, fromPos, regionPos, fromID, ownerID, fromNamePrefix + fromName, c.Type, message, sourceType, true))
+                                        receiverIDs.Add(presence.UUID);
+                                }
+                                else
+                                {
+                                    if (TrySendChatMessage(presence, fromPos, regionPos, fromID, ownerID, fromNamePrefix + fromName, c.Type, message, sourceType, false))
+                                        receiverIDs.Add(presence.UUID);
+                                }
+                            }
+                        }
                     }
                 );
             }
-            else
-            {
-                // This is a send to a specific client eg from llRegionSayTo
-                // no need to check distance etc, jand send is as say
-                ScenePresence presence = scene.GetScenePresence(targetID);
-                if (presence != null && !presence.IsChildAgent)
-                {
-                    if (TrySendChatMessage(
-                        presence, fromPos, regionPos, fromID, ownerID, fromName, ChatTypeEnum.Say, message, sourceType, true))
-                        receiverIDs.Add(presence.UUID);
-                }
-            }
-
-            scene.EventManager.TriggerOnChatToClients(
+            
+            (scene as Scene).EventManager.TriggerOnChatToClients(
                 fromID, receiverIDs, message, c.Type, fromPos, fromName, sourceType, ChatAudibleLevel.Fully);
         }
 
@@ -291,28 +372,29 @@ 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).ForEachRootClient(
-                delegate(IClientAPI client)
-                {   
-                    // don't forward SayOwner chat from objects to
-                    // non-owner agents
-                    if ((c.Type == ChatTypeEnum.Owner) &&
-                        (null != c.SenderObject) &&
-                        (((SceneObjectPart)c.SenderObject).OwnerID != client.AgentId))
-                        return;
-
-                    client.SendChatMessage(
-                        c.Message, (byte)cType, CenterOfRegion, fromName, fromID, ownerID,
-                        (byte)sourceType, (byte)ChatAudibleLevel.Fully);
-
-                    receiverIDs.Add(client.AgentId);
-                });
-            
-            (c.Scene as Scene).EventManager.TriggerOnChatToClients(
-                fromID, receiverIDs, c.Message, cType, CenterOfRegion, fromName, sourceType, ChatAudibleLevel.Fully);
+            if (c.Scene != null)
+            {
+                ((Scene)c.Scene).ForEachRootClient
+                (
+                    delegate(IClientAPI client)
+                    {
+                        // don't forward SayOwner chat from objects to
+                        // non-owner agents
+                        if ((c.Type == ChatTypeEnum.Owner) &&
+                            (null != c.SenderObject) &&
+                            (((SceneObjectPart)c.SenderObject).OwnerID != client.AgentId))
+                            return;
+                        
+                        client.SendChatMessage(c.Message, (byte)cType, CenterOfRegion, fromName, fromID, fromID,
+                                               (byte)sourceType, (byte)ChatAudibleLevel.Fully);
+                        receiverIDs.Add(client.AgentId);
+                    }
+                );
+                (c.Scene as Scene).EventManager.TriggerOnChatToClients(
+                    fromID, receiverIDs, c.Message, cType, CenterOfRegion, fromName, sourceType, ChatAudibleLevel.Fully);
+             }
         }
 
         /// <summary>
@@ -364,6 +446,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();
+        }
         #region SimulatorFeaturesRequest
 
         static OSDInteger m_SayRange, m_WhisperRange, m_ShoutRange;
@@ -392,4 +503,4 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
 
         #endregion
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs b/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs
index fc23b72..4e1958a 100644
--- a/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs
@@ -183,10 +183,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Combat.CombatModule
             try
             {
                 ILandObject obj = avatar.Scene.LandChannel.GetLandObject(avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y);
-
                 if (obj == null)
                     return;
-
                 if ((obj.LandData.Flags & (uint)ParcelFlags.AllowDamage) != 0
                     || avatar.Scene.RegionInfo.RegionSettings.AllowDamage)
                 {
diff --git a/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs b/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs
index a896897..56819fa 100644
--- a/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs
@@ -203,8 +203,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog
         {
             m_scene.ForEachRootClient(delegate(IClientAPI client)
             {
-                client.SendBlueBoxMessage(fromAvatarID, fromAvatarName,
-                        message);
+                client.SendAgentAlertMessage(
+                        message, false);
             });
         }
 
@@ -260,4 +260,4 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog
             return result;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs b/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
index 3b6d970..adb838c 100644
--- a/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
@@ -49,6 +49,8 @@ using Caps = OpenSim.Framework.Capabilities.Caps;
 using OSDArray = OpenMetaverse.StructuredData.OSDArray;
 using OSDMap = OpenMetaverse.StructuredData.OSDMap;
 
+using Mono.Addins;
+
 namespace OpenSim.Region.CoreModules.Avatar.Gods
 {
     [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "GodsModule")]
@@ -62,6 +64,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Gods
 
         protected Scene m_scene;
         protected IDialogModule m_dialogModule;
+
         protected IDialogModule DialogModule
         {
             get
@@ -146,6 +149,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Gods
                 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;
diff --git a/OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs b/OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs
deleted file mode 100644
index b735c61..0000000
--- a/OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs
+++ /dev/null
@@ -1,260 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using System.Collections.Generic;
-using System.Reflection;
-using log4net;
-using Nini.Config;
-using OpenMetaverse;
-using OpenSim.Framework;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-
-using Mono.Addins;
-
-namespace OpenSim.Region.CoreModules.Avatar.Groups
-{
-    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "GroupsModule")]
-    public class GroupsModule : ISharedRegionModule
-    {
-        private static readonly ILog m_log =
-            LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
-        private Dictionary<UUID, GroupMembershipData> m_GroupMap =
-                new Dictionary<UUID, GroupMembershipData>();
-
-        private Dictionary<UUID, IClientAPI> m_ClientMap =
-                new Dictionary<UUID, IClientAPI>();
-
-        private UUID opensimulatorGroupID =
-                new UUID("00000000-68f9-1111-024e-222222111123");
-
-        private List<Scene> m_SceneList = new List<Scene>();
-
-        private static GroupMembershipData osGroup =
-                new GroupMembershipData();
-
-        private bool m_Enabled = false;
-
-        #region ISharedRegionModule Members
-
-        public void Initialise(IConfigSource config)
-        {
-            IConfig groupsConfig = config.Configs["Groups"];
-
-            if (groupsConfig == null)
-            {
-                m_log.Info("[GROUPS]: No configuration found. Using defaults");
-            }
-            else
-            {
-                m_Enabled = groupsConfig.GetBoolean("Enabled", false);
-                if (!m_Enabled)
-                {
-                    m_log.Info("[GROUPS]: Groups disabled in configuration");
-                    return;
-                }
-
-                if (groupsConfig.GetString("Module", "Default") != "Default")
-                {
-                    m_Enabled = false;
-                    return;
-                }
-            }
-
-        }
-
-        public void AddRegion(Scene scene)
-        {
-            if (!m_Enabled)
-                return;
-
-            lock (m_SceneList)
-            {
-                if (!m_SceneList.Contains(scene))
-                {
-                    if (m_SceneList.Count == 0)
-                    {
-                        osGroup.GroupID = opensimulatorGroupID;
-                        osGroup.GroupName = "OpenSimulator Testing";
-                        osGroup.GroupPowers =
-                                (uint)(GroupPowers.AllowLandmark |
-                                       GroupPowers.AllowSetHome);
-                        m_GroupMap[opensimulatorGroupID] = osGroup;
-                    }
-                    m_SceneList.Add(scene);
-                }
-            }
-
-            scene.EventManager.OnNewClient += OnNewClient;
-            scene.EventManager.OnClientClosed += OnClientClosed;
-            //            scene.EventManager.OnIncomingInstantMessage += OnGridInstantMessage;
-        }
-
-        public void RemoveRegion(Scene scene)
-        {
-            if (!m_Enabled)
-                return;
-
-            lock (m_SceneList)
-            {
-                if (m_SceneList.Contains(scene))
-                    m_SceneList.Remove(scene);
-            }
-
-            scene.EventManager.OnNewClient -= OnNewClient;
-            scene.EventManager.OnClientClosed -= OnClientClosed;
-        }
-
-        public void RegionLoaded(Scene scene)
-        {
-        }
-
-        public void PostInitialise()
-        {
-        }
-
-        public void Close()
-        {
-            if (!m_Enabled)
-                return;
-
-//            m_log.Debug("[GROUPS]: Shutting down group module.");
-            
-            lock (m_ClientMap)
-            {
-                m_ClientMap.Clear();
-            }
-
-            lock (m_GroupMap)
-            {
-                m_GroupMap.Clear();
-            }
-        }
-
-        public string Name
-        {
-            get { return "GroupsModule"; }
-        }
-
-        public Type ReplaceableInterface
-        {
-            get { return null; }
-        }
-
-        #endregion
-
-        private void OnNewClient(IClientAPI client)
-        {
-            // Subscribe to instant messages
-//            client.OnInstantMessage += OnInstantMessage;
-            client.OnAgentDataUpdateRequest += OnAgentDataUpdateRequest;
-            client.OnUUIDGroupNameRequest += HandleUUIDGroupNameRequest;
-            lock (m_ClientMap)
-            {
-                if (!m_ClientMap.ContainsKey(client.AgentId))
-                {
-                    m_ClientMap.Add(client.AgentId, client);
-                }
-            }
-
-            GroupMembershipData[] updateGroups = new GroupMembershipData[1];
-            updateGroups[0] = osGroup;
-
-            client.SendGroupMembership(updateGroups);
-        }
-
-        private void OnAgentDataUpdateRequest(IClientAPI remoteClient,
-                                              UUID AgentID, UUID SessionID)
-        {
-            UUID ActiveGroupID;
-            string ActiveGroupName;
-            ulong ActiveGroupPowers;
-
-            string firstname = remoteClient.FirstName;
-            string lastname = remoteClient.LastName;
-
-            string ActiveGroupTitle = "I IZ N0T";
-
-            ActiveGroupID = osGroup.GroupID;
-            ActiveGroupName = osGroup.GroupName;
-            ActiveGroupPowers = osGroup.GroupPowers;
-
-            remoteClient.SendAgentDataUpdate(AgentID, ActiveGroupID, firstname,
-                                             lastname, ActiveGroupPowers, ActiveGroupName,
-                                             ActiveGroupTitle);
-        }
-
-//        private void OnInstantMessage(IClientAPI client, GridInstantMessage im)
-//        {
-//        }
-
-//        private void OnGridInstantMessage(GridInstantMessage msg)
-//        {
-//            // Trigger the above event handler
-//            OnInstantMessage(null, msg);
-//        }
-
-        private void HandleUUIDGroupNameRequest(UUID id,IClientAPI remote_client)
-        {
-            string groupnamereply = "Unknown";
-            UUID groupUUID = UUID.Zero;
-
-            lock (m_GroupMap)
-            {
-                if (m_GroupMap.ContainsKey(id))
-                {
-                    GroupMembershipData grp = m_GroupMap[id];
-                    groupnamereply = grp.GroupName;
-                    groupUUID = grp.GroupID;
-                }
-            }
-            remote_client.SendGroupNameReply(groupUUID, groupnamereply);
-        }
-
-        private void OnClientClosed(UUID agentID, Scene scene)
-        {
-            lock (m_ClientMap)
-            {
-                if (m_ClientMap.ContainsKey(agentID))
-                {
-//                    IClientAPI cli = m_ClientMap[agentID];
-//                    if (cli != null)
-//                    {
-//                        //m_log.Info("[GROUPS]: Removing all reference to groups for " + cli.Name);
-//                    }
-//                    else
-//                    {
-//                        //m_log.Info("[GROUPS]: Removing all reference to groups for " + agentID.ToString());
-//                    }
-                    m_ClientMap.Remove(agentID);
-                }
-            }
-        }
-    }
-}
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
index c33a296..55e30a0 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
@@ -27,6 +27,7 @@
 using System;
 using System.Collections.Generic;
 using System.Reflection;
+using System.Timers;
 using log4net;
 using Mono.Addins;
 using Nini.Config;
@@ -44,6 +45,10 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
         private static readonly ILog m_log = LogManager.GetLogger(
                 MethodBase.GetCurrentMethod().DeclaringType);
 
+        private Timer m_logTimer = new Timer(10000);
+        private List<GridInstantMessage> m_logData = new List<GridInstantMessage>();
+        private string m_restUrl;
+
         /// <value>
         /// Is this module enabled?
         /// </value>
@@ -63,9 +68,12 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
                         "InstantMessageModule", "InstantMessageModule") !=
                         "InstantMessageModule")
                     return;
+                m_restUrl = config.Configs["Messaging"].GetString("LogURL", String.Empty);
             }
             
             m_enabled = true;
+            m_logTimer.AutoReset = false;
+            m_logTimer.Elapsed += LogTimerElapsed;
         }
 
         public void AddRegion(Scene scene)
@@ -150,6 +158,9 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
         {
             byte dialog = im.dialog;
 
+            if (client != null && dialog == (byte)InstantMessageDialog.MessageFromAgent)
+                LogInstantMesssage(im);
+
             if (dialog != (byte)InstantMessageDialog.MessageFromAgent
                 && dialog != (byte)InstantMessageDialog.StartTyping
                 && dialog != (byte)InstantMessageDialog.StopTyping
@@ -159,6 +170,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)
@@ -202,5 +239,35 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
             //
             OnInstantMessage(null, msg);
         }
+
+        private void LogInstantMesssage(GridInstantMessage im)
+        {
+            if (m_logData.Count < 20)
+            {
+                // Restart the log write timer
+                m_logTimer.Stop();
+            }
+            if (!m_logTimer.Enabled)
+                m_logTimer.Start();
+
+            lock (m_logData)
+            {
+                m_logData.Add(im);
+            }
+        }
+
+        private void LogTimerElapsed(object source, ElapsedEventArgs e)
+        {
+            lock (m_logData)
+            {
+                if (m_restUrl != String.Empty && m_logData.Count > 0)
+                {
+                    bool success = SynchronousRestObjectRequester.MakeRequest<List<GridInstantMessage>, bool>("POST", m_restUrl + "/LogMessages/", m_logData);
+                    if (!success)
+                        m_log.ErrorFormat("[INSTANT MESSAGE]: Failed to save log data");
+                }
+                m_logData.Clear();
+            }
+        }
     }
 }
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
index 2462ff8..3c82fd9 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
@@ -50,6 +50,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>();
 
@@ -69,14 +70,17 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
         public virtual void Initialise(IConfigSource config)
         {
             IConfig cnf = config.Configs["Messaging"];
-            if (cnf != null && cnf.GetString(
-                    "MessageTransferModule", "MessageTransferModule") !=
-                    "MessageTransferModule")
+            if (cnf != null)
             {
-                m_log.Debug("[MESSAGE TRANSFER]: Disabled by configuration");
-                return;
-            }
+                if (cnf.GetString("MessageTransferModule",
+                        "MessageTransferModule") != "MessageTransferModule")
+                {
+                    return;
+                }
 
+                m_MessageKey = cnf.GetString("MessageKey", String.Empty);
+            }
+            m_log.Debug("[MESSAGE TRANSFER]: Module enabled");
             m_Enabled = true;
         }
 
@@ -135,6 +139,9 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
         {
             UUID toAgentID = new UUID(im.toAgentID);
 
+            if (toAgentID == UUID.Zero)
+                return;
+
             // Try root avatar only first
             foreach (Scene scene in m_Scenes)
             {
@@ -181,7 +188,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
             SendGridInstantMessageViaXMLRPC(im, result);
         }
 
-        public void HandleUndeliverableMessage(GridInstantMessage im, MessageResultNotification result)
+        public virtual void HandleUndeliverableMessage(GridInstantMessage im, MessageResultNotification result)
         {
             UndeliveredMessage handlerUndeliveredMessage = OnUndeliveredMessage;
 
@@ -249,6 +256,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);
@@ -425,104 +445,192 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
             return resp;
         }
 
+
         /// <summary>
         /// delegate for sending a grid instant message asynchronously
         /// </summary>
-        public delegate void GridInstantMessageDelegate(GridInstantMessage im, MessageResultNotification result);
+        private delegate void GridInstantMessageDelegate(GridInstantMessage im, MessageResultNotification result);
+
+        private class GIM {
+            public GridInstantMessage im;
+            public MessageResultNotification result;
+        };
+
+        private Queue<GIM> pendingInstantMessages = new Queue<GIM>();
+        private int numInstantMessageThreads = 0;
 
-        protected virtual void GridInstantMessageCompleted(IAsyncResult iar)
+        private void SendGridInstantMessageViaXMLRPC(GridInstantMessage im, MessageResultNotification result)
         {
-            GridInstantMessageDelegate icon =
-                    (GridInstantMessageDelegate)iar.AsyncState;
-            icon.EndInvoke(iar);
+            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);
+                }
+            }
         }
 
 
-        protected virtual void SendGridInstantMessageViaXMLRPC(GridInstantMessage im, MessageResultNotification result)
+        private void GridInstantMessageCompleted(IAsyncResult iar)
         {
-            GridInstantMessageDelegate d = SendGridInstantMessageViaXMLRPCAsync;
-
-            d.BeginInvoke(im, result, GridInstantMessageCompleted, d);
+            GridInstantMessageDelegate d = (GridInstantMessageDelegate)iar.AsyncState;
+            d.EndInvoke(iar);
         }
 
         /// <summary>
         /// Internal SendGridInstantMessage over XMLRPC method.
         /// </summary>
-        /// <remarks>
-        /// This is called from within a dedicated thread.
-        /// </remarks>
-        private void SendGridInstantMessageViaXMLRPCAsync(GridInstantMessage im, MessageResultNotification result)
+
+        /// <param name="prevRegionHandle">
+        /// Pass in 0 the first time this method is called.  It will be called recursively with the last 
+        /// regionhandle tried
+        /// </param>
+        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;
             UUID regionID;
-            bool needToLookupAgent;
+            bool lookupAgent = false;
 
             lock (m_UserRegionMap)
-                needToLookupAgent = !m_UserRegionMap.TryGetValue(toAgentID, out regionID);
-
-            while (true)
             {
-                if (needToLookupAgent)
+                if (m_UserRegionMap.ContainsKey(toAgentID))
                 {
-                    PresenceInfo[] presences = PresenceService.GetAgents(new string[] { toAgentID.ToString() }); 
+                    upd = new PresenceInfo();
+                    upd.RegionID = m_UserRegionMap[toAgentID];
 
-                    UUID foundRegionID = UUID.Zero;
-
-                    if (presences != null)
+                    // We need to compare the current regionhandle with the previous region handle
+                    // or the recursive loop will never end because it will never try to lookup the agent again
+                    if (prevRegionID == upd.RegionID)
                     {
-                        foreach (PresenceInfo p in presences)
-                        {
-                            if (p.RegionID != UUID.Zero)
-                            {
-                                foundRegionID = p.RegionID;
-                                break;
-                            }
-                        }
+                        lookupAgent = true;
                     }
-
-                    // If not found or the found region is the same as the last lookup, then message is undeliverable
-                    if (foundRegionID == UUID.Zero || foundRegionID == regionID)
-                        break;
-                    else
-                        regionID = foundRegionID;
                 }
-
-                GridRegion reginfo = m_Scenes[0].GridService.GetRegionByUUID(m_Scenes[0].RegionInfo.ScopeID, regionID);
-                if (reginfo == null)
+                else
                 {
-                    m_log.WarnFormat("[GRID INSTANT MESSAGE]: Unable to find region {0}", regionID);
-                    break;
+                    lookupAgent = true;
                 }
+            }
 
-                // Try to send the message to the agent via the retrieved region.
-                Hashtable msgdata = ConvertGridInstantMessageToXMLRPC(im);
-                msgdata["region_handle"] = 0;
-                bool imresult = doIMSending(reginfo, msgdata);
 
-                // If the message delivery was successful, then cache the entry.
-                if (imresult)
+            // Are we needing to look-up an agent?
+            if (lookupAgent)
+            {
+                // Non-cached user agent lookup.
+                PresenceInfo[] presences = PresenceService.GetAgents(new string[] { toAgentID.ToString() });
+                if (presences != null && presences.Length > 0)
                 {
-                    lock (m_UserRegionMap)
+                    foreach (PresenceInfo p in presences)
                     {
-                        m_UserRegionMap[toAgentID] = regionID;
+                        if (p.RegionID != UUID.Zero)
+                        {
+                            upd = p;
+                            break;
+                        }
                     }
-                    result(true);
-                    return;
                 }
 
-                // If we reach this point in the first iteration of the while, then we may have unsuccessfully tried
-                // to use a locally cached region ID.  All subsequent attempts need to lookup agent details from
-                // the presence service.
-                needToLookupAgent = true;
+                if (upd != null)
+                {
+                    // check if we've tried this before..
+                    // This is one way to end the recursive loop
+                    //
+                    if (upd.RegionID == prevRegionID)
+                    {
+                        // m_log.Error("[GRID INSTANT MESSAGE]: Unable to deliver an instant message");
+                        HandleUndeliverableMessage(im, result);
+                        return;
+                    }
+                }
+                else
+                {
+                    // m_log.Error("[GRID INSTANT MESSAGE]: Unable to deliver an instant message");
+                    HandleUndeliverableMessage(im, result);
+                    return;
+                }
             }
 
-            // If we reached this point then the message was not deliverable.  Remove the bad cache entry and 
-            // signal the delivery failure.
-            lock (m_UserRegionMap)
-                m_UserRegionMap.Remove(toAgentID);
+            if (upd != null)
+            {
+                GridRegion reginfo = m_Scenes[0].GridService.GetRegionByUUID(UUID.Zero,
+                    upd.RegionID);
+                if (reginfo != null)
+                {
+                    Hashtable msgdata = ConvertGridInstantMessageToXMLRPC(im);
+                    // Not actually used anymore, left in for compatibility
+                    // Remove at next interface change
+                    //
+                    msgdata["region_handle"] = 0;
+                    bool imresult = doIMSending(reginfo, msgdata);
+                    if (imresult)
+                    {
+                        // IM delivery successful, so store the Agent's location in our local cache.
+                        lock (m_UserRegionMap)
+                        {
+                            if (m_UserRegionMap.ContainsKey(toAgentID))
+                            {
+                                m_UserRegionMap[toAgentID] = upd.RegionID;
+                            }
+                            else
+                            {
+                                m_UserRegionMap.Add(toAgentID, upd.RegionID);
+                            }
+                        }
+                        result(true);
+                    }
+                    else
+                    {
+                        // try again, but lookup user this time.
+                        // Warning, this must call the Async version
+                        // of this method or we'll be making thousands of threads
+                        // The version within the spawned thread is SendGridInstantMessageViaXMLRPCAsync
+                        // The version that spawns the thread is SendGridInstantMessageViaXMLRPC
 
-            // m_log.Error("[GRID INSTANT MESSAGE]: Unable to deliver an instant message");
-            HandleUndeliverableMessage(im, result);
+                        // This is recursive!!!!!
+                        SendGridInstantMessageViaXMLRPCAsync(im, result,
+                                upd.RegionID);
+                    }
+                }
+                else
+                {
+                    m_log.WarnFormat("[GRID INSTANT MESSAGE]: Unable to find region {0}", upd.RegionID);
+                    HandleUndeliverableMessage(im, result);
+                }
+            }
+            else
+            {
+                HandleUndeliverableMessage(im, result);
+            }
         }
 
         /// <summary>
@@ -622,8 +730,9 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
             gim["position_z"] = msg.Position.Z.ToString();
             gim["region_id"] = new UUID(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 9cdb1c2..ac89f52 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
@@ -39,6 +39,13 @@ using OpenSim.Region.Framework.Scenes;
 
 namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
 {
+    public struct SendReply
+    {
+        public bool Success;
+        public string Message;
+        public int Disposition;
+    }
+
     [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "OfflineMessageModule")]
     public class OfflineMessageModule : ISharedRegionModule
     {
@@ -49,6 +56,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
         private string m_RestURL = String.Empty;
         IMessageTransferModule m_TransferModule = null;
         private bool m_ForwardOfflineGroupMessages = true;
+        private Dictionary<IClientAPI, List<UUID>> m_repliesSent= new Dictionary<IClientAPI, List<UUID>>();
 
         public void Initialise(IConfigSource config)
         {
@@ -168,11 +176,21 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
         private void OnNewClient(IClientAPI client)
         {
             client.OnRetrieveInstantMessages += RetrieveInstantMessages;
+            client.OnLogout += OnClientLoggedOut;
+        }
+
+        public void OnClientLoggedOut(IClientAPI client)
+        {
+            m_repliesSent.Remove(client);
         }
 
         private void RetrieveInstantMessages(IClientAPI client)
         {
-            if (m_RestURL != "")
+            if (m_RestURL == String.Empty)
+            {
+                return;
+            }
+            else
             {
                 m_log.DebugFormat("[OFFLINE MESSAGING]: Retrieving stored messages for {0}", client.AgentId);
 
@@ -180,28 +198,28 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
                     = SynchronousRestObjectRequester.MakeRequest<UUID, List<GridInstantMessage>>(
                         "POST", m_RestURL + "/RetrieveMessages/", client.AgentId);
 
-                if (msglist == null)
+                if (msglist != null)
                 {
-                    m_log.WarnFormat("[OFFLINE MESSAGING]: WARNING null message list.");
-                    return;
-                }
-
-                foreach (GridInstantMessage im in msglist)
-                {
-                    if (im.dialog == (byte)InstantMessageDialog.InventoryOffered)
-                        // send it directly or else the item will be given twice
-                        client.SendInstantMessage(im);
-                    else
+                    foreach (GridInstantMessage im in msglist)
                     {
-                        // Send through scene event manager so all modules get a chance
-                        // to look at this message before it gets delivered.
-                        //
-                        // Needed for proper state management for stored group
-                        // invitations
-                        //
-                        Scene s = FindScene(client.AgentId);
-                        if (s != null)
-                            s.EventManager.TriggerIncomingInstantMessage(im);
+                        if (im.dialog == (byte)InstantMessageDialog.InventoryOffered)
+                            // send it directly or else the item will be given twice
+                            client.SendInstantMessage(im);
+                        else
+                        {
+                            // Send through scene event manager so all modules get a chance
+                            // to look at this message before it gets delivered.
+                            //
+                            // Needed for proper state management for stored group
+                            // invitations
+                            //
+
+                            im.offline = 1;
+
+                            Scene s = FindScene(client.AgentId);
+                            if (s != null)
+                                s.EventManager.TriggerIncomingInstantMessage(im);
+                        }
                     }
                 }
             }
@@ -213,7 +231,8 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
                 im.dialog != (byte)InstantMessageDialog.MessageFromAgent &&
                 im.dialog != (byte)InstantMessageDialog.GroupNotice &&
                 im.dialog != (byte)InstantMessageDialog.GroupInvitation &&
-                im.dialog != (byte)InstantMessageDialog.InventoryOffered)
+                im.dialog != (byte)InstantMessageDialog.InventoryOffered &&
+                im.dialog != (byte)InstantMessageDialog.TaskInventoryOffered)
             {
                 return;
             }
@@ -225,8 +244,13 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
                     return;
             }
 
-            bool success = SynchronousRestObjectRequester.MakeRequest<GridInstantMessage, bool>(
-                    "POST", m_RestURL+"/SaveMessage/", im, 10000);
+            Scene scene = FindScene(new UUID(im.fromAgentID));
+            if (scene == null)
+                scene = m_SceneList[0];
+
+            SendReply reply = SynchronousRestObjectRequester.MakeRequest<GridInstantMessage, SendReply>(
+                    "POST", m_RestURL+"/SaveMessage/?scope=" +
+                    scene.RegionInfo.ScopeID.ToString(), im);
 
             if (im.dialog == (byte)InstantMessageDialog.MessageFromAgent)
             {
@@ -234,13 +258,38 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
                 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()));
+                if (reply.Message == String.Empty)
+                    reply.Message = "User is not logged in. " + (reply.Success ? "Message saved." : "Message not saved");
+
+                bool sendReply = true;
+
+                switch (reply.Disposition)
+                {
+                case 0: // Normal
+                    break;
+                case 1: // Only once per user
+                    if (m_repliesSent.ContainsKey(client) && m_repliesSent[client].Contains(new UUID(im.toAgentID)))
+                    {
+                        sendReply = false;
+                    }
+                    else
+                    {
+                        if (!m_repliesSent.ContainsKey(client))
+                            m_repliesSent[client] = new List<UUID>();
+                        m_repliesSent[client].Add(new UUID(im.toAgentID));
+                    }
+                    break;
+                }
+
+                if (sendReply)
+                {
+                    client.SendInstantMessage(new GridInstantMessage(
+                            null, new UUID(im.toAgentID),
+                            "System", new UUID(im.fromAgentID),
+                            (byte)InstantMessageDialog.MessageFromAgent,
+                            reply.Message,
+                            false, new Vector3()));
+                }
             }
         }
     }
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
index 8847414..8d11d20 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
@@ -565,6 +565,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                 return null;
             }
 
+            return account;
+            /*
             try
             {
                 string encpass = Util.Md5Hash(pass);
@@ -585,6 +587,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                 m_log.ErrorFormat("[INVENTORY ARCHIVER]: Could not authenticate password, {0}", e);
                 return null;
             }
+            */
         }
 
         /// <summary>
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
index bba48cc..2d15b47 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
@@ -165,8 +165,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
                 if (im.binaryBucket.Length < 17) // Invalid
                     return;
             
-                UUID receipientID = new UUID(im.toAgentID);
-                ScenePresence user = scene.GetScenePresence(receipientID);
+                UUID recipientID = new UUID(im.toAgentID);
+                ScenePresence user = scene.GetScenePresence(recipientID);
                 UUID copyID;
 
                 // First byte is the asset type
@@ -181,7 +181,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
                         folderID, new UUID(im.toAgentID));
                     
                     InventoryFolderBase folderCopy
-                        = scene.GiveInventoryFolder(client, receipientID, client.AgentId, folderID, UUID.Zero);
+                        = scene.GiveInventoryFolder(client, recipientID, client.AgentId, folderID, UUID.Zero);
                     
                     if (folderCopy == null)
                     {
@@ -239,6 +239,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
                     im.imSessionID = copyID.Guid;
                 }
 
+                im.offline = 0;
+
                 // Send the IM to the recipient. The item is already
                 // in their inventory, so it will not be lost if
                 // they are offline.
@@ -258,8 +260,42 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
                         });
                 }
             }
-            else if (im.dialog == (byte) InstantMessageDialog.InventoryAccepted)
+            else if (im.dialog == (byte) InstantMessageDialog.InventoryAccepted ||
+                     im.dialog == (byte) InstantMessageDialog.TaskInventoryAccepted)
             {
+                UUID inventoryID = new UUID(im.imSessionID); // The inventory item/folder, back from it's trip
+                IInventoryService invService = scene.InventoryService;
+
+                // Special case: folder redirect.
+                // RLV uses this
+                if (im.dialog == (byte) InstantMessageDialog.TaskInventoryAccepted)
+                {
+                    InventoryFolderBase folder = new InventoryFolderBase(inventoryID, client.AgentId);
+                    folder = invService.GetFolder(folder);
+
+                    if (folder != null)
+                    {
+                        if (im.binaryBucket.Length >= 16)
+                        {
+                            UUID destFolderID = new UUID(im.binaryBucket, 0);
+                            if (destFolderID != UUID.Zero)
+                            {
+                                InventoryFolderBase destFolder = new InventoryFolderBase(destFolderID, client.AgentId);
+                                destFolder = invService.GetFolder(destFolder);
+                                if (destFolder != null)
+                                {
+                                    if (folder.ParentID != destFolder.ID)
+                                    {
+                                        folder.ParentID = destFolder.ID;
+                                        invService.MoveFolder(folder);
+                                        client.SendBulkUpdateInventory(folder);
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+
                 ScenePresence user = scene.GetScenePresence(new UUID(im.toAgentID));
 
                 if (user != null) // Local
@@ -269,27 +305,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
                 else
                 {
                     if (m_TransferModule != null)
-                        m_TransferModule.SendInstantMessage(im, delegate(bool success) {
-
-                            // justincc - FIXME: Comment out for now.  This code was added in commit db91044 Mon Aug 22 2011
-                            // and is apparently supposed to fix bulk inventory updates after accepting items.  But
-                            // instead it appears to cause two copies of an accepted folder for the receiving user in
-                            // at least some cases.  Folder/item update is already done when the offer is made (see code above)
-
-//                            // Send BulkUpdateInventory
-//                            IInventoryService invService = scene.InventoryService;
-//                            UUID inventoryEntityID = new UUID(im.imSessionID); // The inventory item /folder, back from it's trip
-//
-//                            InventoryFolderBase folder = new InventoryFolderBase(inventoryEntityID, client.AgentId);
-//                            folder = invService.GetFolder(folder);
-//
-//                            ScenePresence fromUser = scene.GetScenePresence(new UUID(im.fromAgentID));
-//
-//                            // If the user has left the scene by the time the message comes back then we can't send
-//                            // them the update.
-//                            if (fromUser != null)
-//                                fromUser.ControllingClient.SendBulkUpdateInventory(folder);
-                        });
+                        m_TransferModule.SendInstantMessage(im, delegate(bool success) {});
                 }
             }
 
@@ -402,6 +418,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
                         previousParentFolderID = folder.ParentID;
                         folder.ParentID = trashFolder.ID;
                         invService.MoveFolder(folder);
+                        client.SendBulkUpdateInventory(folder);
                     }
                 }
                 
@@ -475,32 +492,100 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
             // Find agent to deliver to
             //
             ScenePresence user = scene.GetScenePresence(new UUID(im.toAgentID));
+            if (user == null)
+                return;
 
-            if (user != null)
+            // 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)
             {
-                user.ControllingClient.SendInstantMessage(im);
+                if (im.binaryBucket.Length < 17) // Invalid
+                    return;
+            
+                UUID recipientID = new UUID(im.toAgentID);
 
-                if (im.dialog == (byte)InstantMessageDialog.InventoryOffered)
-                {
-                    AssetType assetType = (AssetType)im.binaryBucket[0];
-                    UUID inventoryID = new UUID(im.binaryBucket, 1);
+                // First byte is the asset type
+                AssetType assetType = (AssetType)im.binaryBucket[0];
                 
-                    IInventoryService invService = scene.InventoryService;
-                    InventoryNodeBase node = null;
-                    if (AssetType.Folder == assetType)
+                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);
+
+                    InventoryItemBase given =
+                            new InventoryItemBase(itemID, recipientID);
+                    InventoryItemBase item =
+                            scene.InventoryService.GetItem(given);
+
+                    if (item != null)
                     {
-                        InventoryFolderBase folder = new InventoryFolderBase(inventoryID, new UUID(im.toAgentID));
-                        node = invService.GetFolder(folder);
+                        user.ControllingClient.SendBulkUpdateInventory(item);
                     }
-                    else
+                }
+                user.ControllingClient.SendInstantMessage(im);
+            }
+            if (im.dialog == (byte) InstantMessageDialog.TaskInventoryOffered)
+            {
+                if (im.binaryBucket.Length < 1) // Invalid
+                    return;
+            
+                UUID recipientID = new UUID(im.toAgentID);
+
+                // Bucket is the asset type
+                AssetType assetType = (AssetType)im.binaryBucket[0];
+                
+                if (AssetType.Folder == assetType)
+                {
+                    UUID folderID = new UUID(im.imSessionID);
+
+                    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.imSessionID);
+
+                    InventoryItemBase given =
+                            new InventoryItemBase(itemID, recipientID);
+                    InventoryItemBase item =
+                            scene.InventoryService.GetItem(given);
+
+                    if (item != null)
                     {
-                        InventoryItemBase item = new InventoryItemBase(inventoryID, new UUID(im.toAgentID));
-                        node = invService.GetItem(item);
+                        user.ControllingClient.SendBulkUpdateInventory(item);
                     }
-
-                    if (node != null)
-                        user.ControllingClient.SendBulkUpdateInventory(node);
                 }
+
+                // Fix up binary bucket since this may be 17 chars long here
+                Byte[] bucket = new Byte[1];
+                bucket[0] = im.binaryBucket[0];
+                im.binaryBucket = bucket;
+
+                user.ControllingClient.SendInstantMessage(im);
+            }
+            else if (im.dialog == (byte) InstantMessageDialog.InventoryAccepted ||
+                     im.dialog == (byte) InstantMessageDialog.InventoryDeclined ||
+                     im.dialog == (byte) InstantMessageDialog.TaskInventoryDeclined ||
+                     im.dialog == (byte) InstantMessageDialog.TaskInventoryAccepted)
+            {
+                user.ControllingClient.SendInstantMessage(im);
             }
         }
     }
diff --git a/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs b/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
index 465ffbc..c517a30 100644
--- a/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
@@ -163,16 +163,29 @@ namespace OpenSim.Region.CoreModules.Avatar.Lure
                     scene.RegionInfo.RegionHandle,
                     (uint)presence.AbsolutePosition.X,
                     (uint)presence.AbsolutePosition.Y,
-                    (uint)Math.Ceiling(presence.AbsolutePosition.Z));
+                    (uint)presence.AbsolutePosition.Z + 2);
 
             m_log.DebugFormat("[LURE MODULE]: TP invite with message {0}, type {1}", message, lureType);
 
-            GridInstantMessage m = new GridInstantMessage(scene, client.AgentId,
-                    client.FirstName+" "+client.LastName, targetid,
-                    (byte)InstantMessageDialog.RequestTeleport, false,
-                    message, dest, false, presence.AbsolutePosition,
-                    new Byte[0], true);
-                    
+            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], true);
+            }
+            else
+            {
+                m = new GridInstantMessage(scene, client.AgentId,
+                        client.FirstName+" "+client.LastName, targetid,
+                        (byte)InstantMessageDialog.RequestTeleport, false,
+                        message, dest, false, presence.AbsolutePosition,
+                        new Byte[0], true);
+            }
+
             if (m_TransferModule != null)
             {
                 m_TransferModule.SendInstantMessage(m,
@@ -207,7 +220,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/Avatar/UserProfiles/UserProfileModule.cs b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
index c20369c..4d1611c 100644
--- a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
@@ -288,10 +288,6 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
             // Notes
             client.AddGenericPacketHandler("avatarnotesrequest", NotesRequest);
             client.OnAvatarNotesUpdate += NotesUpdate;
-
-            // Preferences
-            client.OnUserInfoRequest += UserPreferencesRequest;
-            client.OnUpdateUserInfo += UpdateUserPreferences;
         }
         #endregion Region Event Handlers
 
@@ -873,6 +869,7 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
         }
         #endregion Notes
 
+
         #region User Preferences
         /// <summary>
         /// Updates the user preferences.
@@ -1402,5 +1399,182 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
             return null;
         }
         #endregion Util
+
+        #region Web Util
+        /// <summary>
+        /// Sends json-rpc request with a serializable type.
+        /// </summary>
+        /// <returns>
+        /// OSD Map.
+        /// </returns>
+        /// <param name='parameters'>
+        /// Serializable type .
+        /// </param>
+        /// <param name='method'>
+        /// Json-rpc method to call.
+        /// </param>
+        /// <param name='uri'>
+        /// URI of json-rpc service.
+        /// </param>
+        /// <param name='jsonId'>
+        /// Id for our call.
+        /// </param>
+        bool JsonRpcRequest(ref object parameters, string method, string uri, string jsonId)
+        {
+            if (jsonId == null)
+                throw new ArgumentNullException ("jsonId");
+            if (uri == null)
+                throw new ArgumentNullException ("uri");
+            if (method == null)
+                throw new ArgumentNullException ("method");
+            if (parameters == null)
+                throw new ArgumentNullException ("parameters");
+
+            // Prep our payload
+            OSDMap json = new OSDMap();
+
+            json.Add("jsonrpc", OSD.FromString("2.0"));
+            json.Add("id", OSD.FromString(jsonId));
+            json.Add("method", OSD.FromString(method));
+
+            json.Add("params", OSD.SerializeMembers(parameters));
+
+            string jsonRequestData = OSDParser.SerializeJsonString(json);
+            byte[] content = Encoding.UTF8.GetBytes(jsonRequestData);
+
+            HttpWebRequest webRequest = (HttpWebRequest)WebRequest.Create(uri);
+
+            webRequest.ContentType = "application/json-rpc";
+            webRequest.Method = "POST";
+
+            Stream dataStream = webRequest.GetRequestStream();
+            dataStream.Write(content, 0, content.Length);
+            dataStream.Close();
+
+            WebResponse webResponse = null;
+            try
+            {
+                webResponse = webRequest.GetResponse();
+            }
+            catch (WebException e)
+            {
+                Console.WriteLine("Web Error" + e.Message);
+                Console.WriteLine ("Please check input");
+                return false;
+            }
+
+            OSDMap mret = new OSDMap();
+
+            using (Stream rstream = webResponse.GetResponseStream())
+            {
+                try
+                {
+                    mret = (OSDMap)OSDParser.DeserializeJson(rstream);
+                }
+                catch (Exception e)
+                {
+                    m_log.DebugFormat("[PROFILES]: JsonRpcRequest Error {0} - remote user with legacy profiles?", e.Message);
+                    if (webResponse != null)
+                        webResponse.Close();
+                    return false;
+                }
+            }
+
+            if (webResponse != null)
+                webResponse.Close();
+
+            if (mret.ContainsKey("error"))
+                return false;
+            
+            // get params...
+            OSD.DeserializeMembers(ref parameters, (OSDMap) mret["result"]);
+            return true;
+        }
+
+        /// <summary>
+        /// Sends json-rpc request with OSD parameter.
+        /// </summary>
+        /// <returns>
+        /// The rpc request.
+        /// </returns>
+        /// <param name='data'>
+        /// data - incoming as parameters, outgong as result/error
+        /// </param>
+        /// <param name='method'>
+        /// Json-rpc method to call.
+        /// </param>
+        /// <param name='uri'>
+        /// URI of json-rpc service.
+        /// </param>
+        /// <param name='jsonId'>
+        /// If set to <c>true</c> json identifier.
+        /// </param>
+        bool JsonRpcRequest(ref OSD data, string method, string uri, string jsonId)
+        {
+            OSDMap map = new OSDMap();
+
+            map["jsonrpc"] = "2.0";
+            if(string.IsNullOrEmpty(jsonId))
+                map["id"] = UUID.Random().ToString();
+            else
+                map["id"] = jsonId;
+
+            map["method"] = method;
+            map["params"] = data;
+
+            string jsonRequestData = OSDParser.SerializeJsonString(map);
+            byte[] content = Encoding.UTF8.GetBytes(jsonRequestData);
+
+            HttpWebRequest webRequest = (HttpWebRequest)WebRequest.Create(uri);
+            webRequest.ContentType = "application/json-rpc";
+            webRequest.Method = "POST";
+
+            Stream dataStream = webRequest.GetRequestStream();
+            dataStream.Write(content, 0, content.Length);
+            dataStream.Close();
+
+            WebResponse webResponse = null;
+            try
+            {
+                webResponse = webRequest.GetResponse();
+            }
+            catch (WebException e)
+            {
+                Console.WriteLine("Web Error" + e.Message);
+                Console.WriteLine ("Please check input");
+                return false;
+            }
+
+            OSDMap response = new OSDMap();
+
+            using (Stream rstream = webResponse.GetResponseStream())
+            {
+                try
+                {
+                    response = (OSDMap)OSDParser.DeserializeJson(rstream);
+                }
+                catch (Exception e)
+                {
+                    m_log.DebugFormat("[PROFILES]: JsonRpcRequest Error {0} - remote user with legacy profiles?", e.Message);
+                    if (webResponse != null)
+                        webResponse.Close();
+                    return false;
+                }
+            }
+
+            if (webResponse != null)
+                webResponse.Close();
+
+            if(response.ContainsKey("error"))
+            {
+                data = response["error"];
+                return false;
+            }
+
+            data = response;
+
+            return true;
+        }
+        #endregion Web Util
     }
 }
diff --git a/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs b/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
index 817ef85..44eee89 100644
--- a/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
@@ -57,7 +57,7 @@ namespace OpenSim.Region.CoreModules.Framework
         /// <summary>
         /// Each agent has its own capabilities handler.
         /// </summary>
-        protected Dictionary<UUID, Caps> m_capsObjects = new Dictionary<UUID, Caps>();
+        protected Dictionary<uint, Caps> m_capsObjects = new Dictionary<uint, Caps>();
         
         protected Dictionary<UUID, string> m_capsPaths = new Dictionary<UUID, string>();
 
@@ -118,23 +118,46 @@ namespace OpenSim.Region.CoreModules.Framework
             get { return null; }
         }
 
-        public void CreateCaps(UUID agentId)
+        public void CreateCaps(UUID agentId, uint circuitCode)
         {
-            if (m_scene.RegionInfo.EstateSettings.IsBanned(agentId))
-                return;
+            int ts = Util.EnvironmentTickCount();
+/*  this as no business here...
+ * must be done elsewhere ( and is )
+            int flags = m_scene.GetUserFlags(agentId);
+
+            m_log.ErrorFormat("[CreateCaps]: banCheck {0} ", Util.EnvironmentTickCountSubtract(ts));
 
+            if (m_scene.RegionInfo.EstateSettings.IsBanned(agentId, flags))
+                return;
+*/
             Caps caps;
             String capsObjectPath = GetCapsPath(agentId);
 
             lock (m_capsObjects)
             {
-                if (m_capsObjects.ContainsKey(agentId))
+                if (m_capsObjects.ContainsKey(circuitCode))
                 {
-                    Caps oldCaps = m_capsObjects[agentId];
-                    
-                    //m_log.WarnFormat(
-                    //    "[CAPS]: Recreating caps for agent {0} in region {1}.  Old caps path {2}, new caps path {3}. ", 
-                    //    agentId, m_scene.RegionInfo.RegionName, oldCaps.CapsObjectPath, capsObjectPath);
+                    Caps oldCaps = m_capsObjects[circuitCode];
+
+
+                    if (capsObjectPath == oldCaps.CapsObjectPath)
+                    {
+                        m_log.WarnFormat(
+                           "[CAPS]: Reusing caps for agent {0} in region {1}.  Old caps path {2}, new caps path {3}. ",
+                            agentId, m_scene.RegionInfo.RegionName, oldCaps.CapsObjectPath, capsObjectPath);
+                        return;
+                    }
+                    else
+                    {
+                        // not reusing  add extra melanie cleanup
+                        // Remove tge handlers. They may conflict with the
+                        // new object created below
+                        oldCaps.DeregisterHandlers();
+
+                        // Better safe ... should not be needed but also 
+                        // no big deal
+                        m_capsObjects.Remove(circuitCode);
+                    }
                 }
 
 //                m_log.DebugFormat(
@@ -145,13 +168,17 @@ namespace OpenSim.Region.CoreModules.Framework
                         (MainServer.Instance == null) ? 0: MainServer.Instance.Port,
                         capsObjectPath, agentId, m_scene.RegionInfo.RegionName);
 
-                m_capsObjects[agentId] = caps;
-            }
+                m_log.ErrorFormat("[CreateCaps]: new caps agent {0}, circuit {1}, path {2}, time {3} ",agentId,
+                    circuitCode,caps.CapsObjectPath, Util.EnvironmentTickCountSubtract(ts));
 
+                m_capsObjects[circuitCode] = caps;
+            }
             m_scene.EventManager.TriggerOnRegisterCaps(agentId, caps);
+//            m_log.ErrorFormat("[CreateCaps]: end {0} ", Util.EnvironmentTickCountSubtract(ts));
+
         }
 
-        public void RemoveCaps(UUID agentId)
+        public void RemoveCaps(UUID agentId, uint circuitCode)
         {
             m_log.DebugFormat("[CAPS]: Remove caps for agent {0} in region {1}", agentId, m_scene.RegionInfo.RegionName);
             lock (m_childrenSeeds)
@@ -164,14 +191,24 @@ namespace OpenSim.Region.CoreModules.Framework
 
             lock (m_capsObjects)
             {
-                if (m_capsObjects.ContainsKey(agentId))
+                if (m_capsObjects.ContainsKey(circuitCode))
                 {
-                    m_capsObjects[agentId].DeregisterHandlers();
-                    m_scene.EventManager.TriggerOnDeregisterCaps(agentId, m_capsObjects[agentId]);
-                    m_capsObjects.Remove(agentId);
+                    m_capsObjects[circuitCode].DeregisterHandlers();
+                    m_scene.EventManager.TriggerOnDeregisterCaps(agentId, m_capsObjects[circuitCode]);
+                    m_capsObjects.Remove(circuitCode);
                 }
                 else
                 {
+                    foreach (KeyValuePair<uint, Caps> kvp in m_capsObjects)
+                    {
+                        if (kvp.Value.AgentID == agentId)
+                        {
+                            kvp.Value.DeregisterHandlers();
+                            m_scene.EventManager.TriggerOnDeregisterCaps(agentId, kvp.Value);
+                            m_capsObjects.Remove(kvp.Key);
+                            return;
+                        }
+                    }
                     m_log.WarnFormat(
                         "[CAPS]: Received request to remove CAPS handler for root agent {0} in {1}, but no such CAPS handler found!",
                         agentId, m_scene.RegionInfo.RegionName);
@@ -179,19 +216,30 @@ namespace OpenSim.Region.CoreModules.Framework
             }
         }
         
-        public Caps GetCapsForUser(UUID agentId)
+        public Caps GetCapsForUser(uint circuitCode)
         {
             lock (m_capsObjects)
             {
-                if (m_capsObjects.ContainsKey(agentId))
+                if (m_capsObjects.ContainsKey(circuitCode))
                 {
-                    return m_capsObjects[agentId];
+                    return m_capsObjects[circuitCode];
                 }
             }
             
             return null;
         }
         
+        public void ActivateCaps(uint circuitCode)
+        {
+            lock (m_capsObjects)
+            {
+                if (m_capsObjects.ContainsKey(circuitCode))
+                {
+                    m_capsObjects[circuitCode].Activate();
+                }
+            }
+        }
+
         public void SetAgentCapsSeeds(AgentCircuitData agent)
         {
             lock (m_capsPaths)
@@ -289,9 +337,9 @@ namespace OpenSim.Region.CoreModules.Framework
 
             lock (m_capsObjects)
             {
-                foreach (KeyValuePair<UUID, Caps> kvp in m_capsObjects)
+                foreach (KeyValuePair<uint, Caps> kvp in m_capsObjects)
                 {
-                    capsReport.AppendFormat("** User {0}:\n", kvp.Key);
+                    capsReport.AppendFormat("** Circuit {0}:\n", kvp.Key);
                     Caps caps = kvp.Value;
 
                     for (IDictionaryEnumerator kvp2 = caps.CapsHandlers.GetCapsDetails(false, null).GetEnumerator(); kvp2.MoveNext(); )
@@ -339,6 +387,7 @@ namespace OpenSim.Region.CoreModules.Framework
 
         private void BuildDetailedStatsByCapReport(StringBuilder sb, string capName)
         {
+            /*
             sb.AppendFormat("Capability name {0}\n", capName);
 
             ConsoleDisplayTable cdt = new ConsoleDisplayTable();
@@ -384,10 +433,12 @@ namespace OpenSim.Region.CoreModules.Framework
             }
 
             sb.Append(cdt.ToString());
+            */
         }
 
         private void BuildSummaryStatsByCapReport(StringBuilder sb)
         {
+            /*
             ConsoleDisplayTable cdt = new ConsoleDisplayTable();
             cdt.AddColumn("Name", 34);
             cdt.AddColumn("Req Received", 12);
@@ -444,10 +495,12 @@ namespace OpenSim.Region.CoreModules.Framework
                 cdt.AddRow(kvp.Key, kvp.Value, handledStats[kvp.Key]);
 
             sb.Append(cdt.ToString());
+            */
         }
 
         private void HandleShowCapsStatsByUserCommand(string module, string[] cmdParams)
         {
+            /*
             if (SceneManager.Instance.CurrentScene != null && SceneManager.Instance.CurrentScene != m_scene)
                 return;
 
@@ -478,10 +531,12 @@ namespace OpenSim.Region.CoreModules.Framework
             }
 
             MainConsole.Instance.Output(sb.ToString());
+            */
         }
 
         private void BuildDetailedStatsByUserReport(StringBuilder sb, ScenePresence sp)
         {
+            /*
             sb.AppendFormat("Avatar name {0}, type {1}\n", sp.Name, sp.IsChildAgent ? "child" : "root");
 
             ConsoleDisplayTable cdt = new ConsoleDisplayTable();
@@ -507,10 +562,12 @@ namespace OpenSim.Region.CoreModules.Framework
                 cdt.AddRow(ctr.Name, ctr.RequestsReceived, ctr.RequestsHandled);            
 
             sb.Append(cdt.ToString());
+            */
         }
 
         private void BuildSummaryStatsByUserReport(StringBuilder sb)
         {
+            /*
             ConsoleDisplayTable cdt = new ConsoleDisplayTable();
             cdt.AddColumn("Name", 32);
             cdt.AddColumn("Type", 5);
@@ -550,6 +607,7 @@ namespace OpenSim.Region.CoreModules.Framework
             );
 
             sb.Append(cdt.ToString());
+            */
         }
 
         private class CapTableRow
@@ -566,4 +624,4 @@ namespace OpenSim.Region.CoreModules.Framework
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index f3acff2..3cbde62 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -154,13 +154,19 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             // Add this agent in this region as a banned person
             public void Add(ulong pRegionHandle, UUID pAgentID)
             {
+                this.Add(pRegionHandle, pAgentID, 45, 15);
+            }
+
+            public void Add(ulong pRegionHandle, UUID pAgentID, double newTime, double extendTime)
+            {
                 if (!m_bannedRegions.TryGetValue(pAgentID, out m_idCache))
                 {
                     m_idCache = new ExpiringCache<ulong, DateTime>();
-                    m_bannedRegions.Add(pAgentID, m_idCache, TimeSpan.FromSeconds(45));
+                    m_bannedRegions.Add(pAgentID, m_idCache, TimeSpan.FromSeconds(newTime));
                 }
-                m_idCache.Add(pRegionHandle, DateTime.Now + TimeSpan.FromSeconds(15), TimeSpan.FromSeconds(15));
+                m_idCache.Add(pRegionHandle, DateTime.Now + TimeSpan.FromSeconds(extendTime), TimeSpan.FromSeconds(extendTime));
             }
+
             // Remove the agent from the region's banned list
             public void Remove(ulong pRegionHandle, UUID pAgentID)
             {
@@ -170,6 +176,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 }
             }
         }
+
         private BannedRegionCache m_bannedRegionCache = new BannedRegionCache();
 
         private IEventQueue m_eqModule;
@@ -491,16 +498,20 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             }
 
             // TODO: Get proper AVG Height
-            float localAVHeight = 1.56f;
+            float localHalfAVHeight = 0.8f;
+            if (sp.Appearance != null)
+                localHalfAVHeight = sp.Appearance.AvatarHeight / 2;
+
             float posZLimit = 22;
 
             // TODO: Check other Scene HeightField
             posZLimit = (float)sp.Scene.Heightmap[(int)position.X, (int)position.Y];
 
-            float newPosZ = posZLimit + localAVHeight;
-            if (posZLimit >= (position.Z - (localAVHeight / 2)) && !(Single.IsInfinity(newPosZ) || Single.IsNaN(newPosZ)))
+            posZLimit += localHalfAVHeight + 0.1f;
+
+            if ((position.Z < posZLimit) && !(Single.IsInfinity(posZLimit) || Single.IsNaN(posZLimit)))
             {
-                position.Z = newPosZ;
+                position.Z = posZLimit;
             }
 
             if (sp.Flying)
@@ -599,9 +610,9 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 Util.RegionHandleToRegionLoc(regionHandle, out regX, out regY);
 
                 MapBlockData block = new MapBlockData();
-                block.X = (ushort)regX;
-                block.Y = (ushort)regY;
-                block.Access = (byte)SimAccess.Down;
+                block.X = (ushort)(regX);
+                block.Y = (ushort)(regY);
+                block.Access = (byte)SimAccess.Down; // == not there
 
                 List<MapBlockData> blocks = new List<MapBlockData>();
                 blocks.Add(block);
@@ -736,10 +747,6 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 return;
             }
 
-            uint newRegionX, newRegionY, oldRegionX, oldRegionY;
-            Util.RegionHandleToRegionLoc(reg.RegionHandle, out newRegionX, out newRegionY);
-            Util.RegionHandleToRegionLoc(sp.Scene.RegionInfo.RegionHandle, out oldRegionX, out oldRegionY);
-
             ulong destinationHandle = finalDestination.RegionHandle;
 
             // Let's do DNS resolution only once in this process, please!
@@ -808,7 +815,12 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             AgentCircuitData agentCircuit = sp.ControllingClient.RequestClientInfo();
             agentCircuit.startpos = position;
             agentCircuit.child = true;
-            agentCircuit.Appearance = sp.Appearance;
+            
+//            agentCircuit.Appearance = sp.Appearance;
+//            agentCircuit.Appearance = new AvatarAppearance(sp.Appearance, true, false);
+            agentCircuit.Appearance = new AvatarAppearance();
+            agentCircuit.Appearance.AvatarHeight = sp.Appearance.AvatarHeight;
+
             if (currentAgentCircuit != null)
             {
                 agentCircuit.ServiceURLs = currentAgentCircuit.ServiceURLs;
@@ -819,14 +831,41 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 agentCircuit.Id0 = currentAgentCircuit.Id0;
             }
 
-            // if (NeedsNewAgent(sp.DrawDistance, oldRegionX, newRegionX, oldRegionY, newRegionY))
-            float dist = (float)Math.Max(sp.Scene.DefaultDrawDistance,
-                (float)Math.Max(sp.Scene.RegionInfo.RegionSizeX, sp.Scene.RegionInfo.RegionSizeY));
-            if (NeedsNewAgent(dist, oldRegionX, newRegionX, oldRegionY, newRegionY))
+            IClientIPEndpoint ipepClient;
+       
+            uint newRegionX, newRegionY, oldRegionX, oldRegionY;
+            Util.RegionHandleToRegionLoc(destinationHandle, out newRegionX, out newRegionY);
+            Util.RegionHandleToRegionLoc(sourceRegion.RegionHandle, out oldRegionX, out oldRegionY);
+            int oldSizeX = (int)sourceRegion.RegionSizeX;
+            int oldSizeY = (int)sourceRegion.RegionSizeY;
+            int newSizeX = finalDestination.RegionSizeX;
+            int newSizeY = finalDestination.RegionSizeY;
+
+            bool OutSideViewRange = NeedsNewAgent(sp.DrawDistance, oldRegionX, newRegionX, oldRegionY, newRegionY,
+                oldSizeX, oldSizeY, newSizeX, newSizeY);
+
+            if (OutSideViewRange)
             {
-                // brand new agent, let's create a new caps seed
+                m_log.DebugFormat(
+                    "[ENTITY TRANSFER MODULE]: Determined that region {0} at {1},{2} needs new child agent for agent {3} from {4}",
+                    finalDestination.RegionName, newRegionX, newRegionY, sp.Name, Scene.Name);
+
+                //sp.ControllingClient.SendTeleportProgress(teleportFlags, "Creating agent...");
+                #region IP Translation for NAT
+                // Uses ipepClient above
+                if (sp.ClientView.TryGet(out ipepClient))
+                {
+                    endPoint.Address = NetworkUtil.GetIPFor(ipepClient.EndPoint, endPoint.Address);
+                }
+                #endregion
                 agentCircuit.CapsPath = CapsUtil.GetRandomCapsObjectPath();
             }
+            else
+            {
+                agentCircuit.CapsPath = sp.Scene.CapsModule.GetChildSeed(sp.UUID, reg.RegionHandle);
+                if (agentCircuit.CapsPath == null)
+                    agentCircuit.CapsPath = CapsUtil.GetRandomCapsObjectPath();
+            }
 
             // We're going to fallback to V1 if the destination gives us anything smaller than 0.2 or we're forcing
             // use of the earlier protocol
@@ -836,13 +875,13 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 float.TryParse(versionComponents[1], out versionNumber);
 
             if (versionNumber >= 0.2f && MaxOutgoingTransferVersion >= versionNumber)
-                TransferAgent_V2(sp, agentCircuit, reg, finalDestination, endPoint, teleportFlags, oldRegionX, newRegionX, oldRegionY, newRegionY, version, out reason);
+                TransferAgent_V2(sp, agentCircuit, reg, finalDestination, endPoint, teleportFlags, OutSideViewRange , version, out reason);
             else
-                TransferAgent_V1(sp, agentCircuit, reg, finalDestination, endPoint, teleportFlags, oldRegionX, newRegionX, oldRegionY, newRegionY, version, out reason);           
+                TransferAgent_V1(sp, agentCircuit, reg, finalDestination, endPoint, teleportFlags, OutSideViewRange, version, out reason);           
         }
 
         private void TransferAgent_V1(ScenePresence sp, AgentCircuitData agentCircuit, GridRegion reg, GridRegion finalDestination,
-            IPEndPoint endPoint, uint teleportFlags, uint oldRegionX, uint newRegionX, uint oldRegionY, uint newRegionY, string version, out string reason)
+            IPEndPoint endPoint, uint teleportFlags, bool OutSideViewRange, string version, out string reason)
         {
             ulong destinationHandle = finalDestination.RegionHandle;
             AgentCircuitData currentAgentCircuit = sp.Scene.AuthenticateHandler.GetAgentCircuitData(sp.ControllingClient.CircuitCode);
@@ -851,6 +890,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 "[ENTITY TRANSFER MODULE]: Using TP V1 for {0} going from {1} to {2}", 
                 sp.Name, Scene.Name, finalDestination.RegionName);
 
+            string capsPath = finalDestination.ServerURI + CapsUtil.GetCapsSeedPath(agentCircuit.CapsPath);
+
             // Let's create an agent there if one doesn't exist yet. 
             // NOTE: logout will always be false for a non-HG teleport.
             bool logout = false;
@@ -892,28 +933,9 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             m_entityTransferStateMachine.UpdateInTransit(sp.UUID, AgentTransferState.Transferring);
 
             // OK, it got this agent. Let's close some child agents
-            sp.CloseChildAgents(newRegionX, newRegionY);
 
-            IClientIPEndpoint ipepClient;
-            string capsPath = String.Empty;
-            float dist = (float)Math.Max(sp.Scene.DefaultDrawDistance,
-                (float)Math.Max(sp.Scene.RegionInfo.RegionSizeX, sp.Scene.RegionInfo.RegionSizeY));
-            if (NeedsNewAgent(dist, oldRegionX, newRegionX, oldRegionY, newRegionY))
+            if (OutSideViewRange)
             {
-                m_log.DebugFormat(
-                    "[ENTITY TRANSFER MODULE]: Determined that region {0} at {1},{2} needs new child agent for incoming agent {3} from {4}",
-                    finalDestination.RegionName, newRegionX, newRegionY, sp.Name, Scene.Name);
-
-                //sp.ControllingClient.SendTeleportProgress(teleportFlags, "Creating agent...");
-                #region IP Translation for NAT
-                // Uses ipepClient above
-                if (sp.ClientView.TryGet(out ipepClient))
-                {
-                    endPoint.Address = NetworkUtil.GetIPFor(ipepClient.EndPoint, endPoint.Address);
-                }
-                #endregion
-                capsPath = finalDestination.ServerURI + CapsUtil.GetCapsSeedPath(agentCircuit.CapsPath);
-
                 if (m_eqModule != null)
                 {
                     // The EnableSimulator message makes the client establish a connection with the destination
@@ -943,15 +965,14 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                     sp.ControllingClient.InformClientOfNeighbour(destinationHandle, endPoint);
                 }
             }
-            else
-            {
-                agentCircuit.CapsPath = sp.Scene.CapsModule.GetChildSeed(sp.UUID, reg.RegionHandle);
-                capsPath = finalDestination.ServerURI + CapsUtil.GetCapsSeedPath(agentCircuit.CapsPath);
-            }
 
             // Let's send a full update of the agent. This is a synchronous call.
             AgentData agent = new AgentData();
             sp.CopyTo(agent);
+
+            if ((teleportFlags & (uint)TeleportFlags.IsFlying) != 0)
+                agent.ControlFlags |= (uint)AgentManager.ControlFlags.AGENT_CONTROL_FLY;
+
             agent.Position = agentCircuit.startpos;
             SetCallbackURL(agent, sp.Scene.RegionInfo);
 
@@ -1053,7 +1074,6 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 return;
             }
 
-            m_entityTransferStateMachine.UpdateInTransit(sp.UUID, AgentTransferState.CleaningUp);
 
             // For backwards compatibility
             if (version == "Unknown" || version == string.Empty)
@@ -1063,18 +1083,26 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 CrossAttachmentsIntoNewRegion(finalDestination, sp, true);
             }
 
+            m_entityTransferStateMachine.UpdateInTransit(sp.UUID, AgentTransferState.CleaningUp);
+
+
             // May need to logout or other cleanup
-            AgentHasMovedAway(sp, logout);
+//            AgentHasMovedAway(sp, logout);
+//            AgentHasMovedAway(sp, true); // until logout use is checked
 
             // Well, this is it. The agent is over there.
-            KillEntity(sp.Scene, sp.LocalId);
+//            KillEntity(sp.Scene, sp.LocalId);
+
+            sp.HasMovedAway(!OutSideViewRange);
+
+            sp.CloseChildAgents(destinationHandle,finalDestination.RegionSizeX,finalDestination.RegionSizeY);
 
             // Now let's make it officially a child agent
-            sp.MakeChildAgent();
+            sp.MakeChildAgent(destinationHandle);
 
             // Finally, let's close this previously-known-as-root agent, when the jump is outside the view zone
 
-            if (NeedsClosing(sp.Scene.DefaultDrawDistance, oldRegionX, newRegionX, oldRegionY, newRegionY, reg))
+            if (OutSideViewRange)
             {
                 if (!sp.Scene.IncomingPreCloseClient(sp))
                     return;
@@ -1089,19 +1117,16 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
                 sp.Scene.CloseAgent(sp.UUID, false);
             }
-            else
-            {
-                // now we have a child agent in this region. 
-                sp.Reset();
-            }
         }
 
         private void TransferAgent_V2(ScenePresence sp, AgentCircuitData agentCircuit, GridRegion reg, GridRegion finalDestination,
-            IPEndPoint endPoint, uint teleportFlags, uint oldRegionX, uint newRegionX, uint oldRegionY, uint newRegionY, string version, out string reason)
+            IPEndPoint endPoint, uint teleportFlags, bool OutSideViewRange, string version, out string reason)
         {
             ulong destinationHandle = finalDestination.RegionHandle;
             AgentCircuitData currentAgentCircuit = sp.Scene.AuthenticateHandler.GetAgentCircuitData(sp.ControllingClient.CircuitCode);
 
+            string capsPath = finalDestination.ServerURI + CapsUtil.GetCapsSeedPath(agentCircuit.CapsPath);;
+
             // Let's create an agent there if one doesn't exist yet. 
             // NOTE: logout will always be false for a non-HG teleport.
             bool logout = false;
@@ -1142,32 +1167,6 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             // Past this point we have to attempt clean up if the teleport fails, so update transfer state.
             m_entityTransferStateMachine.UpdateInTransit(sp.UUID, AgentTransferState.Transferring);
 
-            IClientIPEndpoint ipepClient;
-            string capsPath = String.Empty;
-            float dist = (float)Math.Max(sp.Scene.DefaultDrawDistance, 
-                (float)Math.Max(sp.Scene.RegionInfo.RegionSizeX, sp.Scene.RegionInfo.RegionSizeY));
-            if (NeedsNewAgent(dist, oldRegionX, newRegionX, oldRegionY, newRegionY))
-            {
-                m_log.DebugFormat(
-                    "[ENTITY TRANSFER MODULE]: Determined that region {0} at {1},{2} needs new child agent for agent {3} from {4}",
-                    finalDestination.RegionName, newRegionX, newRegionY, sp.Name, Scene.Name);
-
-                //sp.ControllingClient.SendTeleportProgress(teleportFlags, "Creating agent...");
-                #region IP Translation for NAT
-                // Uses ipepClient above
-                if (sp.ClientView.TryGet(out ipepClient))
-                {
-                    endPoint.Address = NetworkUtil.GetIPFor(ipepClient.EndPoint, endPoint.Address);
-                }
-                #endregion
-                capsPath = finalDestination.ServerURI + CapsUtil.GetCapsSeedPath(agentCircuit.CapsPath);
-            }
-            else
-            {
-                agentCircuit.CapsPath = sp.Scene.CapsModule.GetChildSeed(sp.UUID, reg.RegionHandle);
-                capsPath = finalDestination.ServerURI + CapsUtil.GetCapsSeedPath(agentCircuit.CapsPath);
-            }
-
             // We need to set this here to avoid an unlikely race condition when teleporting to a neighbour simulator,
             // where that neighbour simulator could otherwise request a child agent create on the source which then 
             // closes our existing agent which is still signalled as root.
@@ -1189,6 +1188,10 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             AgentData agent = new AgentData();
             sp.CopyTo(agent);
             agent.Position = agentCircuit.startpos;
+
+            if ((teleportFlags & (uint)TeleportFlags.IsFlying) != 0)
+                agent.ControlFlags |= (uint)AgentManager.ControlFlags.AGENT_CONTROL_FLY;
+
             agent.SenderWantsToWaitForRoot = true;
             //SetCallbackURL(agent, sp.Scene.RegionInfo);
 
@@ -1224,25 +1227,25 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             
             m_entityTransferStateMachine.UpdateInTransit(sp.UUID, AgentTransferState.CleaningUp);
 
+            sp.HasMovedAway(!OutSideViewRange);
+
             // Need to signal neighbours whether child agents may need closing irrespective of whether this
             // one needed closing.  We also need to close child agents as quickly as possible to avoid complicated
             // race conditions with rapid agent releporting (e.g. from A1 to a non-neighbour B, back
             // to a neighbour A2 then off to a non-neighbour C).  Closing child agents any later requires complex
             // distributed checks to avoid problems in rapid reteleporting scenarios and where child agents are
             // abandoned without proper close by viewer but then re-used by an incoming connection.
-            sp.CloseChildAgents(newRegionX, newRegionY);
-
-            // May need to logout or other cleanup
-            AgentHasMovedAway(sp, logout);
+            sp.CloseChildAgents(destinationHandle, finalDestination.RegionSizeX, finalDestination.RegionSizeY);
 
+//            AgentHasMovedAway(sp, true);
             // Well, this is it. The agent is over there.
-            KillEntity(sp.Scene, sp.LocalId);
+//            KillEntity(sp.Scene, sp.LocalId);
 
             // Now let's make it officially a child agent
-            sp.MakeChildAgent();
+            sp.MakeChildAgent(destinationHandle);
 
             // Finally, let's close this previously-known-as-root agent, when the jump is outside the view zone
-            if (NeedsClosing(sp.Scene.DefaultDrawDistance, oldRegionX, newRegionX, oldRegionY, newRegionY, reg))
+            if (OutSideViewRange)
             {
                 if (!sp.Scene.IncomingPreCloseClient(sp))
                     return;
@@ -1263,11 +1266,13 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
                 sp.Scene.CloseAgent(sp.UUID, false);
             }
+/*
             else
             {
                 // now we have a child agent in this region. 
                 sp.Reset();
             }
+ */
         }
 
         /// <summary>
@@ -1351,7 +1356,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
         protected virtual void AgentHasMovedAway(ScenePresence sp, bool logout)
         {
             if (sp.Scene.AttachmentsModule != null)
-                sp.Scene.AttachmentsModule.DeleteAttachmentsFromScene(sp, true);
+                sp.Scene.AttachmentsModule.DeleteAttachmentsFromScene(sp, logout);
         }
 
         protected void KillEntity(Scene scene, uint localID)
@@ -1368,7 +1373,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
         // This returns 'true' if the new region already has a child agent for our
         //    incoming agent. The implication is that, if 'false', we have to create  the
         //    child and then teleport into the region.
-        protected virtual bool NeedsNewAgent(float drawdist, uint oldRegionX, uint newRegionX, uint oldRegionY, uint newRegionY)
+        protected virtual bool NeedsNewAgent(float drawdist, uint oldRegionX, uint newRegionX, uint oldRegionY, uint newRegionY,
+            int oldsizeX, int oldsizeY, int newsizeX, int newsizeY)
         {
             if (m_regionCombinerModule != null && m_regionCombinerModule.IsRootForMegaregion(Scene.RegionInfo.RegionID))
             {
@@ -1381,17 +1387,19 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
                 return !(newRegionX >= swCorner.X && newRegionX <= neCorner.X && newRegionY >= swCorner.Y && newRegionY <= neCorner.Y);
             }
-            else
-            {
-                return Util.IsOutsideView(drawdist, oldRegionX, newRegionX, oldRegionY, newRegionY);
-            }
-        }
 
-        protected virtual bool NeedsClosing(float drawdist, uint oldRegionX, uint newRegionX, uint oldRegionY, uint newRegionY, GridRegion reg)
-        {
-            return Util.IsOutsideView(drawdist, oldRegionX, newRegionX, oldRegionY, newRegionY);
+            return Util.IsOutsideView(drawdist, oldRegionX, newRegionX, oldRegionY, newRegionY,
+                    oldsizeX, oldsizeY, newsizeX, newsizeY);
         }
+/*
+        protected virtual bool NeedsClosing(float drawdist, uint oldRegionX, uint newRegionX, uint oldRegionY, uint newRegionY,
+            uint oldsizeX, uint oldsizeY, uint newsizeX, uint newsizeY, GridRegion reg)
+        {
 
+            return Util.IsOutsideView(drawdist, oldRegionX, newRegionX, oldRegionY, newRegionY,
+                oldsizeX, oldsizeY, newsizeX, newsizeY);
+        }
+*/
         #endregion
 
         #region Landmark Teleport
@@ -1472,17 +1480,54 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
         #region Agent Crossings
 
+        public bool checkAgentAccessToRegion(ScenePresence agent, GridRegion destiny, Vector3 position, out string version, out string reason)
+        {
+            reason = String.Empty;
+            version = String.Empty;
+
+            UUID agentID = agent.UUID;
+            ulong destinyHandle = destiny.RegionHandle;
+
+            if (m_bannedRegionCache.IfBanned(destinyHandle, agentID))
+            {
+                reason = "Cannot connect to region";
+                return false;
+            }
+
+            Scene ascene = agent.Scene;
+            string homeURI = ascene.GetAgentHomeURI(agentID);
+            string myversion = string.Format("{0}/{1}", OutgoingTransferVersionName, MaxOutgoingTransferVersion);
+
+
+            if (!ascene.SimulationService.QueryAccess(destiny, agentID, homeURI, false, position,
+                    myversion, agent.Scene.GetFormatsOffered(), out version, out reason))
+            {
+                m_bannedRegionCache.Add(destinyHandle, agentID, 30.0, 30.0);
+                return false;
+            }
+
+            return true;
+        }
+
+        public GridRegion GetDestination(Scene scene, UUID agentID, Vector3 pos, out string version, out Vector3 newpos)
+        {
+            string r = String.Empty;
+            return GetDestination(scene, agentID, pos, out version, out newpos, out r);
+        }
+
         // Given a position relative to the current region (which has previously been tested to
         //    see that it is actually outside the current region), find the new region that the
         //    point is actually in.
         // Returns the coordinates and information of the new region or 'null' of it doesn't exist.
+
+        // now only works for crossings
+
         public GridRegion GetDestination(Scene scene, UUID agentID, Vector3 pos,
                                             out string version, out Vector3 newpos, out string failureReason)
         {
             version = String.Empty;
             newpos = pos;
             failureReason = string.Empty;
-            string homeURI = scene.GetAgentHomeURI(agentID);
 
 //            m_log.DebugFormat(
 //                "[ENTITY TRANSFER MODULE]: Crossing agent {0} at pos {1} in {2}", agent.Name, pos, scene.Name);
@@ -1516,8 +1561,11 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
                 // Check to see if we have access to the target region.
                 string myversion = string.Format("{0}/{1}", OutgoingTransferVersionName, MaxOutgoingTransferVersion);
+                string homeURI = scene.GetAgentHomeURI(agentID);
                 if (neighbourRegion != null
-                    && !scene.SimulationService.QueryAccess(neighbourRegion, agentID, homeURI, false, newpos, myversion, scene.GetFormatsOffered(), out version, out failureReason))
+                    && !scene.SimulationService.QueryAccess(
+                        neighbourRegion, agentID, homeURI, false, newpos, myversion,
+                        new List<UUID>(), out version, out failureReason))
                 {
                     // remember banned
                     m_bannedRegionCache.Add(neighbourRegion.RegionHandle, agentID);
@@ -1547,29 +1595,53 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
         public bool Cross(ScenePresence agent, bool isFlying)
         {
+            agent.IsInTransit = true;
+            CrossAsyncDelegate d = CrossAsync;
+            d.BeginInvoke(agent, isFlying, CrossCompleted, d);
+            return true;
+        }
+
+        private void CrossCompleted(IAsyncResult iar)
+        {
+            CrossAsyncDelegate icon = (CrossAsyncDelegate)iar.AsyncState;
+            ScenePresence agent = icon.EndInvoke(iar);
+
+            m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Crossing agent {0} {1} completed.", agent.Firstname, agent.Lastname);
+
+            if(!agent.IsChildAgent)
+            {
+                // crossing failed
+                agent.CrossToNewRegionFail();
+            }
+            agent.IsInTransit = false;
+        }
+
+        public ScenePresence CrossAsync(ScenePresence agent, bool isFlying)
+        {
+            uint x;
+            uint y;
             Vector3 newpos;
             string version;
             string failureReason;
 
-            GridRegion neighbourRegion = GetDestination(agent.Scene, agent.UUID, agent.AbsolutePosition,
+            Vector3 pos = agent.AbsolutePosition + agent.Velocity;
+
+            GridRegion neighbourRegion = GetDestination(agent.Scene, agent.UUID, pos,
                                                             out version, out newpos, out failureReason);
             if (neighbourRegion == null)
             {
-                agent.ControllingClient.SendAlertMessage(failureReason);
-                return false;
+                if (failureReason != String.Empty)
+                    agent.ControllingClient.SendAlertMessage(failureReason);
+                return agent;
             }
 
-            agent.IsInTransit = true;
-
-            CrossAgentToNewRegionDelegate d = CrossAgentToNewRegionAsync;
-            d.BeginInvoke(agent, newpos, neighbourRegion, isFlying, version, CrossAgentToNewRegionCompleted, d);
-
-            Scene.EventManager.TriggerCrossAgentToNewRegion(agent, isFlying, neighbourRegion);
+//            agent.IsInTransit = true;
 
-            return true;
+            CrossAgentToNewRegionAsync(agent, newpos, neighbourRegion, isFlying, version);
+            agent.IsInTransit = false;
+            return agent;
         }
 
-
         public delegate void InformClientToInitiateTeleportToLocationDelegate(ScenePresence agent, uint regionX, uint regionY,
                                                             Vector3 position,
                                                             Scene initiatingScene);
@@ -1691,12 +1763,18 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
         public bool CrossAgentIntoNewRegionMain(ScenePresence agent, Vector3 pos, GridRegion neighbourRegion, bool isFlying)
         {
+            int ts = Util.EnvironmentTickCount();
             try
             {
                 AgentData cAgent = new AgentData(); 
                 agent.CopyTo(cAgent);
+
+//                agent.Appearance.WearableCacheItems = null;
+
                 cAgent.Position = pos;
 
+                cAgent.ChildrenCapSeeds = agent.KnownRegions;
+
                 if (isFlying)
                     cAgent.ControlFlags |= (uint)AgentManager.ControlFlags.AGENT_CONTROL_FLY;
 
@@ -1716,11 +1794,14 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                         neighbourRegion.RegionName, agent.Name);
 
                     ReInstantiateScripts(agent);
-                    agent.AddToPhysicalScene(isFlying);
+                    if(agent.ParentID == 0 && agent.ParentUUID == UUID.Zero)
+                        agent.AddToPhysicalScene(isFlying);
 
                     return false;
                 }
 
+            m_log.DebugFormat("[CrossAgentIntoNewRegionMain] ok, time {0}ms",Util.EnvironmentTickCountSubtract(ts));
+
             }
             catch (Exception e)
             {
@@ -1738,7 +1819,6 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
         public void CrossAgentToNewRegionPost(ScenePresence agent, Vector3 pos, GridRegion neighbourRegion,
             bool isFlying, string version)
         {
-            agent.ControllingClient.RequestClientInfo();
 
             string agentcaps;
             if (!agent.KnownRegions.TryGetValue(neighbourRegion.RegionHandle, out agentcaps))
@@ -1749,6 +1829,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             }
 
             // No turning back
+
             agent.IsChildAgent = true;
 
             string capsPath = neighbourRegion.ServerURI + CapsUtil.GetCapsSeedPath(agentcaps);
@@ -1760,7 +1841,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             if (m_eqModule != null)
             {
                 m_eqModule.CrossRegion(
-                    neighbourRegion.RegionHandle, pos + agent.Velocity, vel2 /* agent.Velocity */,
+                    neighbourRegion.RegionHandle, pos, vel2 /* agent.Velocity */,
                     neighbourRegion.ExternalEndPoint,
                     capsPath, agent.UUID, agent.ControllingClient.SessionId,
                     neighbourRegion.RegionSizeX, neighbourRegion.RegionSizeY);
@@ -1768,42 +1849,36 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             else
             {
                 m_log.ErrorFormat("{0} Using old CrossRegion packet. Varregion will not work!!", LogHeader);
-                agent.ControllingClient.CrossRegion(neighbourRegion.RegionHandle, pos + agent.Velocity, agent.Velocity, neighbourRegion.ExternalEndPoint,
+                agent.ControllingClient.CrossRegion(neighbourRegion.RegionHandle, pos, agent.Velocity, neighbourRegion.ExternalEndPoint,
                                             capsPath);
             }
 
+            // Backwards compatibility. Best effort
+            if (version == "Unknown" || version == string.Empty)
+            {
+                m_log.DebugFormat("[ENTITY TRANSFER MODULE]: neighbor with old version, passing attachments one by one...");
+                Thread.Sleep(3000); // wait a little now that we're not waiting for the callback
+                CrossAttachmentsIntoNewRegion(neighbourRegion, agent, true);
+            }
+
             // SUCCESS!
             m_entityTransferStateMachine.UpdateInTransit(agent.UUID, AgentTransferState.ReceivedAtDestination);
 
             // Unlike a teleport, here we do not wait for the destination region to confirm the receipt.
             m_entityTransferStateMachine.UpdateInTransit(agent.UUID, AgentTransferState.CleaningUp);
 
-            agent.MakeChildAgent();
+            // this may need the attachments
+
+            agent.HasMovedAway(true);
+
+            agent.MakeChildAgent(neighbourRegion.RegionHandle);
 
             // FIXME: Possibly this should occur lower down after other commands to close other agents,
             // but not sure yet what the side effects would be.
             m_entityTransferStateMachine.ResetFromTransit(agent.UUID);
 
-            // now we have a child agent in this region. Request all interesting data about other (root) agents
-            agent.SendOtherAgentsAvatarDataToClient();
-            agent.SendOtherAgentsAppearanceToClient();
+            agent.CloseChildAgents(neighbourRegion.RegionHandle, neighbourRegion.RegionSizeX, neighbourRegion.RegionSizeY);
 
-            // Backwards compatibility. Best effort
-            if (version == "Unknown" || version == string.Empty)
-            {
-                m_log.DebugFormat("[ENTITY TRANSFER MODULE]: neighbor with old version, passing attachments one by one...");
-                Thread.Sleep(3000); // wait a little now that we're not waiting for the callback
-                CrossAttachmentsIntoNewRegion(neighbourRegion, agent, true);
-            }
-
-            // Next, let's close the child agent connections that are too far away.
-            uint neighbourx;
-            uint neighboury;
-            Util.RegionHandleToRegionLoc(neighbourRegion.RegionHandle, out neighbourx, out neighboury);
-
-            agent.CloseChildAgents(neighbourx, neighboury);
-
-            AgentHasMovedAway(agent, false);
 
             // the user may change their profile information in other region,
             // so the userinfo in UserProfileCache is not reliable any more, delete it
@@ -1843,7 +1918,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
         #region Enable Child Agent
 
         /// <summary>
-        /// This informs a single neighbouring region about agent "avatar".
+        /// This informs a single neighbouring region about agent "avatar", and avatar about it
         /// Calls an asynchronous method to do so..  so it doesn't lag the sim.
         /// </summary>
         /// <param name="sp"></param>
@@ -1852,41 +1927,47 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
         {
             m_log.DebugFormat("[ENTITY TRANSFER]: Enabling child agent in new neighbour {0}", region.RegionName);
 
+            ulong currentRegionHandler = sp.Scene.RegionInfo.RegionHandle;
+            ulong regionhandler = region.RegionHandle;
+
+            Dictionary<ulong, string> seeds = new Dictionary<ulong, string>(sp.Scene.CapsModule.GetChildrenSeeds(sp.UUID));
+
+            if (seeds.ContainsKey(regionhandler))
+                seeds.Remove(regionhandler);
+/*
+            List<ulong> oldregions = new List<ulong>(seeds.Keys);
+
+            if (oldregions.Contains(currentRegionHandler))
+                oldregions.Remove(currentRegionHandler);
+*/
+            if (!seeds.ContainsKey(currentRegionHandler))
+                seeds.Add(currentRegionHandler, sp.ControllingClient.RequestClientInfo().CapsPath);
+
             AgentCircuitData currentAgentCircuit = sp.Scene.AuthenticateHandler.GetAgentCircuitData(sp.ControllingClient.CircuitCode);
             AgentCircuitData agent = sp.ControllingClient.RequestClientInfo();
             agent.BaseFolder = UUID.Zero;
             agent.InventoryFolder = UUID.Zero;
-            agent.startpos = new Vector3(128, 128, 70);
+            agent.startpos = sp.AbsolutePosition + CalculateOffset(sp, region);
             agent.child = true;
-            agent.Appearance = sp.Appearance;
+            agent.Appearance = new AvatarAppearance();
+            agent.Appearance.AvatarHeight = sp.Appearance.AvatarHeight;
+
             agent.CapsPath = CapsUtil.GetRandomCapsObjectPath();
 
-            agent.ChildrenCapSeeds = new Dictionary<ulong, string>(sp.Scene.CapsModule.GetChildrenSeeds(sp.UUID));
-            //m_log.DebugFormat("[XXX] Seeds 1 {0}", agent.ChildrenCapSeeds.Count);
+            seeds.Add(regionhandler, agent.CapsPath);
 
-            if (!agent.ChildrenCapSeeds.ContainsKey(sp.Scene.RegionInfo.RegionHandle))
-                agent.ChildrenCapSeeds.Add(sp.Scene.RegionInfo.RegionHandle, sp.ControllingClient.RequestClientInfo().CapsPath);
-            //m_log.DebugFormat("[XXX] Seeds 2 {0}", agent.ChildrenCapSeeds.Count);
 
-            sp.AddNeighbourRegion(region.RegionHandle, agent.CapsPath);
-            //foreach (ulong h in agent.ChildrenCapSeeds.Keys)
-            //    m_log.DebugFormat("[XXX] --> {0}", h);
-            //m_log.DebugFormat("[XXX] Adding {0}", region.RegionHandle);
-            if (agent.ChildrenCapSeeds.ContainsKey(region.RegionHandle))
-            {
-                m_log.WarnFormat(
-                    "[ENTITY TRANSFER]: Overwriting caps seed {0} with {1} for region {2} (handle {3}) for {4} in {5}", 
-                    agent.ChildrenCapSeeds[region.RegionHandle], agent.CapsPath, 
-                    region.RegionName, region.RegionHandle, sp.Name, Scene.Name);
-            }
-
-            agent.ChildrenCapSeeds[region.RegionHandle] = agent.CapsPath;
+//            agent.ChildrenCapSeeds = new Dictionary<ulong, string>(seeds);
+            agent.ChildrenCapSeeds = null;
 
             if (sp.Scene.CapsModule != null)
             {
-                sp.Scene.CapsModule.SetChildrenSeed(sp.UUID, agent.ChildrenCapSeeds);
+                sp.Scene.CapsModule.SetChildrenSeed(sp.UUID, seeds);
             }
 
+            sp.KnownRegions = seeds;
+            sp.AddNeighbourRegionSizeInfo(region);
+
             if (currentAgentCircuit != null)
             {
                 agent.ServiceURLs = currentAgentCircuit.ServiceURLs;
@@ -1896,7 +1977,24 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 agent.Mac = currentAgentCircuit.Mac;
                 agent.Id0 = currentAgentCircuit.Id0;
             }
-
+/*
+            AgentPosition agentpos = null;
+
+            if (oldregions.Count > 0)
+            {
+                agentpos = new AgentPosition();
+                agentpos.AgentID = new UUID(sp.UUID.Guid);
+                agentpos.SessionID = sp.ControllingClient.SessionId;
+                agentpos.Size = sp.Appearance.AvatarSize;
+                agentpos.Center = sp.CameraPosition;
+                agentpos.Far = sp.DrawDistance;
+                agentpos.Position = sp.AbsolutePosition;
+                agentpos.Velocity = sp.Velocity;
+                agentpos.RegionHandle = currentRegionHandler;
+                agentpos.Throttles = sp.ControllingClient.GetThrottlesPacked(1);
+                agentpos.ChildrenCapSeeds = seeds;
+            }
+*/
             IPEndPoint external = region.ExternalEndPoint;
             if (external != null)
             {
@@ -1905,7 +2003,23 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                           InformClientOfNeighbourCompleted,
                           d);
             }
+/*
+            if(oldregions.Count >0)
+            {
+                uint neighbourx;
+                uint neighboury;
+                UUID scope = sp.Scene.RegionInfo.ScopeID;
+                foreach (ulong handler in oldregions)
+                {
+                    // crap code
+                    Utils.LongToUInts(handler, out neighbourx, out neighboury);
+                    GridRegion neighbour = sp.Scene.GridService.GetRegionByPosition(scope, (int)neighbourx, (int)neighboury);
+                    sp.Scene.SimulationService.UpdateAgent(neighbour, agentpos);
+                }
+            }
+ */
         }
+
         #endregion
 
         #region Enable Child Agents
@@ -1915,146 +2029,153 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
         /// <summary>
         /// This informs all neighbouring regions about agent "avatar".
+        /// and as important informs the avatar about then
         /// </summary>
         /// <param name="sp"></param>
         public void EnableChildAgents(ScenePresence sp)
         {
+            // assumes that out of view range regions are disconnected by the previus region
+
             List<GridRegion> neighbours = new List<GridRegion>();
-            RegionInfo m_regionInfo = sp.Scene.RegionInfo;
+            Scene spScene = sp.Scene;
+            RegionInfo m_regionInfo = spScene.RegionInfo;
 
             if (m_regionInfo != null)
             {
-                neighbours = GetNeighbours(sp, m_regionInfo.RegionLocX, m_regionInfo.RegionLocY);
+                neighbours = GetNeighbors(sp, m_regionInfo.RegionLocX, m_regionInfo.RegionLocY);
             }
             else
             {
                 m_log.Debug("[ENTITY TRANSFER MODULE]: m_regionInfo was null in EnableChildAgents, is this a NPC?");
             }
 
-            /// We need to find the difference between the new regions where there are no child agents
-            /// and the regions where there are already child agents. We only send notification to the former.
-            List<ulong> neighbourHandles = NeighbourHandles(neighbours); // on this region
-            neighbourHandles.Add(sp.Scene.RegionInfo.RegionHandle);  // add this region too
-            List<ulong> previousRegionNeighbourHandles;
+            ulong currentRegionHandler = m_regionInfo.RegionHandle;
 
-            if (sp.Scene.CapsModule != null)
+            LinkedList<ulong> previousRegionNeighbourHandles;
+            Dictionary<ulong, string> seeds;
+            ICapabilitiesModule capsModule = spScene.CapsModule;
+
+            if (capsModule != null)
             {
-                previousRegionNeighbourHandles =
-                    new List<ulong>(sp.Scene.CapsModule.GetChildrenSeeds(sp.UUID).Keys);
+                seeds = new Dictionary<ulong, string>(capsModule.GetChildrenSeeds(sp.UUID));
+                previousRegionNeighbourHandles = new LinkedList<ulong>(seeds.Keys);
             }
             else
             {
-                previousRegionNeighbourHandles = new List<ulong>();
+                seeds = new Dictionary<ulong, string>();
+                previousRegionNeighbourHandles = new LinkedList<ulong>();
             }
 
-            List<ulong> newRegions = NewNeighbours(neighbourHandles, previousRegionNeighbourHandles);
-            List<ulong> oldRegions = OldNeighbours(neighbourHandles, previousRegionNeighbourHandles);
+            IClientAPI spClient = sp.ControllingClient;
 
-//            Dump("Current Neighbors", neighbourHandles);
-//            Dump("Previous Neighbours", previousRegionNeighbourHandles);
-//            Dump("New Neighbours", newRegions);
-//            Dump("Old Neighbours", oldRegions);
+            if (!seeds.ContainsKey(currentRegionHandler))
+                seeds.Add(currentRegionHandler, spClient.RequestClientInfo().CapsPath);
 
-            /// Update the scene presence's known regions here on this region
-            sp.DropOldNeighbours(oldRegions);
+            AgentCircuitData currentAgentCircuit =
+                spScene.AuthenticateHandler.GetAgentCircuitData(sp.ControllingClient.CircuitCode);
 
-            /// Collect as many seeds as possible
-            Dictionary<ulong, string> seeds;
-            if (sp.Scene.CapsModule != null)
-                seeds = new Dictionary<ulong, string>(sp.Scene.CapsModule.GetChildrenSeeds(sp.UUID));
-            else
-                seeds = new Dictionary<ulong, string>();
-
-            //m_log.Debug(" !!! No. of seeds: " + seeds.Count);
-            if (!seeds.ContainsKey(sp.Scene.RegionInfo.RegionHandle))
-                seeds.Add(sp.Scene.RegionInfo.RegionHandle, sp.ControllingClient.RequestClientInfo().CapsPath);
-
-            /// Create the necessary child agents
             List<AgentCircuitData> cagents = new List<AgentCircuitData>();
+            List<ulong> newneighbours = new List<ulong>();
+
             foreach (GridRegion neighbour in neighbours)
             {
-                if (neighbour.RegionHandle != sp.Scene.RegionInfo.RegionHandle)
+                ulong handler = neighbour.RegionHandle;
+
+                if (previousRegionNeighbourHandles.Contains(handler))
                 {
-                    AgentCircuitData currentAgentCircuit = sp.Scene.AuthenticateHandler.GetAgentCircuitData(sp.ControllingClient.CircuitCode);
-                    AgentCircuitData agent = sp.ControllingClient.RequestClientInfo();
-                    agent.BaseFolder = UUID.Zero;
-                    agent.InventoryFolder = UUID.Zero;
-                    agent.startpos = sp.AbsolutePosition + CalculateOffset(sp, neighbour);
-                    agent.child = true;
-                    agent.Appearance = sp.Appearance;
-                    if (currentAgentCircuit != null)
-                    {
-                        agent.ServiceURLs = currentAgentCircuit.ServiceURLs;
-                        agent.IPAddress = currentAgentCircuit.IPAddress;
-                        agent.Viewer = currentAgentCircuit.Viewer;
-                        agent.Channel = currentAgentCircuit.Channel;
-                        agent.Mac = currentAgentCircuit.Mac;
-                        agent.Id0 = currentAgentCircuit.Id0;
-                    }
+                    // agent already knows this region
+                    previousRegionNeighbourHandles.Remove(handler);
+                    continue;
+                }
 
-                    if (newRegions.Contains(neighbour.RegionHandle))
-                    {
-                        agent.CapsPath = CapsUtil.GetRandomCapsObjectPath();
-                        sp.AddNeighbourRegion(neighbour.RegionHandle, agent.CapsPath);
-                        seeds.Add(neighbour.RegionHandle, agent.CapsPath);
-                    }
-                    else
-                    {
-                        agent.CapsPath = sp.Scene.CapsModule.GetChildSeed(sp.UUID, neighbour.RegionHandle);
-                    }
+                if (handler == currentRegionHandler)
+                    continue;
+
+                // a new region to add
+                AgentCircuitData agent = spClient.RequestClientInfo();
+                agent.BaseFolder = UUID.Zero;
+                agent.InventoryFolder = UUID.Zero;
+                agent.startpos = sp.AbsolutePosition + CalculateOffset(sp, neighbour);
+                agent.child = true;
+                agent.Appearance = new AvatarAppearance();
+                agent.Appearance.AvatarHeight = sp.Appearance.AvatarHeight;
 
-                    cagents.Add(agent);
+                if (currentAgentCircuit != null)
+                {
+                    agent.ServiceURLs = currentAgentCircuit.ServiceURLs;
+                    agent.IPAddress = currentAgentCircuit.IPAddress;
+                    agent.Viewer = currentAgentCircuit.Viewer;
+                    agent.Channel = currentAgentCircuit.Channel;
+                    agent.Mac = currentAgentCircuit.Mac;
+                    agent.Id0 = currentAgentCircuit.Id0;
                 }
-            }
 
-            /// Update all child agent with everyone's seeds
-            foreach (AgentCircuitData a in cagents)
-            {
-                a.ChildrenCapSeeds = new Dictionary<ulong, string>(seeds);
-            }
+                newneighbours.Add(handler);
+                agent.CapsPath = CapsUtil.GetRandomCapsObjectPath();
+                seeds.Add(handler, agent.CapsPath);
 
-            if (sp.Scene.CapsModule != null)
-            {
-                sp.Scene.CapsModule.SetChildrenSeed(sp.UUID, seeds);
+                agent.ChildrenCapSeeds = null;
+                cagents.Add(agent);
             }
-            sp.KnownRegions = seeds;
-            //avatar.Scene.DumpChildrenSeeds(avatar.UUID);
-            //avatar.DumpKnownRegions();
 
-            bool newAgent = false;
-            int count = 0;
-            foreach (GridRegion neighbour in neighbours)
-            {
-                //m_log.WarnFormat("--> Going to send child agent to {0}", neighbour.RegionName);
-                // Don't do it if there's already an agent in that region
-                if (newRegions.Contains(neighbour.RegionHandle))
-                    newAgent = true;
-                else
-                    newAgent = false;
-//                    continue;
+            if (previousRegionNeighbourHandles.Contains(currentRegionHandler))
+                previousRegionNeighbourHandles.Remove(currentRegionHandler);
+
+            // previousRegionNeighbourHandles now contains regions to forget
+            foreach (ulong handler in previousRegionNeighbourHandles)
+                seeds.Remove(handler);
+
+            /// Update all child agent with everyone's seeds
+            //            foreach (AgentCircuitData a in cagents)
+            //                a.ChildrenCapSeeds = new Dictionary<ulong, string>(seeds);
+
+            if (capsModule != null)
+                capsModule.SetChildrenSeed(sp.UUID, seeds);
 
-                if (neighbour.RegionHandle != sp.Scene.RegionInfo.RegionHandle)
+            sp.KnownRegions = seeds;
+            sp.SetNeighbourRegionSizeInfo(neighbours);
+
+            AgentPosition agentpos = new AgentPosition();
+            agentpos.AgentID = new UUID(sp.UUID.Guid);
+            agentpos.SessionID = spClient.SessionId;
+            agentpos.Size = sp.Appearance.AvatarSize;
+            agentpos.Center = sp.CameraPosition;
+            agentpos.Far = sp.DrawDistance;
+            agentpos.Position = sp.AbsolutePosition;
+            agentpos.Velocity = sp.Velocity;
+            agentpos.RegionHandle = currentRegionHandler;
+            agentpos.Throttles = spClient.GetThrottlesPacked(1);
+            //            agentpos.ChildrenCapSeeds = seeds;
+
+            Util.FireAndForget(delegate
+            {
+                Thread.Sleep(200);  // the original delay that was at InformClientOfNeighbourAsync start
+                int count = 0;
+
+                foreach (GridRegion neighbour in neighbours)
                 {
+                    ulong handler = neighbour.RegionHandle;
                     try
                     {
-                        // Let's put this back at sync, so that it doesn't clog 
-                        // the network, especially for regions in the same physical server.
-                        // We're really not in a hurry here.
-                        InformClientOfNeighbourAsync(sp, cagents[count], neighbour, neighbour.ExternalEndPoint, newAgent);
-                        //InformClientOfNeighbourDelegate d = InformClientOfNeighbourAsync;
-                        //d.BeginInvoke(sp, cagents[count], neighbour, neighbour.ExternalEndPoint, newAgent,
-                        //              InformClientOfNeighbourCompleted,
-                        //              d);
+                        if (newneighbours.Contains(handler))
+                        {
+                            InformClientOfNeighbourAsync(sp, cagents[count], neighbour,
+                                neighbour.ExternalEndPoint, true);
+                            count++;
+                        }
+                        else if (!previousRegionNeighbourHandles.Contains(handler))
+                        {
+                            spScene.SimulationService.UpdateAgent(neighbour, agentpos);
+                        }
                     }
-
                     catch (ArgumentOutOfRangeException)
                     {
                         m_log.ErrorFormat(
                            "[ENTITY TRANSFER MODULE]: Neighbour Regions response included the current region in the neighbour list.  The following region will not display to the client: {0} for region {1} ({2}, {3}).",
                            neighbour.ExternalHostName,
-                           neighbour.RegionHandle,
-                           neighbour.RegionLocX,
-                           neighbour.RegionLocY);
+                            neighbour.RegionHandle,
+                        neighbour.RegionLocX,
+                       neighbour.RegionLocY);
                     }
                     catch (Exception e)
                     {
@@ -2071,11 +2192,9 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
                         // XXX: Well, decided to swallow the exception instead for now.  Let us see how that goes.
                         // throw e;
-
                     }
                 }
-                count++;
-            }
+            });
         }
 
         // Computes the difference between two region bases.
@@ -2083,26 +2202,11 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
         // The first region is the home region of the passed scene presence.
         Vector3 CalculateOffset(ScenePresence sp, GridRegion neighbour)
         {
-            /*
-            int rRegionX = (int)sp.Scene.RegionInfo.LegacyRegionLocX;
-            int rRegionY = (int)sp.Scene.RegionInfo.LegacyRegionLocY;
-            int tRegionX = neighbour.RegionLocX / (int)Constants.RegionSize;
-            int tRegionY = neighbour.RegionLocY / (int)Constants.RegionSize;
-            int shiftx = (rRegionX - tRegionX) * (int)Constants.RegionSize;
-            int shifty = (rRegionY - tRegionY) * (int)Constants.RegionSize;
-            return new Vector3(shiftx, shifty, 0f);
-             */
-            return new Vector3( sp.Scene.RegionInfo.WorldLocX - neighbour.RegionLocX,
+              return new Vector3(sp.Scene.RegionInfo.WorldLocX - neighbour.RegionLocX,
                                 sp.Scene.RegionInfo.WorldLocY - neighbour.RegionLocY,
                                 0f);
         }
 
-        public GridRegion GetRegionContainingWorldLocation(IGridService pGridService, UUID pScopeID, double px, double py)
-        {
-            // Since we don't know how big the regions could be, we have to search a very large area
-            //    to find possible regions.
-            return GetRegionContainingWorldLocation(pGridService, pScopeID, px, py, Constants.MaximumRegionSize);
-        }
 
         #region NotFoundLocationCache class
         // A collection of not found locations to make future lookups 'not found' lookups quick.
@@ -2187,7 +2291,16 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
         #endregion // NotFoundLocationCache class
         private NotFoundLocationCache m_notFoundLocationCache = new NotFoundLocationCache();
 
-        // Given a world position (fractional meter coordinate), get the GridRegion info for
+// needed for current OSG or old grid code
+ 
+        public GridRegion GetRegionContainingWorldLocation(IGridService pGridService, UUID pScopeID, double px, double py)
+        {
+            // Since we don't know how big the regions could be, we have to search a very large area
+            //    to find possible regions.
+            return GetRegionContainingWorldLocation(pGridService, pScopeID, px, py, Constants.MaximumRegionSize);
+        }
+ 
+        // Given a world position, get the GridRegion info for
         //   the region containing that point.
         // Someday this should be a method on GridService.
         // 'pSizeHint' is the size of the source region but since the destination point can be anywhere
@@ -2196,7 +2309,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
         public GridRegion GetRegionContainingWorldLocation(IGridService pGridService, UUID pScopeID,
                             double px, double py, uint pSizeHint)
         {
-            m_log.DebugFormat("{0} GetRegionContainingWorldLocation: query, loc=<{1},{2}>", LogHeader, px, py);
+            m_log.DebugFormat("{0} GetRegionContainingWorldLocation: call, XY=<{1},{2}>", LogHeader, px, py);
             GridRegion ret = null;
             const double fudge = 2.0;
 
@@ -2289,55 +2402,59 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
         private void InformClientOfNeighbourAsync(ScenePresence sp, AgentCircuitData a, GridRegion reg,
                                                   IPEndPoint endPoint, bool newAgent)
         {
-            // Let's wait just a little to give time to originating regions to catch up with closing child agents
-            // after a cross here
-            Thread.Sleep(500);
 
-            Scene scene = sp.Scene;
-            
-            m_log.DebugFormat(
-                "[ENTITY TRANSFER MODULE]: Informing {0} {1} about neighbour {2} {3} at ({4},{5})",
-                sp.Name, sp.UUID, reg.RegionName, endPoint, reg.RegionCoordX, reg.RegionCoordY);
+            if (newAgent)
+            {
+                Scene scene = sp.Scene;
 
-            string capsPath = reg.ServerURI + CapsUtil.GetCapsSeedPath(a.CapsPath);
+                m_log.DebugFormat(
+                    "[ENTITY TRANSFER MODULE]: Informing {0} {1} about neighbour {2} {3} at ({4},{5})",
+                    sp.Name, sp.UUID, reg.RegionName, endPoint, reg.RegionCoordX, reg.RegionCoordY);
 
-            string reason = String.Empty;
+                string capsPath = reg.ServerURI + CapsUtil.GetCapsSeedPath(a.CapsPath);
 
-            bool regionAccepted = scene.SimulationService.CreateAgent(null, reg, a, (uint)TeleportFlags.Default, out reason);
+                string reason = String.Empty;
 
-            if (regionAccepted && newAgent)
-            {
-                if (m_eqModule != null)
+                bool regionAccepted = scene.SimulationService.CreateAgent(reg, reg, a, (uint)TeleportFlags.Default, out reason);
+
+                if (regionAccepted)
                 {
-                    #region IP Translation for NAT
-                    IClientIPEndpoint ipepClient;
-                    if (sp.ClientView.TryGet(out ipepClient))
+                    // give  time for createAgent to finish, since it is async and does grid services access              
+                    Thread.Sleep(500);
+
+                    if (m_eqModule != null)
                     {
-                        endPoint.Address = NetworkUtil.GetIPFor(ipepClient.EndPoint, endPoint.Address);
-                    }
-                    #endregion
+                        #region IP Translation for NAT
+                        IClientIPEndpoint ipepClient;
+                        if (sp.ClientView.TryGet(out ipepClient))
+                        {
+                            endPoint.Address = NetworkUtil.GetIPFor(ipepClient.EndPoint, endPoint.Address);
+                        }
+                        #endregion
 
-                    m_log.DebugFormat("{0} {1} is sending {2} EnableSimulator for neighbour region {3}(loc=<{4},{5}>,siz=<{6},{7}>) " +
-                        "and EstablishAgentCommunication with seed cap {8}", LogHeader,
-                        scene.RegionInfo.RegionName, sp.Name,
-                        reg.RegionName, reg.RegionLocX, reg.RegionLocY, reg.RegionSizeX, reg.RegionSizeY , capsPath);
+                        m_log.DebugFormat("{0} {1} is sending {2} EnableSimulator for neighbour region {3}(loc=<{4},{5}>,siz=<{6},{7}>) " +
+                            "and EstablishAgentCommunication with seed cap {8}", LogHeader,
+                            scene.RegionInfo.RegionName, sp.Name,
+                            reg.RegionName, reg.RegionLocX, reg.RegionLocY, reg.RegionSizeX, reg.RegionSizeY, capsPath);
 
-                    m_eqModule.EnableSimulator(reg.RegionHandle, endPoint, sp.UUID, reg.RegionSizeX, reg.RegionSizeY);
-                    m_eqModule.EstablishAgentCommunication(sp.UUID, endPoint, capsPath, reg.RegionHandle, reg.RegionSizeX, reg.RegionSizeY);
-                }
-                else
-                {
-                    sp.ControllingClient.InformClientOfNeighbour(reg.RegionHandle, endPoint);
-                    // TODO: make Event Queue disablable!
+                        m_eqModule.EnableSimulator(reg.RegionHandle, endPoint, sp.UUID, reg.RegionSizeX, reg.RegionSizeY);
+                        m_eqModule.EstablishAgentCommunication(sp.UUID, endPoint, capsPath, reg.RegionHandle, reg.RegionSizeX, reg.RegionSizeY);
+                    }
+                    else
+                    {
+                        sp.ControllingClient.InformClientOfNeighbour(reg.RegionHandle, endPoint);
+                        // TODO: make Event Queue disablable!
+                    }
+
+                    m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Completed inform {0} {1} about neighbour {2}", sp.Name, sp.UUID, endPoint);
                 }
 
-                m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Completed inform {0} {1} about neighbour {2}", sp.Name, sp.UUID, endPoint);
+                if (!regionAccepted)
+                    m_log.WarnFormat(
+                        "[ENTITY TRANSFER MODULE]: Region {0} did not accept {1} {2}: {3}",
+                        reg.RegionName, sp.Name, sp.UUID, reason);
             }
-
-            if (!regionAccepted)
-                m_log.WarnFormat(
-                    "[ENTITY TRANSFER MODULE]: Region {0} did not accept {1} {2}: {3}",
-                    reg.RegionName, sp.Name, sp.UUID, reason);
+ 
         }
 
         /// <summary>
@@ -2370,7 +2487,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
         /// <param name="pRegionLocX"></param>
         /// <param name="pRegionLocY"></param>
         /// <returns></returns>        
-        protected List<GridRegion> GetNeighbours(ScenePresence avatar, uint pRegionLocX, uint pRegionLocY)
+        protected List<GridRegion> GetNeighbors(ScenePresence avatar, uint pRegionLocX, uint pRegionLocY)
         {
             Scene pScene = avatar.Scene;
             RegionInfo m_regionInfo = pScene.RegionInfo;
@@ -2381,18 +2498,27 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             // view to include everything in the megaregion
             if (m_regionCombinerModule == null || !m_regionCombinerModule.IsRootForMegaregion(Scene.RegionInfo.RegionID))
             {
-                // The area to check is as big as the current region.
-                // We presume all adjacent regions are the same size as this region.
-                uint dd = Math.Max((uint)avatar.Scene.DefaultDrawDistance, 
-                                Math.Max(Scene.RegionInfo.RegionSizeX, Scene.RegionInfo.RegionSizeY));
+                uint dd = (uint)avatar.DrawDistance;
 
-                uint startX = Util.RegionToWorldLoc(pRegionLocX) - dd + Constants.RegionSize/2;
-                uint startY = Util.RegionToWorldLoc(pRegionLocY) - dd + Constants.RegionSize/2;
+                // until avatar movement updates client connections, we need to seend at least this current region imediate Neighbors
+                uint ddX = Math.Max(dd, Constants.RegionSize);
+                uint ddY = Math.Max(dd, Constants.RegionSize);
 
-                uint endX = Util.RegionToWorldLoc(pRegionLocX) + dd + Constants.RegionSize/2;
-                uint endY = Util.RegionToWorldLoc(pRegionLocY) + dd + Constants.RegionSize/2;
+                ddX--;
+                ddY--;
 
-                neighbours 
+                // reference to region edges. Should be avatar position
+                uint startX = Util.RegionToWorldLoc(pRegionLocX);
+                uint endX = startX + m_regionInfo.RegionSizeX;
+                uint startY = Util.RegionToWorldLoc(pRegionLocY);
+                uint endY = startY + m_regionInfo.RegionSizeY;
+
+                startX -= ddX;
+                startY -= ddY;
+                endX += ddX;
+                endY += ddY;
+
+                neighbours
                     = avatar.Scene.GridService.GetRegionRange(
                         m_regionInfo.ScopeID, (int)startX, (int)endX, (int)startY, (int)endY);
             }
@@ -2408,71 +2534,70 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                         (int)Util.RegionToWorldLoc((uint)swCorner.Y), (int)Util.RegionToWorldLoc((uint)neCorner.Y));
             }
 
-//            neighbours.ForEach(
-//                n => 
-//                    m_log.DebugFormat(
-//                        "[ENTITY TRANSFER MODULE]: Region flags for {0} as seen by {1} are {2}", 
-//                        n.RegionName, Scene.Name, n.RegionFlags != null ? n.RegionFlags.ToString() : "not present"));
-
             // The r.RegionFlags == null check only needs to be made for simulators before 2015-01-14 (pre 0.8.1).
-            neighbours.RemoveAll(
-                r => 
-                    r.RegionID == m_regionInfo.RegionID 
-                        || (r.RegionFlags != null && (r.RegionFlags & OpenSim.Framework.RegionFlags.RegionOnline) == 0));
+            neighbours.RemoveAll( r => r.RegionID == m_regionInfo.RegionID );
 
             return neighbours;
         }
+        #endregion
+
+        #region Agent Arrived
 
-        private List<ulong> NewNeighbours(List<ulong> currentNeighbours, List<ulong> previousNeighbours)
+        public void AgentArrivedAtDestination(UUID id)
         {
-            return currentNeighbours.FindAll(delegate(ulong handle) { return !previousNeighbours.Contains(handle); });
+            m_entityTransferStateMachine.SetAgentArrivedAtDestination(id);
         }
 
-        //        private List<ulong> CommonNeighbours(List<ulong> currentNeighbours, List<ulong> previousNeighbours)
-        //        {
-        //            return currentNeighbours.FindAll(delegate(ulong handle) { return previousNeighbours.Contains(handle); });
-        //        }
+        #endregion
 
-        private List<ulong> OldNeighbours(List<ulong> currentNeighbours, List<ulong> previousNeighbours)
-        {
-            return previousNeighbours.FindAll(delegate(ulong handle) { return !currentNeighbours.Contains(handle); });
-        }
+        #region Object Transfers
 
-        private List<ulong> NeighbourHandles(List<GridRegion> neighbours)
+        public GridRegion GetObjectDestination(SceneObjectGroup grp, Vector3 targetPosition,out Vector3 newpos)
         {
-            List<ulong> handles = new List<ulong>();
-            foreach (GridRegion reg in neighbours)
+            newpos = targetPosition;
+
+            Scene scene = grp.Scene;
+            if (scene == null)
+                return null;
+
+            int x = (int)targetPosition.X + (int)scene.RegionInfo.WorldLocX;
+            if (targetPosition.X >= 0)
+                x++;
+            else
+                x--;
+
+            int y = (int)targetPosition.Y + (int)scene.RegionInfo.WorldLocY;
+            if (targetPosition.Y >= 0)
+                y++;
+            else
+                y--;
+
+
+            GridRegion neighbourRegion = scene.GridService.GetRegionByPosition(scene.RegionInfo.ScopeID,x,y);
+            if (neighbourRegion == null)
             {
-                handles.Add(reg.RegionHandle);
+                return null;
             }
-            return handles;
-        }
 
-//        private void Dump(string msg, List<ulong> handles)
-//        {
-//            m_log.InfoFormat("-------------- HANDLE DUMP ({0}) ---------", msg);
-//            foreach (ulong handle in handles)
-//            {
-//                uint x, y;
-//                Utils.LongToUInts(handle, out x, out y);
-//                x = x / Constants.RegionSize;
-//                y = y / Constants.RegionSize;
-//                m_log.InfoFormat("({0}, {1})", x, y);
-//            }
-//        }
+            float newRegionSizeX = neighbourRegion.RegionSizeX;
+            float newRegionSizeY = neighbourRegion.RegionSizeY;
+            if (newRegionSizeX == 0)
+                newRegionSizeX = Constants.RegionSize;
+            if (newRegionSizeY == 0)
+                newRegionSizeY = Constants.RegionSize;
 
-        #endregion
 
-        #region Agent Arrived
+            newpos.X = targetPosition.X - (neighbourRegion.RegionLocX - (int)scene.RegionInfo.WorldLocX);
+            newpos.Y = targetPosition.Y - (neighbourRegion.RegionLocY - (int)scene.RegionInfo.WorldLocY);
 
-        public void AgentArrivedAtDestination(UUID id)
-        {
-            m_entityTransferStateMachine.SetAgentArrivedAtDestination(id);
-        }
 
-        #endregion
+            const float enterDistance = 0.2f;
+            newpos.X = Util.Clamp(newpos.X, enterDistance, newRegionSizeX - enterDistance);
+            newpos.Y = Util.Clamp(newpos.Y, enterDistance, newRegionSizeY - enterDistance);
+
+            return neighbourRegion;
+        }
 
-        #region Object Transfers
 
         /// <summary>
         /// Move the given scene object into a new region depending on which region its absolute position has moved
@@ -2496,20 +2621,6 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             if (scene == null)
                 return;
 
-            if (grp.RootPart.DIE_AT_EDGE)
-            {
-                // We remove the object here
-                try
-                {
-                    scene.DeleteSceneObject(grp, false);
-                }
-                catch (Exception)
-                {
-                    m_log.Warn("[DATABASE]: exception when trying to remove the prim that crossed the border.");
-                }
-                return;
-            }
-
             // Remember the old group position in case the region lookup fails so position can be restored.
             Vector3 oldGroupPosition = grp.RootPart.GroupPosition;
 
@@ -2562,7 +2673,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
         /// true if the crossing itself was successful, false on failure
         /// FIMXE: we still return true if the crossing object was not successfully deleted from the originating region
         /// </returns>
-        protected bool CrossPrimGroupIntoNewRegion(GridRegion destination, Vector3 newPosition, SceneObjectGroup grp, bool silent)
+        public bool CrossPrimGroupIntoNewRegion(GridRegion destination, Vector3 newPosition, SceneObjectGroup grp, bool silent)
         {
             //m_log.Debug("  >>> CrossPrimGroupIntoNewRegion <<<");
 
@@ -2603,30 +2714,6 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                             grp, e);
                     }
                 }
-/*
- * done on caller ( not in attachments crossing for now)
-                else
-                {
-
-                    if (!grp.IsDeleted)
-                    {
-                        PhysicsActor pa = grp.RootPart.PhysActor;
-                        if (pa != null)
-                        {
-                            pa.CrossingFailure();
-                            if (grp.RootPart.KeyframeMotion != null)
-                            {
-                                // moved to KeyframeMotion.CrossingFailure
-//                                grp.RootPart.Velocity = Vector3.Zero;
-                                grp.RootPart.KeyframeMotion.CrossingFailure();
-//                                grp.SendGroupRootTerseUpdate();
-                            }
-                        }
-                    }
-
-                    m_log.ErrorFormat("[ENTITY TRANSFER MODULE]: Prim crossing failed for {0}", grp);
-                }
- */
             }
             else
             {
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferStateMachine.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferStateMachine.cs
index a3109e0..e3c6c0d 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferStateMachine.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferStateMachine.cs
@@ -299,7 +299,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                             id, m_mod.Scene.RegionInfo.RegionName, currentState));
             }
 
-            int count = 200;
+            int count = 400;
 
             // There should be no race condition here since no other code should be removing the agent transfer or
             // changing the state to another other than Transferring => ReceivedAtDestination.
@@ -354,4 +354,4 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
index fa23590..5ec688c 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
@@ -238,19 +238,19 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
             return region;
         }
-
+/* NEEDFIX
         protected override bool NeedsClosing(float drawdist, uint oldRegionX, uint newRegionX, uint oldRegionY, uint newRegionY, GridRegion reg)
         {
             if (base.NeedsClosing(drawdist, oldRegionX, newRegionX, oldRegionY, newRegionY, reg))
                 return true;
 
             int flags = Scene.GridService.GetRegionFlags(Scene.RegionInfo.ScopeID, reg.RegionID);
-            if (flags == -1 /* no region in DB */ || (flags & (int)OpenSim.Framework.RegionFlags.Hyperlink) != 0)
+            if (flags == -1  || (flags & (int)OpenSim.Framework.RegionFlags.Hyperlink) != 0)
                 return true;
 
             return false;
         }
-
+*/
         protected override void AgentHasMovedAway(ScenePresence sp, bool logout)
         {
             base.AgentHasMovedAway(sp, logout);
@@ -311,6 +311,11 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             return base.CreateAgent(sp, reg, finalDestination, agentCircuit, teleportFlags, out reason, out logout);
         }
 
+        public void TriggerTeleportHome(UUID id, IClientAPI client)
+        {
+            TeleportHome(id, client);
+        }
+
         protected override bool ValidateGenericConditions(ScenePresence sp, GridRegion reg, GridRegion finalDestination, uint teleportFlags, out string reason)
         {
             reason = "Please wear your grid's allowed appearance before teleporting to another grid";
@@ -429,10 +434,6 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
         //    return base.UpdateAgent(reg, finalDestination, agentData, sp);
         //}
 
-        public override void TriggerTeleportHome(UUID id, IClientAPI client)     
-        {                                                                       
-            TeleportHome(id, client);                                           
-        }                                                                       
                           
         public override bool TeleportHome(UUID id, IClientAPI client)
         {
@@ -491,9 +492,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: teleporting user {0} {1} home to {2} via {3}:{4}",
                 aCircuit.firstname, aCircuit.lastname, finalDestination.RegionName, homeGatekeeper.ServerURI, homeGatekeeper.RegionName);
 
-            DoTeleport(
-                sp, homeGatekeeper, finalDestination,
-                position, lookAt, (uint)(Constants.TeleportFlags.SetLastToTarget | Constants.TeleportFlags.ViaHome));
+            DoTeleport(sp, homeGatekeeper, finalDestination, position, lookAt, (uint)(Constants.TeleportFlags.SetLastToTarget | Constants.TeleportFlags.ViaHome));
             return true;
         }
 
@@ -760,4 +759,4 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             return region;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
index 5a9efb8..96f1198 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
@@ -178,49 +178,55 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                                            sbyte assetType,
                                            byte wearableType, uint nextOwnerMask, int creationDate)
         {
-            m_log.DebugFormat("[INVENTORY ACCESS MODULE]: Received request to create inventory item {0} in folder {1}", name, folderID);
+            m_log.DebugFormat("[INVENTORY ACCESS MODULE]: Received request to create inventory item {0} in folder {1}, transactionID {2}", name,
+                folderID, transactionID);
 
             if (!m_Scene.Permissions.CanCreateUserInventory(invType, remoteClient.AgentId))
                 return;
 
-            if (transactionID == UUID.Zero)
+            InventoryFolderBase f = new InventoryFolderBase(folderID, remoteClient.AgentId);
+            InventoryFolderBase folder = m_Scene.InventoryService.GetFolder(f);
+
+            if (folder == null || folder.Owner != remoteClient.AgentId)
+                return;
+
+            if (transactionID != UUID.Zero)
             {
-                ScenePresence presence;
-                if (m_Scene.TryGetScenePresence(remoteClient.AgentId, out presence))
+                IAgentAssetTransactions agentTransactions = m_Scene.AgentTransactionsModule;
+                if (agentTransactions != null)
                 {
-                    byte[] data = null;
+                    if (agentTransactions.HandleItemCreationFromTransaction(
+                        remoteClient, transactionID, folderID, callbackID, description,
+                        name, invType, assetType, wearableType, nextOwnerMask))
+                        return;
+                }
+            }
 
-                    if (invType == (sbyte)InventoryType.Landmark && presence != null)
-                    {
-                        string suffix = string.Empty, prefix = string.Empty;
-                        string strdata = GenerateLandmark(presence, out prefix, out suffix);
-                        data = Encoding.ASCII.GetBytes(strdata);
-                        name = prefix + name;
-                        description += suffix;
-                    }
+            ScenePresence presence;
+            if (m_Scene.TryGetScenePresence(remoteClient.AgentId, out presence))
+            {
+                byte[] data = null;
 
-                    AssetBase asset = m_Scene.CreateAsset(name, description, assetType, data, remoteClient.AgentId);
-                    m_Scene.AssetService.Store(asset);
-                    m_Scene.CreateNewInventoryItem(
-                        remoteClient, remoteClient.AgentId.ToString(), string.Empty, folderID,
-                        name, description, 0, callbackID, asset.FullID, asset.Type, invType, nextOwnerMask, creationDate);
-                }
-                else
+                if (invType == (sbyte)InventoryType.Landmark && presence != null)
                 {
-                    m_log.ErrorFormat(
-                        "[INVENTORY ACCESS MODULE]: ScenePresence for agent uuid {0} unexpectedly not found in CreateNewInventoryItem",
-                        remoteClient.AgentId);
+                    string suffix = string.Empty, prefix = string.Empty;
+                    string strdata = GenerateLandmark(presence, out prefix, out suffix);
+                    data = Encoding.ASCII.GetBytes(strdata);
+                    name = prefix + name;
+                    description += suffix;
                 }
+
+                AssetBase asset = m_Scene.CreateAsset(name, description, assetType, data, remoteClient.AgentId);
+                m_Scene.AssetService.Store(asset);
+                m_Scene.CreateNewInventoryItem(
+                        remoteClient, remoteClient.AgentId.ToString(), string.Empty, folderID,
+                        name, description, 0, callbackID, asset.FullID, asset.Type, invType, nextOwnerMask, creationDate);              
             }
             else
             {
-                IAgentAssetTransactions agentTransactions = m_Scene.AgentTransactionsModule;
-                if (agentTransactions != null)
-                {
-                    agentTransactions.HandleItemCreationFromTransaction(
-                        remoteClient, transactionID, folderID, callbackID, description,
-                        name, invType, assetType, wearableType, nextOwnerMask);
-                }
+                m_log.ErrorFormat(
+                    "[INVENTORY ACCESS MODULE]: ScenePresence for agent uuid {0} unexpectedly not found in CreateNewInventoryItem",
+                    remoteClient.AgentId);
             }
         }
 
@@ -272,6 +278,20 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
 
                     remoteClient.SendAlertMessage("Script saved");
                 }
+                else if ((CustomInventoryType)item.InvType == CustomInventoryType.AnimationSet)
+                {
+                    AnimationSet animSet = new AnimationSet(data);
+                    if (!animSet.Validate(x => {
+                        int perms = m_Scene.InventoryService.GetAssetPermissions(remoteClient.AgentId, x);
+                        int required = (int)(PermissionMask.Transfer | PermissionMask.Copy);
+                        if ((perms & required) != required)
+                            return false;
+                        return true;
+                    }))
+                    {
+                        data = animSet.ToBytes();
+                    }
+                }
 
                 AssetBase asset =
                     CreateAsset(item.Name, item.Description, (sbyte)item.AssetType, data, remoteClient.AgentId.ToString());
@@ -380,7 +400,9 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
             bool asAttachment)
         {
             CoalescedSceneObjects coa = new CoalescedSceneObjects(UUID.Zero);                
-//            Dictionary<UUID, Vector3> originalPositions = new Dictionary<UUID, Vector3>();
+            Dictionary<UUID, Vector3> originalPositions = new Dictionary<UUID, Vector3>();
+            // this possible is not needed if keyframes are saved
+            Dictionary<UUID, KeyframeMotion> originalKeyframes = new Dictionary<UUID, KeyframeMotion>();
 
             Dictionary<SceneObjectGroup, KeyframeMotion> group2Keyframe = new Dictionary<SceneObjectGroup, KeyframeMotion>();
 
@@ -388,24 +410,46 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
             {
                 if (objectGroup.RootPart.KeyframeMotion != null)
                 {
-                    objectGroup.RootPart.KeyframeMotion.Pause();
-                    group2Keyframe.Add(objectGroup, objectGroup.RootPart.KeyframeMotion);
-                    objectGroup.RootPart.KeyframeMotion = null;
+                    objectGroup.RootPart.KeyframeMotion.Suspend();
+                }
+                objectGroup.RootPart.SetForce(Vector3.Zero);
+                objectGroup.RootPart.SetAngularImpulse(Vector3.Zero, false);
+
+                originalKeyframes[objectGroup.UUID] = objectGroup.RootPart.KeyframeMotion;
+                objectGroup.RootPart.KeyframeMotion = null;
+
+                Vector3 inventoryStoredPosition = new Vector3
+                            (((objectGroup.AbsolutePosition.X > (int)Constants.RegionSize)
+                                  ? 250
+                                  : objectGroup.AbsolutePosition.X)
+                             ,
+                             (objectGroup.AbsolutePosition.Y > (int)Constants.RegionSize)
+                                 ? 250
+                                 : objectGroup.AbsolutePosition.Y,
+                             objectGroup.AbsolutePosition.Z);
+
+                Quaternion inventoryStoredRotation = objectGroup.GroupRotation;
+                originalPositions[objectGroup.UUID] = objectGroup.AbsolutePosition;
+
+                // Restore attachment data after trip through the sim
+                if (objectGroup.RootPart.AttachPoint > 0)
+                {
+                    inventoryStoredPosition = objectGroup.RootPart.AttachedPos;
+                    inventoryStoredRotation = objectGroup.RootPart.AttachRotation;
                 }
 
-//                Vector3 inventoryStoredPosition = new Vector3
-//                            (((objectGroup.AbsolutePosition.X > (int)Constants.RegionSize)
-//                                  ? 250
-//                                  : objectGroup.AbsolutePosition.X)
-//                             ,
-//                             (objectGroup.AbsolutePosition.Y > (int)Constants.RegionSize)
-//                                 ? 250
-//                                 : objectGroup.AbsolutePosition.Y,
-//                             objectGroup.AbsolutePosition.Z);
-//
-//                originalPositions[objectGroup.UUID] = objectGroup.AbsolutePosition;
-//
-//                objectGroup.AbsolutePosition = inventoryStoredPosition;
+                // Trees could be attached and it's been done, but it makes
+                // no sense. State must be preserved because it's the tree type
+                if (objectGroup.RootPart.Shape.PCode != (byte) PCode.Tree &&
+                    objectGroup.RootPart.Shape.PCode != (byte) PCode.NewTree)
+                {
+                    objectGroup.RootPart.Shape.State = objectGroup.RootPart.AttachPoint;
+                    if (objectGroup.RootPart.AttachPoint > 0)
+                        objectGroup.RootPart.Shape.LastAttachPoint = objectGroup.RootPart.AttachPoint;
+                }
+
+                objectGroup.AbsolutePosition = inventoryStoredPosition;
+                objectGroup.RootPart.RotationOffset = inventoryStoredRotation;
 
                 // Make sure all bits but the ones we want are clear
                 // on take.
@@ -433,9 +477,14 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
             else
                 itemXml = SceneObjectSerializer.ToOriginalXmlFormat(objlist[0], !asAttachment);
             
-//            // Restore the position of each group now that it has been stored to inventory.
-//            foreach (SceneObjectGroup objectGroup in objlist)
-//                objectGroup.AbsolutePosition = originalPositions[objectGroup.UUID];
+            // Restore the position of each group now that it has been stored to inventory.
+            foreach (SceneObjectGroup objectGroup in objlist)
+            {
+                objectGroup.AbsolutePosition = originalPositions[objectGroup.UUID];
+                objectGroup.RootPart.KeyframeMotion = originalKeyframes[objectGroup.UUID];
+                if (objectGroup.RootPart.KeyframeMotion != null)
+                    objectGroup.RootPart.KeyframeMotion.Resume();
+            }
 
             InventoryItemBase item = CreateItemForObject(action, remoteClient, objlist[0], folderID);
 
@@ -492,7 +541,11 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                 item.Name = asset.Name;
                 item.AssetType = asset.Type;
 
-                AddPermissions(item, objlist[0], objlist, remoteClient);
+                //preserve perms on return
+                if(DeRezAction.Return == action)
+                    AddPermissions(item, objlist[0], objlist, null);
+                else
+                    AddPermissions(item, objlist[0], objlist, remoteClient);
 
                 m_Scene.AddInventoryItem(item);
 
@@ -543,15 +596,17 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
         {
             uint effectivePerms = (uint)(PermissionMask.Copy | PermissionMask.Transfer | PermissionMask.Modify | PermissionMask.Move | PermissionMask.Export) | 7;
             uint allObjectsNextOwnerPerms = 0x7fffffff;
-            uint allObjectsEveryOnePerms = 0x7fffffff;
-            uint allObjectsGroupPerms = 0x7fffffff;
 
+            // For the porposes of inventory, an object is modify if the prims
+            // are modify. This allows renaming an object that contains no
+            // mod items.
             foreach (SceneObjectGroup grp in objsForEffectivePermissions)
             {
-                effectivePerms &= grp.GetEffectivePermissions();
-                allObjectsNextOwnerPerms &= grp.RootPart.NextOwnerMask;
-                allObjectsEveryOnePerms &= grp.RootPart.EveryoneMask;
-                allObjectsGroupPerms &= grp.RootPart.GroupMask;
+                uint groupPerms = grp.GetEffectivePermissions(true);
+                if ((grp.RootPart.BaseMask & (uint)PermissionMask.Modify) != 0)
+                    groupPerms |= (uint)PermissionMask.Modify;
+
+                effectivePerms &= groupPerms;
             }
             effectivePerms |= (uint)PermissionMask.Move;
 
@@ -565,11 +620,11 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                 uint perms = effectivePerms;
                 PermissionsUtil.ApplyFoldedPermissions(effectivePerms, ref perms);
 
-                item.BasePermissions = perms & allObjectsNextOwnerPerms;
+                item.BasePermissions = perms & so.RootPart.NextOwnerMask;
                 item.CurrentPermissions = item.BasePermissions;
-                item.NextPermissions = perms & allObjectsNextOwnerPerms;
-                item.EveryOnePermissions = allObjectsEveryOnePerms & allObjectsNextOwnerPerms;
-                item.GroupPermissions = allObjectsGroupPerms & allObjectsNextOwnerPerms;
+                item.NextPermissions = perms & so.RootPart.NextOwnerMask;
+                item.EveryOnePermissions = so.RootPart.EveryoneMask & so.RootPart.NextOwnerMask;
+                item.GroupPermissions = so.RootPart.GroupMask & so.RootPart.NextOwnerMask;
                 
                 // apply next owner perms on rez
                 item.CurrentPermissions |= SceneObjectGroup.SLAM;
@@ -585,9 +640,9 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
 
                 item.BasePermissions = effectivePerms;
                 item.CurrentPermissions = effectivePerms;
-                item.NextPermissions = allObjectsNextOwnerPerms & effectivePerms;
-                item.EveryOnePermissions = allObjectsEveryOnePerms & effectivePerms;
-                item.GroupPermissions = allObjectsGroupPerms & effectivePerms;
+                item.NextPermissions = so.RootPart.NextOwnerMask & effectivePerms;
+                item.EveryOnePermissions = so.RootPart.EveryoneMask & effectivePerms;
+                item.GroupPermissions = so.RootPart.GroupMask & effectivePerms;
 
                 item.CurrentPermissions &=
                         ((uint)PermissionMask.Copy |
@@ -743,7 +798,8 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                     if (so.FromFolderID != UUID.Zero && so.RootPart.OwnerID == remoteClient.AgentId)
                     {
                         InventoryFolderBase f = new InventoryFolderBase(so.FromFolderID, userID);
-                        folder = m_Scene.InventoryService.GetFolder(f);
+                        if (f != null)
+                            folder = m_Scene.InventoryService.GetFolder(f);
 
                         if(folder.Type == 14 || folder.Type == 16)
                         {
@@ -779,16 +835,11 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
             bool RezSelected, bool RemoveItem, UUID fromTaskID, bool attachment)
         {
 //            m_log.DebugFormat("[INVENTORY ACCESS MODULE]: RezObject for {0}, item {1}", remoteClient.Name, itemID);
-
             InventoryItemBase item = new InventoryItemBase(itemID, remoteClient.AgentId);
             item = m_Scene.InventoryService.GetItem(item);
 
             if (item == null)
             {
-                m_log.WarnFormat(
-                    "[INVENTORY ACCESS MODULE]: Could not find item {0} for {1} in RezObject()",
-                    itemID, remoteClient.Name);
-
                 return null;
             }
 
@@ -856,12 +907,35 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                 pos -= bbox / 2;
             }
 
+            int primcount = 0;
+            foreach (SceneObjectGroup g in objlist)
+                primcount += g.PrimCount;
+
+            if (!m_Scene.Permissions.CanRezObject(
+                primcount, remoteClient.AgentId, pos)
+                && !attachment)
+            {
+                // The client operates in no fail mode. It will
+                // have already removed the item from the folder
+                // if it's no copy.
+                // Put it back if it's not an attachment
+                //
+                if (item != null)
+                {
+                    if (((item.CurrentPermissions & (uint)PermissionMask.Copy) == 0) && (!attachment))
+                        remoteClient.SendBulkUpdateInventory(item);
+                }
+
+                return null;
+            }
+
             if (item != null && !DoPreRezWhenFromItem(remoteClient, item, objlist, pos, veclist, attachment))
                 return null;
 
             for (int i = 0; i < objlist.Count; i++)
             {
                 group = objlist[i];
+                SceneObjectPart rootPart = group.RootPart;
 
 //                m_log.DebugFormat(
 //                    "[INVENTORY ACCESS MODULE]: Preparing to rez {0} {1} {2} ownermask={3:X} nextownermask={4:X} groupmask={5:X} everyonemask={6:X} for {7}",
@@ -909,7 +983,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
 
                 if (attachment)
                 {
-                    group.RootPart.Flags |= PrimFlags.Phantom;
+//                    group.RootPart.Flags |= PrimFlags.Phantom;
                     group.IsAttachment = true;
                 }
 
@@ -934,8 +1008,6 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
 
                 if (!attachment)
                 {
-                    SceneObjectPart rootPart = group.RootPart;
-
                     if (rootPart.Shape.PCode == (byte)PCode.Prim)
                         group.ClearPartAttachmentData();
 
@@ -953,6 +1025,8 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
 //                    remoteClient.Name);
             }
 
+            group.SetGroup(remoteClient.ActiveGroupId, remoteClient);
+
             if (item != null)
                 DoPostRezWhenFromItem(item, attachment);
 
@@ -1033,10 +1107,16 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                 // object itself before we rez.
                 //
                 // Only do these for the first object if we are rezzing a coalescence.
-                if (i == 0)
+                // nahh dont mess with coalescence objects,
+                // the name in inventory can be change for inventory purpuses only
+                if (objlist.Count == 1)
                 {
                     rootPart.Name = item.Name;
                     rootPart.Description = item.Description;
+                }
+
+                if ((item.Flags & (uint)InventoryItemFlags.ObjectSlamSale) != 0)
+                {
                     rootPart.ObjectSaleType = item.SaleType;
                     rootPart.SalePrice = item.SalePrice;
                 }
@@ -1047,17 +1127,55 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
 //                    "[INVENTORY ACCESS MODULE]: rootPart.OwnedID {0}, item.Owner {1}, item.CurrentPermissions {2:X}",
 //                    rootPart.OwnerID, item.Owner, item.CurrentPermissions);
 
-                if ((rootPart.OwnerID != item.Owner) || (item.CurrentPermissions & SceneObjectGroup.SLAM) != 0)
+                if ((rootPart.OwnerID != item.Owner) ||
+                    (item.CurrentPermissions & 16) != 0 ||
+                    (item.Flags & (uint)InventoryItemFlags.ObjectSlamPerm) != 0)
                 {
                     //Need to kill the for sale here
                     rootPart.ObjectSaleType = 0;
                     rootPart.SalePrice = 10;
-                }
+    
+                    if (m_Scene.Permissions.PropagatePermissions())
+                    {
+                        foreach (SceneObjectPart part in so.Parts)
+                        {
+                            part.GroupMask = 0; // DO NOT propagate here
+
+                            part.LastOwnerID = part.OwnerID;
+                            part.OwnerID = item.Owner;
+                            part.Inventory.ChangeInventoryOwner(item.Owner);
+                        }
+    
+                        so.ApplyNextOwnerPermissions();
 
-                foreach (SceneObjectPart part in so.Parts)
+                        // In case the user has changed flags on a received item
+                        // we have to apply those changes after the slam. Else we
+                        // get a net loss of permissions
+                        foreach (SceneObjectPart part in so.Parts)
+                        {
+                            if ((item.Flags & (uint)InventoryItemFlags.ObjectHasMultipleItems) == 0)
+                            {
+                                if ((item.Flags & (uint)InventoryItemFlags.ObjectOverwriteEveryone) != 0)
+                                    part.EveryoneMask = item.EveryOnePermissions & part.BaseMask;
+                                if ((item.Flags & (uint)InventoryItemFlags.ObjectOverwriteNextOwner) != 0)
+                                    part.NextOwnerMask = item.NextPermissions & part.BaseMask;
+                            }
+                        }
+                    }
+                }
+                else
                 {
-                    part.FromUserInventoryItemID = fromUserInventoryItemId;
-                    part.ApplyPermissionsOnRez(item, true, m_Scene);
+                    foreach (SceneObjectPart part in so.Parts)
+                    {
+                        part.FromUserInventoryItemID = fromUserInventoryItemId;
+
+                        if ((item.Flags & (uint)InventoryItemFlags.ObjectOverwriteEveryone) != 0)
+                            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;
+                    }
                 }
 
                 rootPart.TrimPermissions();
diff --git a/OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs b/OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs
index 64feec1..93a7cf2 100644
--- a/OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs
@@ -205,7 +205,7 @@ namespace OpenSim.Region.CoreModules.Framework.Monitoring
                     m_scene,
                     "ScriptEventsPerSecondMonitor",
                     "Script Events",
-                    m => m.Scene.StatsReporter.LastReportedSimStats[20],
+                    m => m.Scene.StatsReporter.LastReportedSimStats[23],
                     m => string.Format("{0} per second", m.GetValue())));
 
             m_staticMonitors.Add(
@@ -301,7 +301,7 @@ namespace OpenSim.Region.CoreModules.Framework.Monitoring
                     m_scene,
                     "SpareFrameTimeMonitor",
                     "Spare Frame Time",
-                    m => m.Scene.StatsReporter.LastReportedSimStats[21],
+                    m => m.Scene.StatsReporter.LastReportedSimStats[38],
                     m => string.Format("{0} ms", m.GetValue())));
 
             m_alerts.Add(new DeadlockAlert(m_staticMonitors.Find(x => x is LastFrameTimeMonitor) as LastFrameTimeMonitor));
diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
index 7ecbd26..7d0c47f 100644
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
@@ -336,6 +336,102 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
             }
         }
 
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="uuid"></param>
+        /// <param name="names">Caller please provide a properly instantiated array for names, string[2]</param>
+        /// <returns></returns>
+        private bool TryGetUserNames(UUID uuid, string[] names)
+        {
+            if (names == null)
+                names = new string[2];
+
+            if (TryGetUserNamesFromCache(uuid, names))
+                return true;
+
+            if (TryGetUserNamesFromServices(uuid, names))
+                return true;
+
+            return false;
+        }
+
+        private bool TryGetUserNamesFromCache(UUID uuid, string[] names)
+        {
+            lock (m_UserCache)
+            {
+                if (m_UserCache.ContainsKey(uuid))
+                {
+                    names[0] = m_UserCache[uuid].FirstName;
+                    names[1] = m_UserCache[uuid].LastName;
+
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        /// <summary>
+        /// Try to get the names bound to the given uuid, from the services.
+        /// </summary>
+        /// <returns>True if the name was found, false if not.</returns>
+        /// <param name='uuid'></param>
+        /// <param name='names'>The array of names if found.  If not found, then names[0] = "Unknown" and names[1] = "User"</param>
+        private bool TryGetUserNamesFromServices(UUID uuid, string[] names)
+        {
+            UserAccount account = m_Scenes[0].UserAccountService.GetUserAccount(UUID.Zero, uuid);
+
+            if (account != null)
+            {
+                names[0] = account.FirstName;
+                names[1] = account.LastName;
+
+                UserData user = new UserData();
+                user.FirstName = account.FirstName;
+                user.LastName = account.LastName;
+
+                lock (m_UserCache)
+                    m_UserCache[uuid] = user;
+
+                return true;
+            }
+            else
+            {
+                // Let's try the GridUser service
+                GridUserInfo uInfo = m_Scenes[0].GridUserService.GetGridUserInfo(uuid.ToString());
+                if (uInfo != null)
+                {
+                    string url, first, last, tmp;
+                    UUID u;
+                    if (Util.ParseUniversalUserIdentifier(uInfo.UserID, out u, out url, out first, out last, out tmp))
+                    {
+                        AddUser(uuid, first, last, url);
+
+                        if (m_UserCache.ContainsKey(uuid))
+                        {
+                            names[0] = m_UserCache[uuid].FirstName;
+                            names[1] = m_UserCache[uuid].LastName;
+
+                            return true;
+                        }
+                    }
+                    else
+                        m_log.DebugFormat("[USER MANAGEMENT MODULE]: Unable to parse UUI {0}", uInfo.UserID);
+                }
+//                else
+//                {
+//                    m_log.DebugFormat("[USER MANAGEMENT MODULE]: No grid user found for {0}", uuid);
+//                }
+
+                names[0] = "Unknown";
+                names[1] = "UserUMMTGUN9";
+
+                return false;
+            }
+        }
+
+
         #region IUserManagement
 
         public UUID GetUserIdByName(string name)
diff --git a/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs b/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs
index ea5b34e..a5c7543 100644
--- a/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs
@@ -138,9 +138,9 @@ namespace OpenSim.Region.CoreModules.Hypergrid
             }
         }
 
-        protected override List<MapBlockData> GetAndSendBlocks(IClientAPI remoteClient, int minX, int minY, int maxX, int maxY, uint flag)
+        protected override List<MapBlockData> GetAndSendBlocksInternal(IClientAPI remoteClient, int minX, int minY, int maxX, int maxY, uint flag)
         {
-            List<MapBlockData>  mapBlocks = base.GetAndSendBlocks(remoteClient, minX, minY, maxX, maxY, flag);
+            List<MapBlockData>  mapBlocks = base.GetAndSendBlocksInternal(remoteClient, minX, minY, maxX, maxY, flag);
             lock (m_SeenMapBlocks)
             {
                 if (!m_SeenMapBlocks.ContainsKey(remoteClient.AgentId))
diff --git a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
index 9dfeb96..87f4798 100644
--- a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
+++ b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
@@ -28,15 +28,12 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Net;
 using System.Net.Mail;
 using System.Net.Security;
-using System.Reflection;
 using System.Text;
 using System.Threading;
 using System.Security.Cryptography.X509Certificates;
-using log4net;
 using Nini.Config;
 using OpenMetaverse;
 using OpenSim.Framework;
@@ -45,6 +42,7 @@ using OpenSim.Framework.Servers.HttpServer;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using Mono.Addins;
+using Amib.Threading;
 
 /*****************************************************
  *
@@ -108,6 +106,7 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
         private Dictionary<UUID, HttpRequestClass> m_pendingRequests;
         private Scene m_scene;
         // private Queue<HttpRequestClass> rpcQueue = new Queue<HttpRequestClass>();
+        public static SmartThreadPool ThreadPool = null;
 
         public HttpRequestModule()
         {
@@ -290,29 +289,18 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
             return true;
         }
 
-        public void StopHttpRequestsForScript(UUID id)
+        public void StopHttpRequest(uint m_localID, UUID m_itemID)
         {
             if (m_pendingRequests != null)
             {
-                List<UUID> keysToRemove = null;
-
                 lock (HttpListLock)
                 {
-                    foreach (HttpRequestClass req in m_pendingRequests.Values)
+                    HttpRequestClass tmpReq;
+                    if (m_pendingRequests.TryGetValue(m_itemID, out tmpReq))
                     {
-                        if (req.ItemID == id)
-                        {
-                            req.Stop();
-
-                            if (keysToRemove == null)
-                                keysToRemove = new List<UUID>();
-
-                            keysToRemove.Add(req.ReqID);
-                        }
+                        tmpReq.Stop();
+                        m_pendingRequests.Remove(m_itemID);
                     }
-
-                    if (keysToRemove != null)
-                        keysToRemove.ForEach(keyToRemove => m_pendingRequests.Remove(keyToRemove));
                 }
             }
         }
@@ -330,13 +318,19 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
         {
             lock (HttpListLock)
             {
-                foreach (HttpRequestClass req in m_pendingRequests.Values)
+                foreach (UUID luid in m_pendingRequests.Keys)
                 {
-                    if (req.Finished)
-                        return req;
+                    HttpRequestClass tmpReq;
+
+                    if (m_pendingRequests.TryGetValue(luid, out tmpReq))
+                    {
+                        if (tmpReq.Finished)
+                        {
+                            return tmpReq;
+                        }
+                    }
                 }
             }
-
             return null;
         }
 
@@ -363,9 +357,32 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
             m_proxyurl = config.Configs["Startup"].GetString("HttpProxy");
             m_proxyexcepts = config.Configs["Startup"].GetString("HttpProxyExceptions");
 
+
             m_outboundUrlFilter = new OutboundUrlFilter("Script HTTP request module", config);
+            int maxThreads = 15;
+
+            IConfig httpConfig = config.Configs["HttpRequestModule"];
+            if (httpConfig != null)
+            {
+                maxThreads = httpConfig.GetInt("MaxPoolThreads", maxThreads);
+            }
 
             m_pendingRequests = new Dictionary<UUID, HttpRequestClass>();
+
+            // First instance sets this up for all sims
+            if (ThreadPool == null)
+            {
+                STPStartInfo startInfo = new STPStartInfo();
+                startInfo.IdleTimeout = 20000;
+                startInfo.MaxWorkerThreads = maxThreads;
+                startInfo.MinWorkerThreads = 1;
+                startInfo.ThreadPriority = ThreadPriority.BelowNormal;
+                startInfo.StartSuspended = true;
+                startInfo.ThreadPoolName = "ScriptsHttpReq";
+
+                ThreadPool = new SmartThreadPool(startInfo);
+                ThreadPool.Start();
+            }
         }
 
         public void AddRegion(Scene scene)
@@ -409,8 +426,6 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
 
     public class HttpRequestClass : IServiceRequest
     {
-//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
         // Constants for parameters
         // public const int HTTP_BODY_MAXLENGTH = 2;
         // public const int HTTP_METHOD = 0;
@@ -437,6 +452,8 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
         public string HttpMIMEType = "text/plain;charset=utf-8";
         public int HttpTimeout;
         public bool HttpVerifyCert = true;
+        public IWorkItemResult WorkItem = null;
+
         //public bool HttpVerboseThrottle = true; // not implemented
         public List<string> HttpCustomHeaders = null;
         public bool HttpPragmaNoCache = true;
@@ -484,15 +501,40 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
 
         public void Process()
         {
+            _finished = false;
+
+            lock (HttpRequestModule.ThreadPool)
+                WorkItem = HttpRequestModule.ThreadPool.QueueWorkItem(new WorkItemCallback(StpSendWrapper), null);
+        }
+
+        private object StpSendWrapper(object o)
+        {
             SendRequest();
+            return null;
         }
 
+        /*
+         * TODO: More work on the response codes.  Right now
+         * returning 200 for success or 499 for exception
+         */
+
         public void SendRequest()
         {
+            HttpWebResponse response = null;
+            Stream resStream = null;
+            StringBuilder sb = new StringBuilder();
+            byte[] buf = new byte[8192];
+            string tempString = null;
+            int count = 0;
+
             try
             {
                 Request = (HttpWebRequest)WebRequest.Create(Url);
                 Request.AllowAutoRedirect = false;               
+
+                //This works around some buggy HTTP Servers like Lighttpd
+                Request.ServicePoint.Expect100Continue = false;
+
                 Request.Method = HttpMethod;
                 Request.ContentType = HttpMIMEType;
 
@@ -500,7 +542,6 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
                 {
                     // We could hijack Connection Group Name to identify
                     // a desired security exception.  But at the moment we'll use a dummy header instead.
-//                    Request.ConnectionGroupName = "NoVerify";
                     Request.Headers.Add("NoVerifyCert", "true");
                 }
 //                else
@@ -533,14 +574,11 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
                     }
                 }
 
-                if (ResponseHeaders != null)
-                {
-                    foreach (KeyValuePair<string, string> entry in ResponseHeaders)
-                        if (entry.Key.ToLower().Equals("user-agent") && Request is HttpWebRequest)
-                            ((HttpWebRequest)Request).UserAgent = entry.Value;
-                        else
-                            Request.Headers[entry.Key] = entry.Value;
-                }
+                foreach (KeyValuePair<string, string> entry in ResponseHeaders)
+                    if (entry.Key.ToLower().Equals("user-agent"))
+                        Request.UserAgent = entry.Value;
+                    else
+                        Request.Headers[entry.Key] = entry.Value;
 
                 // Encode outbound data
                 if (!string.IsNullOrEmpty(OutboundBody))
@@ -552,12 +590,11 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
                         bstream.Write(data, 0, data.Length);
                 }
 
+                Request.Timeout = HttpTimeout;
                 try
                 {
-                    IAsyncResult result = (IAsyncResult)Request.BeginGetResponse(ResponseCallback, null);
-
-                    ThreadPool.RegisterWaitForSingleObject(
-                        result.AsyncWaitHandle, new WaitOrTimerCallback(TimeoutCallback), null, HttpTimeout, true);
+                    // execute the request
+                    response = (HttpWebResponse) Request.GetResponse();
                 }
                 catch (WebException e)
                 {
@@ -565,63 +602,72 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
                     {
                         throw;
                     }
+                    response = (HttpWebResponse)e.Response;
+                }
 
-                    HttpWebResponse response = (HttpWebResponse)e.Response;
+                Status = (int)response.StatusCode;
 
-                    Status = (int)response.StatusCode;
-                    ResponseBody = response.StatusDescription;
-                    _finished = true;
-                }
-            }
-            catch (Exception e)
-            {
-//                m_log.Debug(
-//                    string.Format("[SCRIPTS HTTP REQUESTS]: Exception on request to {0} for {1}  ", Url, ItemID), e);
+                resStream = response.GetResponseStream();
 
-                Status = (int)OSHttpStatusCode.ClientErrorJoker;
-                ResponseBody = e.Message;
-                _finished = true;
-            }
-        }
+                do
+                {
+                    // fill the buffer with data
+                    count = resStream.Read(buf, 0, buf.Length);
 
-        private void ResponseCallback(IAsyncResult ar)
-        {
-            HttpWebResponse response = null;
+                    // make sure we read some data
+                    if (count != 0)
+                    {
+                        // translate from bytes to ASCII text
+                        tempString = Util.UTF8.GetString(buf, 0, count);
 
-            try
+                        // continue building the string
+                        sb.Append(tempString);
+                        if (sb.Length > 2048)
+                            break;
+                    }
+                } while (count > 0); // any more data to read?
+
+                ResponseBody = sb.ToString().Replace("\r", "");
+            }
+            catch (WebException e)
             {
-                try
+                if (e.Status == WebExceptionStatus.ProtocolError)
                 {
-                    response = (HttpWebResponse)Request.EndGetResponse(ar);
-                }
-                catch (WebException e)
-                {
-                    if (e.Status != WebExceptionStatus.ProtocolError)
+                    HttpWebResponse webRsp = (HttpWebResponse)((WebException)e).Response;
+                    Status = (int)webRsp.StatusCode;
+                    try
                     {
-                        throw;
+                        using (Stream responseStream = webRsp.GetResponseStream())
+                        {
+                            using (StreamReader reader = new StreamReader(responseStream))
+                                ResponseBody = reader.ReadToEnd();
+                        }
+                    }
+                    catch
+                    {
+                        ResponseBody = webRsp.StatusDescription;
                     }
-
-                    response = (HttpWebResponse)e.Response;
+                }
+                else
+                {
+                    Status = (int)OSHttpStatusCode.ClientErrorJoker;
+                    ResponseBody = e.Message;
                 }
 
-                Status = (int)response.StatusCode;
+                if (ResponseBody == null)
+                    ResponseBody = String.Empty;
 
-                using (Stream stream = response.GetResponseStream())
-                {
-                    StreamReader reader = new StreamReader(stream, Encoding.UTF8);
-                    ResponseBody = reader.ReadToEnd();
-                } 
+                _finished = true;
+                return;
             }
             catch (Exception e)
             {
-                Status = (int)OSHttpStatusCode.ClientErrorJoker;
-                ResponseBody = e.Message;
-
-//                m_log.Debug(
-//                    string.Format("[SCRIPTS HTTP REQUESTS]: Exception on response to {0} for {1}  ", Url, ItemID), e);
+                // Don't crash on anything else
             }
             finally
             {
+                if (resStream != null)
+                    resStream.Close();
                 if (response != null)
                     response.Close();
 
@@ -672,20 +718,25 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
                     _finished = true;
                 }
             }
-        }
 
-        private void TimeoutCallback(object state, bool timedOut)
-        {
-            if (timedOut)
-                Request.Abort();
+            if (ResponseBody == null)
+                ResponseBody = String.Empty;
+
+            _finished = true;
         }
 
         public void Stop()
         {
-//            m_log.DebugFormat("[SCRIPTS HTTP REQUESTS]: Stopping request to {0} for {1}  ", Url, ItemID);
-
-            if (Request != null)
-                Request.Abort();
+            try
+            {
+                if (!WorkItem.Cancel())
+                {
+                    WorkItem.Cancel(true);
+                }
+            }
+            catch (Exception)
+            {
+            }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
index 99a3122..1983fed 100644
--- a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
@@ -42,40 +42,16 @@ using OpenSim.Region.Framework.Scenes;
 
 namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
 {
-    /// <summary>
-    /// Data describing an external URL set up by a script.
-    /// </summary>
     public class UrlData
     {
-        /// <summary>
-        /// Scene object part hosting the script
-        /// </summary>
         public UUID hostID;
-
-        /// <summary>
-        /// The item ID of the script that requested the URL.
-        /// </summary>
         public UUID itemID;
-
-        /// <summary>
-        /// The script engine that runs the script.
-        /// </summary>
         public IScriptModule engine;
-
-        /// <summary>
-        /// The generated URL.
-        /// </summary>
         public string url;
-
-        /// <summary>
-        /// The random UUID component of the generated URL.
-        /// </summary>
         public UUID urlcode;
-
-        /// <summary>
-        /// The external requests currently being processed or awaiting retrieval for this URL.
-        /// </summary>
         public Dictionary<UUID, RequestData> requests;
+        public bool isSsl;
+        public Scene scene;
     }
 
     public class RequestData
@@ -89,7 +65,11 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
         //public ManualResetEvent ev;
         public bool requestDone;
         public int startTime;
+        public bool responseSent;
         public string uri;
+        public bool allowResponseType = false;
+        public UUID hostID;
+        public Scene scene;
     }
 
     /// <summary>
@@ -102,20 +82,11 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
                 LogManager.GetLogger(
                 MethodBase.GetCurrentMethod().DeclaringType);
 
-        /// <summary>
-        /// Indexs the URL request metadata (which script requested it, outstanding requests, etc.) by the request ID
-        /// randomly generated when a request is received for this URL.
-        /// </summary>
-        /// <remarks>
-        /// Manipulation or retrieval from this dictionary must be locked on m_UrlMap to preserve consistency with
-        /// m_UrlMap
-        /// </remarks>
-        private Dictionary<UUID, UrlData> m_RequestMap = new Dictionary<UUID, UrlData>();
+        private Dictionary<UUID, UrlData> m_RequestMap =
+                new Dictionary<UUID, UrlData>();
 
-        /// <summary>
-        /// Indexs the URL request metadata (which script requested it, outstanding requests, etc.) by the full URL
-        /// </summary>
-        private Dictionary<string, UrlData> m_UrlMap = new Dictionary<string, UrlData>();
+        private Dictionary<string, UrlData> m_UrlMap =
+                new Dictionary<string, UrlData>();
 
         private uint m_HttpsPort = 0;
         private IHttpServer m_HttpServer = null;
@@ -126,7 +97,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
         /// <summary>
         /// The default maximum number of urls
         /// </summary>
-        public const int DefaultTotalUrls = 100;
+        public const int DefaultTotalUrls = 15000;
 
         /// <summary>
         /// Maximum number of external urls that can be set up by this module.
@@ -204,6 +175,17 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
 
         public void RemoveRegion(Scene scene)
         {
+            // Drop references to that scene
+            foreach (KeyValuePair<string, UrlData> kvp in m_UrlMap)
+            {
+                if (kvp.Value.scene == scene)
+                    kvp.Value.scene = null;
+            }
+            foreach (KeyValuePair<UUID, UrlData> kvp in m_RequestMap)
+            {
+                if (kvp.Value.scene == scene)
+                    kvp.Value.scene = null;
+            }
         }
 
         public void Close()
@@ -221,7 +203,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
                     engine.PostScriptEvent(itemID, "http_request", new Object[] { urlcode.ToString(), "URL_REQUEST_DENIED", "" });
                     return urlcode;
                 }
-                string url = "http://" + ExternalHostNameForLSL + ":" + m_HttpServer.Port.ToString() + "/lslhttp/" + urlcode.ToString() + "/";
+                string url = "http://" + ExternalHostNameForLSL + ":" + m_HttpServer.Port.ToString() + "/lslhttp/" + urlcode.ToString();
 
                 UrlData urlData = new UrlData();
                 urlData.hostID = host.UUID;
@@ -229,20 +211,22 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
                 urlData.engine = engine;
                 urlData.url = url;
                 urlData.urlcode = urlcode;
+                urlData.isSsl = false;
                 urlData.requests = new Dictionary<UUID, RequestData>();
-                
+                urlData.scene = host.ParentGroup.Scene;
+
                 m_UrlMap[url] = urlData;
                 
-                string uri = "/lslhttp/" + urlcode.ToString() + "/";
+                string uri = "/lslhttp/" + urlcode.ToString();
                
                 PollServiceEventArgs args 
                     = new PollServiceEventArgs(HttpRequestHandler, uri, HasEvents, GetEvents, NoEvents, urlcode, 25000);
                 args.Type = PollServiceEventArgs.EventType.LslHttp;
                 m_HttpServer.AddPollServiceHTTPHandler(uri, args);
 
-                m_log.DebugFormat(
-                    "[URL MODULE]: Set up incoming request url {0} for {1} in {2} {3}",
-                    uri, itemID, host.Name, host.LocalId);
+//                m_log.DebugFormat(
+//                    "[URL MODULE]: Set up incoming request url {0} for {1} in {2} {3}",
+//                    uri, itemID, host.Name, host.LocalId);
 
                 engine.PostScriptEvent(itemID, "http_request", new Object[] { urlcode.ToString(), "URL_REQUEST_GRANTED", url });
             }
@@ -267,7 +251,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
                     engine.PostScriptEvent(itemID, "http_request", new Object[] { urlcode.ToString(), "URL_REQUEST_DENIED", "" });
                     return urlcode;
                 }
-                string url = "https://" + ExternalHostNameForLSL + ":" + m_HttpsServer.Port.ToString() + "/lslhttps/" + urlcode.ToString() + "/";
+                string url = "https://" + ExternalHostNameForLSL + ":" + m_HttpsServer.Port.ToString() + "/lslhttps/" + urlcode.ToString();
 
                 UrlData urlData = new UrlData();
                 urlData.hostID = host.UUID;
@@ -275,20 +259,22 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
                 urlData.engine = engine;
                 urlData.url = url;
                 urlData.urlcode = urlcode;
+                urlData.isSsl = true;
                 urlData.requests = new Dictionary<UUID, RequestData>();
 
+                
                 m_UrlMap[url] = urlData;
                 
-                string uri = "/lslhttps/" + urlcode.ToString() + "/";
+                string uri = "/lslhttps/" + urlcode.ToString();
                
                 PollServiceEventArgs args 
                     = new PollServiceEventArgs(HttpRequestHandler, uri, HasEvents, GetEvents, NoEvents, urlcode, 25000);
                 args.Type = PollServiceEventArgs.EventType.LslHttp;
                 m_HttpsServer.AddPollServiceHTTPHandler(uri, args);
 
-                m_log.DebugFormat(
-                    "[URL MODULE]: Set up incoming secure request url {0} for {1} in {2} {3}",
-                    uri, itemID, host.Name, host.LocalId);
+//                m_log.DebugFormat(
+//                    "[URL MODULE]: Set up incoming secure request url {0} for {1} in {2} {3}",
+//                    uri, itemID, host.Name, host.LocalId);
 
                 engine.PostScriptEvent(itemID, "http_request", new Object[] { urlcode.ToString(), "URL_REQUEST_GRANTED", url });
             }
@@ -307,12 +293,15 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
                     return;
                 }
 
-                foreach (UUID req in data.requests.Keys)
-                    m_RequestMap.Remove(req);
-
-                m_log.DebugFormat(
-                    "[URL MODULE]: Releasing url {0} for {1} in {2}",
-                    url, data.itemID, data.hostID);
+                lock (m_RequestMap)
+                {
+                    foreach (UUID req in data.requests.Keys)
+                        m_RequestMap.Remove(req);
+                }
+                        
+//                m_log.DebugFormat(
+//                    "[URL MODULE]: Releasing url {0} for {1} in {2}",
+//                    url, data.itemID, data.hostID);
 
                 RemoveUrl(data);
                 m_UrlMap.Remove(url);
@@ -337,29 +326,39 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
         
         public void HttpResponse(UUID request, int status, string body)
         {
-            lock (m_UrlMap)
+            lock (m_RequestMap)
             {
                 if (m_RequestMap.ContainsKey(request))
                 {
                     UrlData urlData = m_RequestMap[request];
-                    string responseBody = body;
-                    if (urlData.requests[request].responseType.Equals("text/plain"))
+                    if (!urlData.requests[request].responseSent)
                     {
-                        string value;
-                        if (urlData.requests[request].headers.TryGetValue("user-agent", out value))
+                        string responseBody = body;
+
+                        // If we have no OpenID from built-in browser, disable this
+                        if (!urlData.requests[request].allowResponseType)
+                            urlData.requests[request].responseType = "text/plain";
+
+                        if (urlData.requests[request].responseType.Equals("text/plain"))
                         {
-                            if (value != null && value.IndexOf("MSIE") >= 0)
+                            string value;
+                            if (urlData.requests[request].headers.TryGetValue("user-agent", out value))
                             {
-                                // wrap the html escaped response if the target client is IE
-                                // It ignores "text/plain" if the body is html
-                                responseBody = "<html>" + System.Web.HttpUtility.HtmlEncode(body) + "</html>";
+                                if (value != null && value.IndexOf("MSIE") >= 0)
+                                {
+                                    // wrap the html escaped response if the target client is IE
+                                    // It ignores "text/plain" if the body is html
+                                    responseBody = "<html>" + System.Web.HttpUtility.HtmlEncode(body) + "</html>";
+                                }
                             }
                         }
+
+                        urlData.requests[request].responseCode = status;
+                        urlData.requests[request].responseBody = body;
+                        //urlData.requests[request].ev.Set();
+                        urlData.requests[request].requestDone = true;
+                        urlData.requests[request].responseSent = true;
                     }
-                    urlData.requests[request].responseCode = status;
-                    urlData.requests[request].responseBody = responseBody;
-                    //urlData.requests[request].ev.Set();
-                    urlData.requests[request].requestDone =true;
                 }
                 else
                 {
@@ -370,7 +369,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
 
         public string GetHttpHeader(UUID requestId, string header)
         {
-            lock (m_UrlMap)
+            lock (m_RequestMap)
             {
                 if (m_RequestMap.ContainsKey(requestId))
                 {
@@ -384,7 +383,6 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
                     m_log.Warn("[HttpRequestHandler] There was no http-in request with id " + requestId);
                 }
             }
-
             return String.Empty;
         }
 
@@ -408,8 +406,11 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
                     {
                         RemoveUrl(url.Value);
                         removeURLs.Add(url.Key);
-                        foreach (UUID req in url.Value.requests.Keys)
-                            m_RequestMap.Remove(req);
+                        lock (m_RequestMap)
+                        {
+                            foreach (UUID req in url.Value.requests.Keys)
+                                m_RequestMap.Remove(req);
+                        }
                     }
                 }
 
@@ -430,9 +431,11 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
                     {
                         RemoveUrl(url.Value);
                         removeURLs.Add(url.Key);
-
-                        foreach (UUID req in url.Value.requests.Keys)
-                            m_RequestMap.Remove(req);
+                        lock (m_RequestMap)
+                        {
+                            foreach (UUID req in url.Value.requests.Keys)
+                                m_RequestMap.Remove(req);
+                        }
                     }
                 }
 
@@ -441,123 +444,128 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
             }
         }
 
+
         private void RemoveUrl(UrlData data)
         {
-            m_HttpServer.RemoveHTTPHandler("", "/lslhttp/" + data.urlcode.ToString() + "/");
+            if (data.isSsl)
+                m_HttpsServer.RemoveHTTPHandler("", "/lslhttps/"+data.urlcode.ToString()+"/");
+            else
+                m_HttpServer.RemoveHTTPHandler("", "/lslhttp/"+data.urlcode.ToString()+"/");
         }
 
         private Hashtable NoEvents(UUID requestID, UUID sessionID)
         {
             Hashtable response = new Hashtable();
-            UrlData urlData;
-
-            lock (m_UrlMap)
+            UrlData url;
+            int startTime = 0;
+            lock (m_RequestMap)
             {
-                // We need to return a 404 here in case the request URL was removed at exactly the same time that a
-                // request was made.  In this case, the request thread can outrace llRemoveURL() and still be polling
-                // for the request ID.
                 if (!m_RequestMap.ContainsKey(requestID))
-                {
-                    response["int_response_code"] = 404;
-                    response["str_response_string"] = "";
-                    response["keepalive"] = false;
-                    response["reusecontext"] = false;
-
                     return response;
-                }
+                url = m_RequestMap[requestID];
+                startTime = url.requests[requestID].startTime;
+            }
 
-                urlData = m_RequestMap[requestID];
+            if (System.Environment.TickCount - startTime > 25000)
+            {
+                response["int_response_code"] = 500;
+                response["str_response_string"] = "Script timeout";
+                response["content_type"] = "text/plain";
+                response["keepalive"] = false;
+                response["reusecontext"] = false;
 
-                if (System.Environment.TickCount - urlData.requests[requestID].startTime > 25000)
+                //remove from map
+                lock (url.requests)
+                {
+                    url.requests.Remove(requestID);
+                }
+                lock (m_RequestMap)
                 {
-                    response["int_response_code"] = 500;
-                    response["str_response_string"] = "Script timeout";
-                    response["content_type"] = "text/plain";
-                    response["keepalive"] = false;
-                    response["reusecontext"] = false;
-    
-                    //remove from map
-                    urlData.requests.Remove(requestID);
                     m_RequestMap.Remove(requestID);
-
-                    return response;
                 }
+
+                return response;
             }
 
+            
             return response;
         }
 
         private bool HasEvents(UUID requestID, UUID sessionID)
         {
-            lock (m_UrlMap)
+            UrlData url=null;
+            
+            lock (m_RequestMap)
             {
-                // We return true here because an external URL request that happened at the same time as an llRemoveURL()
-                // can still make it through to HttpRequestHandler().  That will return without setting up a request
-                // when it detects that the URL has been removed.  The poller, however, will continue to ask for
-                // events for that request, so here we will signal that there are events and in GetEvents we will
-                // return a 404.
                 if (!m_RequestMap.ContainsKey(requestID))
                 {
-                    return true;
+                    return false;
                 }
-
-                UrlData urlData = m_RequestMap[requestID];
-
-                if (!urlData.requests.ContainsKey(requestID))
+                url = m_RequestMap[requestID];
+            }
+            lock (url.requests)
+            {
+                if (!url.requests.ContainsKey(requestID))
                 {
-                    return true;
+                    return false;
                 }
-
-                // Trigger return of timeout response.
-                if (System.Environment.TickCount - urlData.requests[requestID].startTime > 25000)
+                else
                 {
-                    return true;
+                    if (System.Environment.TickCount - url.requests[requestID].startTime > 25000)
+                    {
+                        return true;
+                    }
+                    if (url.requests[requestID].requestDone)
+                        return true;
+                    else
+                        return false;
                 }
-
-                return urlData.requests[requestID].requestDone;
             }
         }
-
         private Hashtable GetEvents(UUID requestID, UUID sessionID)
         {
-            Hashtable response;
+            UrlData url = null;
+            RequestData requestData = null;
 
-            lock (m_UrlMap)
+            lock (m_RequestMap)
             {
-                UrlData url = null;
-                RequestData requestData = null;
-
                 if (!m_RequestMap.ContainsKey(requestID))
-                    return NoEvents(requestID, sessionID);
-
+                    return NoEvents(requestID,sessionID);
                 url = m_RequestMap[requestID];
+            }
+            lock (url.requests)
+            {
                 requestData = url.requests[requestID];
+            }
+            
+            if (!requestData.requestDone)
+                return NoEvents(requestID,sessionID);
+            
+            Hashtable response = new Hashtable();
 
-                if (!requestData.requestDone)
-                    return NoEvents(requestID, sessionID);
-
-                response = new Hashtable();
-
-                if (System.Environment.TickCount - requestData.startTime > 25000)
-                {
-                    response["int_response_code"] = 500;
-                    response["str_response_string"] = "Script timeout";
-                    response["content_type"] = "text/plain";
-                    response["keepalive"] = false;
-                    response["reusecontext"] = false;
-                    return response;
-                }
-
-                //put response
-                response["int_response_code"] = requestData.responseCode;
-                response["str_response_string"] = requestData.responseBody;
-                response["content_type"] = requestData.responseType;
-                // response["content_type"] = "text/plain";
+            if (System.Environment.TickCount - requestData.startTime > 25000)
+            {
+                response["int_response_code"] = 500;
+                response["str_response_string"] = "Script timeout";
+                response["content_type"] = "text/plain";
                 response["keepalive"] = false;
                 response["reusecontext"] = false;
-
-                //remove from map
+                return response;
+            }
+            //put response
+            response["int_response_code"] = requestData.responseCode;
+            response["str_response_string"] = requestData.responseBody;
+            response["content_type"] = requestData.responseType;
+            response["keepalive"] = false;
+            response["reusecontext"] = false;
+            
+            //remove from map
+            lock (url.requests)
+            {
                 url.requests.Remove(requestID);
+            }
+            lock (m_RequestMap)
+            {
                 m_RequestMap.Remove(requestID);
             }
 
@@ -566,41 +574,45 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
 
         public void HttpRequestHandler(UUID requestID, Hashtable request)
         {
-            string uri = request["uri"].ToString();
-            bool is_ssl = uri.Contains("lslhttps");
-
-            try
+            lock (request)
             {
-                Hashtable headers = (Hashtable)request["headers"];
+                string uri = request["uri"].ToString();
+                bool is_ssl = uri.Contains("lslhttps");
 
-//                    string uri_full = "http://" + m_ExternalHostNameForLSL + ":" + m_HttpServer.Port.ToString() + uri;// "/lslhttp/" + urlcode.ToString() + "/";
-
-                int pos1 = uri.IndexOf("/");// /lslhttp
-                int pos2 = uri.IndexOf("/", pos1 + 1);// /lslhttp/
-                int pos3 = uri.IndexOf("/", pos2 + 1);// /lslhttp/<UUID>/
-                string uri_tmp = uri.Substring(0, pos3 + 1);
-                //HTTP server code doesn't provide us with QueryStrings
-                string pathInfo;
-                string queryString;
-                queryString = "";
-
-                pathInfo = uri.Substring(pos3);
-
-                UrlData urlData = null;
-
-                lock (m_UrlMap)
+                try
                 {
-                    string url;
-
-                    if (is_ssl)
-                        url = "https://" + ExternalHostNameForLSL + ":" + m_HttpsServer.Port.ToString() + uri_tmp;
+                    Hashtable headers = (Hashtable)request["headers"];
+
+//                    string uri_full = "http://" + ExternalHostNameForLSL + ":" + m_HttpServer.Port.ToString() + uri;// "/lslhttp/" + urlcode.ToString() + "/";
+
+                    int pos1 = uri.IndexOf("/");// /lslhttp
+                    int pos2 = uri.IndexOf("/", pos1 + 1);// /lslhttp/
+                    int pos3 = pos2 + 37; // /lslhttp/urlcode
+                    string uri_tmp = uri.Substring(0, pos3);
+                    //HTTP server code doesn't provide us with QueryStrings
+                    string pathInfo;
+                    string queryString;
+                    queryString = "";
+
+                    pathInfo = uri.Substring(pos3);
+
+                    UrlData url = null;
+                    string urlkey;
+                    if (!is_ssl)
+                        urlkey = "http://" + ExternalHostNameForLSL + ":" + m_HttpServer.Port.ToString() + uri_tmp;
+                    //m_UrlMap[];
                     else
-                        url = "http://" + ExternalHostNameForLSL + ":" + m_HttpServer.Port.ToString() + uri_tmp;
+                        urlkey = "https://" + ExternalHostNameForLSL + ":" + m_HttpsServer.Port.ToString() + uri_tmp;
 
-                    // Avoid a race - the request URL may have been released via llRequestUrl() whilst this
-                    // request was being processed.
-                    if (!m_UrlMap.TryGetValue(url, out urlData))
+                    if (m_UrlMap.ContainsKey(urlkey))
+                    {
+                        url = m_UrlMap[urlkey];
+                    }
+                    else
+                    {
+                        //m_log.Warn("[HttpRequestHandler]: http-in request failed; no such url: "+urlkey.ToString());
                         return;
+                    }
 
                     //for llGetHttpHeader support we need to store original URI here
                     //to make x-path-info / x-query-string / x-script-url / x-remote-ip headers 
@@ -611,6 +623,8 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
                     requestData.requestDone = false;
                     requestData.startTime = System.Environment.TickCount;
                     requestData.uri = uri;
+                    requestData.hostID = url.hostID;
+                    requestData.scene = url.scene;
                     if (requestData.headers == null)
                         requestData.headers = new Dictionary<string, string>();
 
@@ -619,8 +633,33 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
                         string key = (string)header.Key;
                         string value = (string)header.Value;
                         requestData.headers.Add(key, value);
+                        if (key == "cookie")
+                        {
+                            string[] parts = value.Split(new char[] {'='});
+                            if (parts[0] == "agni_sl_session_id" && parts.Length > 1)
+                            {
+                                string cookie = Uri.UnescapeDataString(parts[1]);
+                                string[] crumbs = cookie.Split(new char[] {':'});
+                                UUID owner;
+                                if (crumbs.Length == 2 && UUID.TryParse(crumbs[0], out owner))
+                                {
+                                    if (crumbs[1].Length == 32)
+                                    {
+                                        Scene scene = requestData.scene;
+                                        if (scene != null)
+                                        {
+                                            SceneObjectPart host = scene.GetSceneObjectPart(requestData.hostID);
+                                            if (host != null)
+                                            {
+                                                if (host.OwnerID == owner)
+                                                    requestData.allowResponseType = true;
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
                     }
-
                     foreach (DictionaryEntry de in request)
                     {
                         if (de.Key.ToString() == "querystringkeys")
@@ -631,13 +670,21 @@ 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)
                                 queryString = queryString.Substring(0, queryString.Length - 1);
+
                         }
+
                     }
 
                     //if this machine is behind DNAT/port forwarding, currently this is being
@@ -645,23 +692,34 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
                     requestData.headers["x-remote-ip"] = requestData.headers["remote_addr"];
                     requestData.headers["x-path-info"] = pathInfo;
                     requestData.headers["x-query-string"] = queryString;
-                    requestData.headers["x-script-url"] = urlData.url;
+                    requestData.headers["x-script-url"] = url.url;
 
-                    urlData.requests.Add(requestID, requestData);
-                    m_RequestMap.Add(requestID, urlData);
-                }
+                    //requestData.ev = new ManualResetEvent(false);
+                    lock (url.requests)
+                    {
+                        url.requests.Add(requestID, requestData);
+                    }
+                    lock (m_RequestMap)
+                    {
+                        //add to request map
+                        m_RequestMap.Add(requestID, url);
+                    }
 
-                urlData.engine.PostScriptEvent(
-                    urlData.itemID,
-                    "http_request",
-                    new Object[] { requestID.ToString(), request["http-method"].ToString(), request["body"].ToString() });
-            }
-            catch (Exception we)
-            {
-                //Hashtable response = new Hashtable();
-                m_log.Warn("[HttpRequestHandler]: http-in request failed");
-                m_log.Warn(we.Message);
-                m_log.Warn(we.StackTrace);
+                    url.engine.PostScriptEvent(url.itemID, "http_request", new Object[] { requestID.ToString(), request["http-method"].ToString(), request["body"].ToString() });
+
+                    //send initial response?
+//                    Hashtable response = new Hashtable();
+
+                    return;
+
+                }
+                catch (Exception we)
+                {
+                    //Hashtable response = new Hashtable();
+                    m_log.Warn("[HttpRequestHandler]: http-in request failed");
+                    m_log.Warn(we.Message);
+                    m_log.Warn(we.StackTrace);
+                }
             }
         }
 
diff --git a/OpenSim/Region/CoreModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs b/OpenSim/Region/CoreModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
index 6da2222..ad33f23 100644
--- a/OpenSim/Region/CoreModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
@@ -271,6 +271,8 @@ namespace OpenSim.Region.CoreModules.Scripting.ScriptModuleComms
                         return "modInvokeR";
                     else if (sid.ReturnType == typeof(object[]))
                         return "modInvokeL";
+                    else if (sid.ReturnType == typeof(void))
+                        return "modInvokeN";
 
                     m_log.WarnFormat("[MODULE COMMANDS] failed to find match for {0} with return type {1}",fname,sid.ReturnType.Name);
                 }
diff --git a/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs b/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
index 4cecd85..2fc89fc 100644
--- a/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
@@ -861,4 +861,4 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
             return null;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs b/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
index 3484387..93a4f09 100644
--- a/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
@@ -96,6 +96,8 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm
         // private static readonly ILog m_log =
         //     LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
+        private const int DEBUG_CHANNEL = 2147483647;
+
         private ListenerManager m_listenerManager;
         private Queue m_pending;
         private Queue m_pendingQ;
@@ -366,61 +368,60 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm
         /// <param name='msg'>
         /// Message.
         /// </param>
-        public void DeliverMessageTo(UUID target, int channel, Vector3 pos,
-                string name, UUID id, string msg)
+        public bool DeliverMessageTo(UUID target, int channel, Vector3 pos, string name, UUID id, string msg, out string error)
         {
+            error = null;
+
+            if (channel == DEBUG_CHANNEL)
+                return true;
+
             // Is id an avatar?
             ScenePresence sp = m_scene.GetScenePresence(target);
 
             if (sp != null)
             {
-                // ignore if a child agent this is restricted to inside one
-                // region
-                if (sp.IsChildAgent)
-                    return;
-
-                // Channel zero only goes to the avatar
-                // non zero channel messages only go to the attachments of the avatar.
-                if (channel != 0)
+                 // Send message to avatar
+                if (channel == 0)
                 {
-                    List<SceneObjectGroup> attachments = sp.GetAttachments();
-                    if (attachments.Count == 0)
-                        return;
+                   // Channel 0 goes to viewer ONLY
+                    m_scene.SimChat(Utils.StringToBytes(msg), ChatTypeEnum.Broadcast, 0, pos, name, id, target, false, false);
+                    return true;
+                }
 
-                    // Get uuid of attachments
-                    List<UUID> targets = new List<UUID>();
-                    foreach (SceneObjectGroup sog in attachments)
-                    {
-                        if (!sog.IsDeleted)
-                            targets.Add(sog.UUID);
-                    }
+                List<SceneObjectGroup> attachments = sp.GetAttachments();
 
-                    // Need to check each attachment
-                    foreach (ListenerInfo li
-                            in m_listenerManager.GetListeners(UUID.Zero,
-                            channel, name, id, msg))
-                    {
-                        if (li.GetHostID().Equals(id))
-                            continue;
+                if (attachments.Count == 0)
+                    return true;
 
-                        if (m_scene.GetSceneObjectPart(
-                                li.GetHostID()) == null)
-                        {
-                            continue;
-                        }
+                // Get uuid of attachments
+                List<UUID> targets = new List<UUID>();
+                foreach (SceneObjectGroup sog in attachments)
+                {
+                    if (!sog.IsDeleted)
+                        targets.Add(sog.UUID);
+                }
 
-                        if (targets.Contains(li.GetHostID()))
-                            QueueMessage(new ListenerInfo(li, name, id, msg));
-                    }
+                // Need to check each attachment
+                foreach (ListenerInfo li in m_listenerManager.GetListeners(UUID.Zero, channel, name, id, msg))
+                {
+                    if (li.GetHostID().Equals(id))
+                        continue;
+
+                    if (m_scene.GetSceneObjectPart(li.GetHostID()) == null)
+                        continue;
+
+                    if (targets.Contains(li.GetHostID()))
+                        QueueMessage(new ListenerInfo(li, name, id, msg));
                 }
 
-                return;
+                return true;
             }
 
-            // No avatar found so look for an object
-            foreach (ListenerInfo li
-                    in m_listenerManager.GetListeners(UUID.Zero, channel,
-                    name, id, msg))
+            SceneObjectPart part = m_scene.GetSceneObjectPart(target);
+            if (part == null) // Not even an object
+                return true; // No error
+
+            foreach (ListenerInfo li in m_listenerManager.GetListeners(UUID.Zero, channel, name, id, msg))
             {
                 // Dont process if this message is from yourself!
                 if (li.GetHostID().Equals(id))
@@ -438,7 +439,7 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm
                 }
             }
 
-            return;
+            return true;
         }
 
         protected void QueueMessage(ListenerInfo li)
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/UserProfiles/LocalUserProfilesServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/UserProfiles/LocalUserProfilesServiceConnector.cs
index 4701ee6..323535a 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/UserProfiles/LocalUserProfilesServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/UserProfiles/LocalUserProfilesServiceConnector.cs
@@ -153,8 +153,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Profile
             Server.AddJsonRPCHandler("avatar_properties_request", handler.AvatarPropertiesRequest);
             Server.AddJsonRPCHandler("avatar_properties_update", handler.AvatarPropertiesUpdate);
             Server.AddJsonRPCHandler("avatar_interests_update", handler.AvatarInterestsUpdate);
-            Server.AddJsonRPCHandler("user_preferences_update", handler.UserPreferenecesUpdate);
-            Server.AddJsonRPCHandler("user_preferences_request", handler.UserPreferencesRequest);
             Server.AddJsonRPCHandler("image_assets_request", handler.AvatarImageAssetsRequest);
             Server.AddJsonRPCHandler("user_data_request", handler.RequestUserAppData);
             Server.AddJsonRPCHandler("user_data_update", handler.UpdateUserAppData);
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authentication/LocalAuthenticationServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authentication/LocalAuthenticationServiceConnector.cs
index 16f42a7..f027810 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authentication/LocalAuthenticationServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authentication/LocalAuthenticationServiceConnector.cs
@@ -139,6 +139,13 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Authentication
 
         #region IAuthenticationService
 
+        public string Authenticate(UUID principalID, string password, int lifetime, out UUID realID)
+        {
+            // Not implemented at the regions
+            realID = UUID.Zero;
+            return string.Empty; 
+        }
+
         public string Authenticate(UUID principalID, string password, int lifetime)
         {
             // Not implemented at the regions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs
index 25ae689..c33f7f5 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs
@@ -198,4 +198,4 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid.Tests
             Assert.That(results.Count, Is.EqualTo(0), "Retrieved linked regions collection is not the number expected");
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs
index 860a526..5365b49 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs
@@ -53,6 +53,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.MapImage
     /// </remarks>
 
     [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "MapImageServiceModule")]
+
     public class MapImageServiceModule : IMapImageUploadModule, ISharedRegionModule
     {
         private static readonly ILog m_log =
@@ -93,9 +94,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.MapImage
             if (config == null)
                 return;
 
-            int refreshminutes = Convert.ToInt32(config.GetString("RefreshTime"));
-            
-            // if refresh is less than zero, disable the module
+            int refreshminutes = Convert.ToInt32(config.GetString("RefreshTime", "60"));
             if (refreshminutes < 0)
             {
                 m_log.WarnFormat("[MAP IMAGE SERVICE MODULE]: Negative refresh time given in config. Module disabled.");
@@ -128,6 +127,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.MapImage
                 m_refreshTimer.Interval = m_refreshtime;
                 m_refreshTimer.Elapsed += new ElapsedEventHandler(HandleMaptileRefresh);
 
+
                 m_log.InfoFormat("[MAP IMAGE SERVICE MODULE]: enabled with refresh time {0} min and service object {1}",
                              refreshminutes, service);
             }
@@ -212,7 +212,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.MapImage
             // If the region/maptile is legacy sized, just upload the one tile like it has always been done
             if (mapTile.Width == Constants.RegionSize && mapTile.Height == Constants.RegionSize)
             {
-                ConvertAndUploadMaptile(mapTile,
+                ConvertAndUploadMaptile(scene, mapTile,
                                         scene.RegionInfo.RegionLocX, scene.RegionInfo.RegionLocY,
                                         scene.RegionInfo.RegionName);
             }
@@ -234,7 +234,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.MapImage
                             (int)Constants.RegionSize, (int)Constants.RegionSize);
                         using (Bitmap subMapTile = mapTile.Clone(rect, mapTile.PixelFormat))
                         {
-                            ConvertAndUploadMaptile(subMapTile,
+                            ConvertAndUploadMaptile(scene, subMapTile,
                                                     scene.RegionInfo.RegionLocX + (xx / Constants.RegionSize),
                                                     scene.RegionInfo.RegionLocY + (yy / Constants.RegionSize),
                                                     scene.Name);
@@ -247,8 +247,10 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.MapImage
         ///<summary>
         ///
         ///</summary>
-        private void UploadMapTile(IScene scene)
+        public void UploadMapTile(IScene scene)
         {
+            m_log.DebugFormat("{0}: upload maptile for {1}", LogHeader, scene.RegionInfo.RegionName);
+
             // Create a JPG map tile and upload it to the AddMapTile API
             IMapImageGenerator tileGenerator = scene.RequestModuleInterface<IMapImageGenerator>();
             if (tileGenerator == null)
@@ -259,18 +261,16 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.MapImage
 
             using (Bitmap mapTile = tileGenerator.CreateMapTile())
             {
-                if (mapTile != null)
-                {
-                    UploadMapTile(scene, mapTile);
-                }
-                else
-                {
-                    m_log.WarnFormat("{0} Tile image generation failed", LogHeader);
-                }
+                // XXX: The MapImageModule will return a null if the user has chosen not to create map tiles and there
+                // is no static map tile.
+                if (mapTile == null)
+                    return;
+
+                UploadMapTile(scene, mapTile);
             }
         }
 
-        private void ConvertAndUploadMaptile(Image tileImage, uint locX, uint locY, string regionName)
+        private void ConvertAndUploadMaptile(IScene scene, Image tileImage, uint locX, uint locY, string regionName)
         {
             byte[] jpgData = Utils.EmptyBytes;
 
@@ -282,7 +282,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.MapImage
             if (jpgData != Utils.EmptyBytes)
             {
                 string reason = string.Empty;
-                if (!m_MapService.AddMapTile((int)locX, (int)locY, jpgData, out reason))
+                if (!m_MapService.AddMapTile((int)locX, (int)locY, jpgData, scene.RegionInfo.ScopeID, out reason))
                 {
                     m_log.DebugFormat("{0} Unable to upload tile image for {1} at {2}-{3}: {4}", LogHeader,
                         regionName, locX, locY, reason);
@@ -294,4 +294,4 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.MapImage
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
index adf3a91..9d4c282 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
@@ -269,6 +269,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
             return true;
         }
 
+
         public bool QueryAccess(GridRegion destination, UUID agentID, string agentHomeURI, bool viaTeleport, Vector3 position, string theirversion, List<UUID> features, out string version, out string reason)
         {
             reason = "Communications failure";
@@ -298,6 +299,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
                 
                 }
 
+
                 return m_scenes[destination.RegionID].QueryAccess(agentID, agentHomeURI, viaTeleport, position, features, out reason);
             }
 
@@ -335,7 +337,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
                 m_scenes[destination.RegionID].CloseAgent(id, false, auth_token);
                 return true;
             }
-
             //m_log.Debug("[LOCAL COMMS]: region not found in SendCloseAgent");
             return false;
         }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
index f963242..c1daae9 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
@@ -205,6 +205,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
             return m_remoteConnector.UpdateAgent(destination, cAgentData);
         }
 
+
         public bool QueryAccess(GridRegion destination, UUID agentID, string agentHomeURI, bool viaTeleport, Vector3 position, string sversion, List<UUID> features, out string version, out string reason)
         {
             reason = "Communications failure";
@@ -237,7 +238,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
             return false;
         }
 
-
         public bool CloseAgent(GridRegion destination, UUID id, string auth_token)
         {
             if (destination == null)
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/LocalUserAccountServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/LocalUserAccountServiceConnector.cs
index 6d4ac39..cf9a7b4 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/LocalUserAccountServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/LocalUserAccountServiceConnector.cs
@@ -129,6 +129,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts
             // FIXME: Why do we bother setting this module and caching up if we just end up registering the inner
             // user account service?!
             scene.RegisterModuleInterface<IUserAccountService>(UserAccountService);
+            scene.RegisterModuleInterface<IUserAccountCacheModule>(m_Cache);
         }
 
         public void RemoveRegion(Scene scene)
@@ -181,6 +182,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts
             return UserAccountService.GetUserAccount(scopeID, Email);
         }
 
+        public List<UserAccount> GetUserAccountsWhere(UUID scopeID, string query)
+        {
+            return null;
+        }
+
         public List<UserAccount> GetUserAccounts(UUID scopeID, string query)
         {
             return UserAccountService.GetUserAccounts(scopeID, query);
@@ -203,4 +209,4 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts
 
         #endregion
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/RemoteUserAccountServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/RemoteUserAccountServiceConnector.cs
index 5aa87d3..afbba30 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/RemoteUserAccountServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/RemoteUserAccountServiceConnector.cs
@@ -34,6 +34,7 @@ using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Services.Interfaces;
 using OpenSim.Services.Connectors;
+using OpenSim.Framework;
 
 using OpenMetaverse;
 
@@ -103,6 +104,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)
@@ -117,6 +121,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 ed52e48..53610d9 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!
 
@@ -97,5 +97,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 9c6706f..406f4a8 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
@@ -160,10 +160,9 @@ namespace OpenSim.Region.CoreModules.World.Archiver
 
         private IAssetService m_assetService = null;
 
-
         private UUID m_defaultUser;
 
-        public ArchiveReadRequest(Scene scene, string loadPath, Guid requestId, Dictionary<string,object>options)
+        public ArchiveReadRequest(Scene scene, string loadPath, Guid requestId, Dictionary<string, object> options)
         {
             m_rootScene = scene;
 
@@ -172,7 +171,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                 m_defaultUser = (UUID)options["default-user"];
                 m_log.InfoFormat("Using User {0} as default user", m_defaultUser.ToString());
             }
-            else 
+            else
             {
                 m_defaultUser = scene.RegionInfo.EstateSettings.EstateOwner;
             }
@@ -189,8 +188,9 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                         + "If you've manually installed Mono, have you appropriately updated zlib1g as well?");
                 m_log.Error(e);
             }
-        
+
             m_errorMessage = String.Empty;
+
             m_merge = options.ContainsKey("merge");
             m_forceTerrain = options.ContainsKey("force-terrain");
             m_forceParcels = options.ContainsKey("force-parcels");
@@ -199,10 +199,10 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             m_requestId = requestId;
             m_displacement = options.ContainsKey("displacement") ? (Vector3)options["displacement"] : Vector3.Zero;
             m_rotation = options.ContainsKey("rotation") ? (float)options["rotation"] : 0f;
-            m_rotationCenter = options.ContainsKey("rotation-center") ? (Vector3)options["rotation-center"] 
+            m_rotationCenter = options.ContainsKey("rotation-center") ? (Vector3)options["rotation-center"]
                                 : new Vector3(scene.RegionInfo.RegionSizeX / 2f, scene.RegionInfo.RegionSizeY / 2f, 0f);
 
-            // Zero can never be a valid user or group id
+            // Zero can never be a valid user id (or group)
             m_validUserUuids[UUID.Zero] = false;
             m_validGroupUuids[UUID.Zero] = false;
 
@@ -210,7 +210,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             m_assetService = m_rootScene.AssetService;
         }
 
-        public ArchiveReadRequest(Scene scene, Stream loadStream, Guid requestId, Dictionary<string, object>options)
+        public ArchiveReadRequest(Scene scene, Stream loadStream, Guid requestId, Dictionary<string, object> options)
         {
             m_rootScene = scene;
             m_loadPath = null;
@@ -220,7 +220,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             m_requestId = requestId;
 
             m_defaultUser = scene.RegionInfo.EstateSettings.EstateOwner;
-     
+
             // Zero can never be a valid user id
             m_validUserUuids[UUID.Zero] = false;
 
@@ -523,7 +523,6 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                     }
                 }
 
-
                 bool isTelehub = (sceneObject.UUID == oldTelehubUUID) && (oldTelehubUUID != UUID.Zero);
 
                 // For now, give all incoming scene objects new uuids.  This will allow scenes to be cloned
@@ -600,6 +599,15 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                 // being no copy/no mod for everyone
                 lock (part.TaskInventory)
                 {
+                    // 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)
                     {
@@ -620,11 +628,12 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                         if (!ResolveGroupUuid(kvp.Value.GroupID))
                             kvp.Value.GroupID = UUID.Zero;
                     }
+                    part.TaskInventory.LockItemsForRead(false);
+
                 }
             }
         }
 
-        
         /// <summary>
         /// Load serialized parcels.
         /// </summary>
@@ -645,7 +654,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                     parcel.AABBMin += parcelDisp;
                     parcel.AABBMax += parcelDisp;
                 }
-                
+
                 // Validate User and Group UUID's
 
                 if (!ResolveGroupUuid(parcel.GroupID))
@@ -660,14 +669,18 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                     }
                     else
                     {
-                        parcel.OwnerID = m_rootScene.RegionInfo.EstateSettings.EstateOwner;
+                        parcel.OwnerID = m_defaultUser;
+                        parcel.GroupID = UUID.Zero;
                         parcel.IsGroupOwned = false;
                     }
                 }
                 else
                 {
                     if (!ResolveUserUuid(scene, parcel.OwnerID))
-                        parcel.OwnerID = m_rootScene.RegionInfo.EstateSettings.EstateOwner;
+                        parcel.OwnerID = m_defaultUser;
+
+                    if (!ResolveGroupUuid(parcel.GroupID))
+                        parcel.GroupID = UUID.Zero;
                 }
 
                 List<LandAccessEntry> accessList = new List<LandAccessEntry>();
@@ -918,7 +931,6 @@ namespace OpenSim.Region.CoreModules.World.Archiver
         private bool LoadTerrain(Scene scene, string terrainPath, byte[] data)
         {
             ITerrainModule terrainModule = scene.RequestModuleInterface<ITerrainModule>();
-
             using (MemoryStream ms = new MemoryStream(data))
             {
                 if (m_displacement != Vector3.Zero || m_rotation != 0f)
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs
index 6a09caf..4178a57 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs
@@ -111,17 +111,19 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             String defaultUser = "";
             float rotation = 0f;
             Vector3 rotationCenter = new Vector3(Constants.RegionSize / 2f, Constants.RegionSize / 2f, 0);
-            
+
+
             OptionSet options = new OptionSet();
-            options.Add("m|merge", delegate (string v) { mergeOar = (v != null); });
-            options.Add("s|skip-assets", delegate (string v) { skipAssets = (v != null); });
-            options.Add("force-terrain", delegate (string v) { forceTerrain = (v != null); });
-            options.Add("forceterrain", delegate (string v) { forceTerrain = (v != null); });   // downward compatibility
-            options.Add("force-parcels", delegate (string v) { forceParcels = (v != null); });
-            options.Add("forceparcels", delegate (string v) { forceParcels = (v != null); });   // downward compatibility
-            options.Add("no-objects", delegate (string v) { noObjects = (v != null); });
+            options.Add("m|merge", delegate(string v) { mergeOar = (v != null); });
+            options.Add("s|skip-assets", delegate(string v) { skipAssets = (v != null); });
+            options.Add("force-terrain", delegate(string v) { forceTerrain = (v != null); });
+            options.Add("forceterrain", delegate(string v) { forceTerrain = (v != null); });   // downward compatibility
+            options.Add("force-parcels", delegate(string v) { forceParcels = (v != null); });
+            options.Add("forceparcels", delegate(string v) { forceParcels = (v != null); });   // downward compatibility
+            options.Add("no-objects", delegate(string v) { noObjects = (v != null); });
             options.Add("default-user=", delegate(string v) { defaultUser = (v == null) ? "" : v; });
-            options.Add("displacement=", delegate (string v) {
+            options.Add("displacement=", delegate(string v)
+            {
                 try
                 {
                     displacement = v == null ? Vector3.Zero : Vector3.Parse(v);
@@ -148,7 +150,8 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                 // Convert to radians for internals
                 rotation = Util.Clamp<float>(rotation, -359f, 359f) / 180f * (float)Math.PI;
             });
-            options.Add("rotation-center=", delegate (string v) {
+            options.Add("rotation-center=", delegate(string v)
+            {
                 try
                 {
                     rotationCenter = v == null ? Vector3.Zero : Vector3.Parse(v);
@@ -288,12 +291,12 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             Dictionary<string, object> archiveOptions = new Dictionary<string, object>();
             DearchiveRegion(loadPath, Guid.Empty, archiveOptions);
         }
-        
-        public void DearchiveRegion(string loadPath, Guid requestId, Dictionary<string,object> options)
+
+        public void DearchiveRegion(string loadPath, Guid requestId, Dictionary<string, object> options)
         {
             m_log.InfoFormat(
                 "[ARCHIVER]: Loading archive to region {0} from {1}", Scene.RegionInfo.RegionName, loadPath);
-            
+
             new ArchiveReadRequest(Scene, loadPath, requestId, options).DearchiveRegion();
         }
         
@@ -302,7 +305,6 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             Dictionary<string, object> archiveOptions = new Dictionary<string, object>();
             DearchiveRegion(loadStream, Guid.Empty, archiveOptions);
         }
-        
         public void DearchiveRegion(Stream loadStream, Guid requestId, Dictionary<string, object> options)
         {
             new ArchiveReadRequest(Scene, loadStream, requestId, options).DearchiveRegion();
diff --git a/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs
index db66c83..895b55d 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs
@@ -271,18 +271,14 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                                                            
                     if (asset != null)
                     {
-                        if (m_options.ContainsKey("verbose"))
-                            m_log.InfoFormat("[ARCHIVER]: Writing asset {0}", id);
-
+//                        m_log.DebugFormat("[ARCHIVER]: Writing asset {0}", id);
                         m_foundAssetUuids.Add(asset.FullID);
 
                         m_assetsArchiver.WriteAsset(PostProcess(asset));
                     }
                     else
                     {
-                        if (m_options.ContainsKey("verbose"))
-                            m_log.InfoFormat("[ARCHIVER]: Recording asset {0} as not found", id);
-
+//                        m_log.DebugFormat("[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 80fa08a..3ded00c 100644
--- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
@@ -68,6 +68,8 @@ namespace OpenSim.Region.CoreModules.World.Estate
         public event ChangeDelegate OnEstateInfoChange;
         public event MessageDelegate OnEstateMessage;
 
+        private int m_delayCount = 0;
+
         #region Region Module interface
         
         public string Name { get { return "EstateManagementModule"; } }
@@ -95,6 +97,10 @@ namespace OpenSim.Region.CoreModules.World.Estate
 
             m_commands = new EstateManagementCommands(this);
             m_commands.Initialise();
+
+            m_regionChangeTimer.Interval = 10000;
+            m_regionChangeTimer.Elapsed += RaiseRegionInfoChange;
+            m_regionChangeTimer.AutoReset = false;
         }
         
         public void RemoveRegion(Scene scene) {}            
@@ -142,6 +148,10 @@ namespace OpenSim.Region.CoreModules.World.Estate
                 flags |= RegionFlags.AllowParcelChanges;
             if (Scene.RegionInfo.RegionSettings.BlockShowInSearch)
                 flags |= RegionFlags.BlockParcelSearch;
+            if (Scene.RegionInfo.RegionSettings.GodBlockSearch)
+                flags |= (RegionFlags)(1 << 11);
+            if (Scene.RegionInfo.RegionSettings.Casino)
+                flags |= (RegionFlags)(1 << 10);
 
             if (Scene.RegionInfo.RegionSettings.FixedSun)
                 flags |= RegionFlags.SunFixed;
@@ -194,6 +204,14 @@ namespace OpenSim.Region.CoreModules.World.Estate
                 change(Scene.RegionInfo.RegionID);
         }
 
+        protected void RaiseRegionInfoChange(object sender, ElapsedEventArgs e)
+        {
+            ChangeDelegate change = OnRegionInfoChange;
+
+            if (change != null)
+                change(Scene.RegionInfo.RegionID);
+        }
+
         public void TriggerRegionInfoChange()
         {
             m_regionChangeTimer.Stop();
@@ -587,6 +605,16 @@ namespace OpenSim.Region.CoreModules.World.Estate
             IRestartModule restartModule = Scene.RequestModuleInterface<IRestartModule>();
             if (restartModule != null)
             {
+                if (timeInSeconds == -1)
+                {
+                    m_delayCount++;
+                    if (m_delayCount > 3)
+                        return;
+
+                    restartModule.DelayRestart(3600, "Restart delayed by region manager");
+                    return;
+                }
+
                 List<int> times = new List<int>();
                 while (timeInSeconds > 0)
                 {
@@ -1477,7 +1505,8 @@ namespace OpenSim.Region.CoreModules.World.Estate
             sendRegionHandshake(client);
         }
 
-        private uint GetEstateFlags()
+
+        public uint GetEstateFlags()
         {
             RegionFlags flags = RegionFlags.None;
 
diff --git a/OpenSim/Region/CoreModules/World/Land/LandChannel.cs b/OpenSim/Region/CoreModules/World/Land/LandChannel.cs
index 73c592d..378826d 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandChannel.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandChannel.cs
@@ -40,23 +40,33 @@ namespace OpenSim.Region.CoreModules.World.Land
         //Land types set with flags in ParcelOverlay.
         //Only one of these can be used.
         public const float BAN_LINE_SAFETY_HIEGHT = 100;
-        public const byte LAND_FLAG_PROPERTY_BORDER_SOUTH = 128; //Equals 10000000
-        public const byte LAND_FLAG_PROPERTY_BORDER_WEST = 64; //Equals 01000000
 
         //RequestResults (I think these are right, they seem to work):
         public const int LAND_RESULT_MULTIPLE = 1; // The request they made contained more than a single peice of land
         public const int LAND_RESULT_SINGLE = 0; // The request they made contained only a single piece of land
 
         //ParcelSelectObjects
+        public const int LAND_SELECT_OBJECTS_OWNER = 2;
         public const int LAND_SELECT_OBJECTS_GROUP = 4;
         public const int LAND_SELECT_OBJECTS_OTHER = 8;
-        public const int LAND_SELECT_OBJECTS_OWNER = 2;
-        public const byte LAND_TYPE_IS_BEING_AUCTIONED = 5; //Equals 00000101
-        public const byte LAND_TYPE_IS_FOR_SALE = 4; //Equals 00000100
-        public const byte LAND_TYPE_OWNED_BY_GROUP = 2; //Equals 00000010
+
+        
+        public const byte LAND_TYPE_PUBLIC = 0; //Equals 00000000
+        // types 1 to 7 are exclusive
         public const byte LAND_TYPE_OWNED_BY_OTHER = 1; //Equals 00000001
+        public const byte LAND_TYPE_OWNED_BY_GROUP = 2; //Equals 00000010
         public const byte LAND_TYPE_OWNED_BY_REQUESTER = 3; //Equals 00000011
-        public const byte LAND_TYPE_PUBLIC = 0; //Equals 00000000
+        public const byte LAND_TYPE_IS_FOR_SALE = 4; //Equals 00000100
+        public const byte LAND_TYPE_IS_BEING_AUCTIONED = 5; //Equals 00000101
+        public const byte LAND_TYPE_unused6 = 6;
+        public const byte LAND_TYPE_unused7 = 7;
+        // next are flags
+        public const byte LAND_FLAG_unused8 = 0x08; // this may become excluside in future
+        public const byte LAND_FLAG_HIDEAVATARS = 0x10;
+        public const byte LAND_FLAG_LOCALSOUND = 0x20;
+        public const byte LAND_FLAG_PROPERTY_BORDER_WEST = 0x40; //Equals 01000000
+        public const byte LAND_FLAG_PROPERTY_BORDER_SOUTH = 0x80; //Equals 10000000
+
 
         //These are other constants. Yay!
         public const int START_LAND_LOCAL_ID = 1;
@@ -203,7 +213,13 @@ namespace OpenSim.Region.CoreModules.World.Land
                 m_landManagementModule.setParcelOtherCleanTime(remoteClient, localID, otherCleanTime);
             }
         }
-
+        public void sendClientInitialLandInfo(IClientAPI remoteClient)
+        {
+            if (m_landManagementModule != null)
+            {
+                m_landManagementModule.sendClientInitialLandInfo(remoteClient);
+            }
+        }
         #endregion
     }
 }
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
index 92f6c1b..ad6793f 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
@@ -69,6 +69,7 @@ namespace OpenSim.Region.CoreModules.World.Land
         /// <summary>
         /// Minimum land unit size in region co-ordinates.
         /// </summary>
+
         public const int LandUnit = 4;
 
         private static readonly string remoteParcelRequestPath = "0009/";
@@ -89,21 +90,26 @@ namespace OpenSim.Region.CoreModules.World.Land
         /// <value>
         /// Land objects keyed by local id
         /// </value>
-        private readonly Dictionary<int, ILandObject> m_landList = new Dictionary<int, ILandObject>();
+//        private readonly Dictionary<int, ILandObject> m_landList = new Dictionary<int, ILandObject>();
+
+        //ubit: removed the readonly so i can move it around
+        private Dictionary<int, ILandObject> m_landList = new Dictionary<int, ILandObject>();
 
         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;
 
-
         /// <summary>
         /// Record positions that avatar's are currently being forced to move to due to parcel entry restrictions.
         /// </summary>
         private Dictionary<UUID, Vector3> forcedPosition = new Dictionary<UUID, Vector3>();
 
+
         // Enables limiting parcel layer info transmission when doing simple updates
         private bool shouldLimitParcelLayerInfoToViewDistance { get; set; }
         // "View distance" for sending parcel layer info if asked for from a view point in the region
@@ -125,6 +131,8 @@ namespace OpenSim.Region.CoreModules.World.Land
             {
                 shouldLimitParcelLayerInfoToViewDistance = landManagementConfig.GetBoolean("LimitParcelLayerUpdateDistance", shouldLimitParcelLayerInfoToViewDistance);
                 parcelLayerViewDistance = landManagementConfig.GetInt("ParcelLayerViewDistance", parcelLayerViewDistance);
+                DefaultGodParcelGroup = new UUID(landManagementConfig.GetString("DefaultAdministratorGroupUUID", UUID.Zero.ToString()));
+                DefaultGodParcelName = landManagementConfig.GetString("DefaultAdministratorParcelName", "Default Parcel");
             }
         }
 
@@ -132,6 +140,7 @@ namespace OpenSim.Region.CoreModules.World.Land
         {
             m_scene = scene;
             m_landIDList = new int[m_scene.RegionInfo.RegionSizeX / LandUnit, m_scene.RegionInfo.RegionSizeY / LandUnit];
+
             landChannel = new LandChannel(scene, this);
 
             parcelInfoCache = new Cache();
@@ -154,7 +163,7 @@ namespace OpenSim.Region.CoreModules.World.Land
             m_scene.EventManager.OnIncomingLandDataFromStorage += EventManagerOnIncomingLandDataFromStorage;
             m_scene.EventManager.OnSetAllowForcefulBan += EventManagerOnSetAllowedForcefulBan;            
             m_scene.EventManager.OnRegisterCaps += EventManagerOnRegisterCaps;
-
+           
             lock (m_scene)
             {
                 m_scene.LandChannel = (ILandChannel)landChannel;
@@ -204,13 +213,14 @@ namespace OpenSim.Region.CoreModules.World.Land
             client.OnParcelFreezeUser += ClientOnParcelFreezeUser;
             client.OnSetStartLocationRequest += ClientOnSetHome;
 
-
+/*  avatar is still a child here position is unknown
             EntityBase presenceEntity;
             if (m_scene.Entities.TryGetValue(client.AgentId, out presenceEntity) && presenceEntity is ScenePresence)
             {
                 SendLandUpdate((ScenePresence)presenceEntity, true);
                 SendParcelOverlay(client);
             }
+*/
         }
 
         public void EventMakeChildAgent(ScenePresence avatar)
@@ -220,48 +230,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)
-                {
-//                    m_log.DebugFormat(
-//                        "[LAND MANAGEMENT MODULE]: Stopping force position of {0} because {1} is close enough to {2}",
-//                        clientAvatar.Name, clientAvatar.AbsolutePosition, forcedPosition[remoteClient.AgentId]);
-
-                    forcedPosition.Remove(remoteClient.AgentId);
-                }
-                //if we are far away, teleport
-                else if (Vector3.Distance(clientAvatar.AbsolutePosition, forcedPosition[remoteClient.AgentId]) > 3)
-                {
-                    Vector3 forcePosition = forcedPosition[remoteClient.AgentId];
-//                    m_log.DebugFormat(
-//                        "[LAND MANAGEMENT MODULE]: Teleporting out {0} because {1} is too far from avatar position {2}",
-//                        clientAvatar.Name, clientAvatar.AbsolutePosition, forcePosition);
-
-                    m_scene.RequestTeleportLocation(remoteClient, m_scene.RegionInfo.RegionHandle,
-                        forcePosition, clientAvatar.Lookat, (uint)Constants.TeleportFlags.ForceRedirect);
-
-                    forcedPosition.Remove(remoteClient.AgentId);
-                }
-                else
-                {
-//                    m_log.DebugFormat(
-//                        "[LAND MANAGEMENT MODULE]: Forcing {0} from {1} to {2}",
-//                        clientAvatar.Name, clientAvatar.AbsolutePosition, forcedPosition[remoteClient.AgentId]);
-
-                    //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()
@@ -314,6 +282,7 @@ namespace OpenSim.Region.CoreModules.World.Land
             {
                 m_landList.Clear();
                 m_lastLandLocalID = LandChannel.START_LAND_LOCAL_ID - 1;
+
                 m_landIDList = new int[m_scene.RegionInfo.RegionSizeX / LandUnit, m_scene.RegionInfo.RegionSizeY / LandUnit];
             }
         }
@@ -324,16 +293,16 @@ namespace OpenSim.Region.CoreModules.World.Land
         /// <returns>The parcel created.</returns>
         protected ILandObject CreateDefaultParcel()
         {
-            m_log.DebugFormat(
-                "[LAND MANAGEMENT MODULE]: Creating default parcel for region {0}", m_scene.RegionInfo.RegionName);
-            
-            ILandObject fullSimParcel = new LandObject(UUID.Zero, false, m_scene);                                                
+            m_log.DebugFormat("{0} Creating default parcel for region {1}", LogHeader, m_scene.RegionInfo.RegionName);
+
+            ILandObject fullSimParcel = new LandObject(UUID.Zero, false, m_scene);
+
             fullSimParcel.SetLandBitmap(fullSimParcel.GetSquareLandBitmap(0, 0,
                                             (int)m_scene.RegionInfo.RegionSizeX, (int)m_scene.RegionInfo.RegionSizeY));
             fullSimParcel.LandData.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner;
             fullSimParcel.LandData.ClaimDate = Util.UnixTimeSinceEpoch();
-            
-            return AddLandObject(fullSimParcel);            
+
+            return AddLandObject(fullSimParcel);
         }
 
         public List<ILandObject> AllParcels()
@@ -382,10 +351,17 @@ namespace OpenSim.Region.CoreModules.World.Land
         private void ForceAvatarToPosition(ScenePresence avatar, Vector3? position)
         {
             if (m_scene.Permissions.IsGod(avatar.UUID)) return;
-            if (position.HasValue)
-            {
-                forcedPosition[avatar.ControllingClient.AgentId] = (Vector3)position;
-            }
+
+            if (!position.HasValue)
+                return;
+
+// land should have no word on avatar physics
+//            bool isFlying = avatar.PhysicsActor.Flying;
+//            avatar.RemoveFromPhysicalScene();
+
+            avatar.AbsolutePosition = (Vector3)position;
+
+//            avatar.AddToPhysicalScene(isFlying);
         }
 
         public void SendYouAreRestrictedNotice(ScenePresence avatar)
@@ -405,36 +381,14 @@ namespace OpenSim.Region.CoreModules.World.Land
                 }
 
                 if (parcelAvatarIsEntering != null)
-                {
-                    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;
-                    }
-                }
+                    EnforceBans(parcelAvatarIsEntering, avatar);
             }
         }
 
         public void SendOutNearestBanLine(IClientAPI client)
         {
             ScenePresence sp = m_scene.GetScenePresence(client.AgentId);
-            if (sp == null || sp.IsChildAgent)
+            if (sp == null)
                 return;
 
             List<ILandObject> checkLandParcels = ParcelsNearPoint(sp.AbsolutePosition);
@@ -454,32 +408,44 @@ namespace OpenSim.Region.CoreModules.World.Land
             return;
         }
 
+        public void sendClientInitialLandInfo(IClientAPI remoteClient)
+        {
+            ScenePresence avatar;
+
+            if (!m_scene.TryGetScenePresence(remoteClient.AgentId, out avatar))
+                return;
+
+
+            if (!avatar.IsChildAgent)
+            {
+                ILandObject over = GetLandObject(avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y);
+                if (over == null)
+                    return;
+
+                avatar.currentParcelUUID = over.LandData.GlobalID;
+                over.SendLandUpdateToClient(avatar.ControllingClient);
+            }
+            SendParcelOverlay(remoteClient);
+        }
+
         public void SendLandUpdate(ScenePresence avatar, bool force)
         {
-            ILandObject over = GetLandObject((int)Math.Min(((int)m_scene.RegionInfo.RegionSizeX - 1), Math.Max(0, Math.Round(avatar.AbsolutePosition.X))),
-                                             (int)Math.Min(((int)m_scene.RegionInfo.RegionSizeY - 1), Math.Max(0, Math.Round(avatar.AbsolutePosition.Y))));
+            if (avatar.IsChildAgent)
+                return;
+
+            ILandObject over = GetLandObjectClipedXY(avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y);
 
             if (over != null)
             {
-                if (force)
-                {
-                    if (!avatar.IsChildAgent)
-                    {
-                        over.SendLandUpdateToClient(avatar.ControllingClient);
-                        m_scene.EventManager.TriggerAvatarEnteringNewParcel(avatar, over.LandData.LocalID,
-                                                                            m_scene.RegionInfo.RegionID);
-                    }
-                }
-
-                if (avatar.currentParcelUUID != over.LandData.GlobalID)
+                bool NotsameID = (avatar.currentParcelUUID != over.LandData.GlobalID);
+                if (force || NotsameID)
                 {
-                    if (!avatar.IsChildAgent)
-                    {
-                        over.SendLandUpdateToClient(avatar.ControllingClient);
-                        avatar.currentParcelUUID = over.LandData.GlobalID;
-                        m_scene.EventManager.TriggerAvatarEnteringNewParcel(avatar, over.LandData.LocalID,
-                                                                            m_scene.RegionInfo.RegionID);
-                    }
+                    over.SendLandUpdateToClient(avatar.ControllingClient);
+// sl doesnt seem to send this now, as it used 2
+//                    SendParcelOverlay(avatar.ControllingClient);
+                    avatar.currentParcelUUID = over.LandData.GlobalID;
+                    m_scene.EventManager.TriggerAvatarEnteringNewParcel(avatar, over.LandData.LocalID,
+                                                                        m_scene.RegionInfo.RegionID);
                 }
             }
         }
@@ -531,6 +497,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                     //when we are finally in a safe place, lets release the forced position lock
                     forcedPosition.Remove(clientAvatar.ControllingClient.AgentId);
                 }
+                                EnforceBans(parcel, clientAvatar);
             }
         }
 
@@ -589,7 +556,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                     requiredPowers = GroupPowers.LandManageBanned;
 
                 if (m_scene.Permissions.CanEditParcelProperties(agentID,
-                        land, requiredPowers))
+                        land, requiredPowers, false))
                 {
                     land.UpdateAccessList(flags, transactionID, sequenceID,
                             sections, entries, remote_client);
@@ -623,14 +590,11 @@ namespace OpenSim.Region.CoreModules.World.Land
                 new_land.LandData.LocalID = newLandLocalID;
 
                 bool[,] landBitmap = new_land.GetLandBitmap();
-                // m_log.DebugFormat("{0} AddLandObject. new_land.bitmapSize=({1},{2}). newLocalID={3}",
-                //                 LogHeader, landBitmap.GetLength(0), landBitmap.GetLength(1), newLandLocalID);
-
                 if (landBitmap.GetLength(0) != m_landIDList.GetLength(0) || landBitmap.GetLength(1) != m_landIDList.GetLength(1))
                 {
                     // Going to variable sized regions can cause mismatches
                     m_log.ErrorFormat("{0} AddLandObject. Added land bitmap different size than region ID map. bitmapSize=({1},{2}), landIDSize=({3},{4})",
-                        LogHeader, landBitmap.GetLength(0), landBitmap.GetLength(1), m_landIDList.GetLength(0), m_landIDList.GetLength(1) );
+                        LogHeader, landBitmap.GetLength(0), landBitmap.GetLength(1), m_landIDList.GetLength(0), m_landIDList.GetLength(1));
                 }
                 else
                 {
@@ -652,7 +616,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                                     {
                                         m_log.ErrorFormat(
                                             "{0}: Cannot add parcel \"{1}\", local ID {2} at tile {3},{4} because this is still occupied by parcel \"{5}\", local ID {6} in {7}",
-                                            LogHeader, new_land.LandData.Name, new_land.LandData.LocalID, x, y, 
+                                            LogHeader, new_land.LandData.Name, new_land.LandData.LocalID, x, y,
                                             lastRecordedLo.LandData.Name, lastRecordedLo.LandData.LocalID, m_scene.Name);
 
                                         return null;
@@ -668,10 +632,10 @@ namespace OpenSim.Region.CoreModules.World.Land
                         {
                             if (landBitmap[x, y])
                             {
-                                // m_log.DebugFormat(
-                                //     "[LAND MANAGEMENT MODULE]: Registering parcel {0} for land co-ord ({1}, {2}) on {3}", 
-                                //     new_land.LandData.Name, x, y, m_scene.RegionInfo.RegionName);
-                                    
+                                //                            m_log.DebugFormat(
+                                //                                "[LAND MANAGEMENT MODULE]: Registering parcel {0} for land co-ord ({1}, {2}) on {3}", 
+                                //                                new_land.LandData.Name, x, y, m_scene.RegionInfo.RegionName);
+
                                 m_landIDList[x, y] = newLandLocalID;
                             }
                         }
@@ -723,27 +687,28 @@ namespace OpenSim.Region.CoreModules.World.Land
         /// </summary>        
         public void Clear(bool setupDefaultParcel)
         {
-            List<ILandObject> parcels;
+            Dictionary<int, ILandObject> landworkList;
+            // move to work pointer since we are deleting it all
             lock (m_landList)
             {
-                parcels = new List<ILandObject>(m_landList.Values);
+                landworkList = m_landList;
+                m_landList = new Dictionary<int, ILandObject>();
             }
 
-            foreach (ILandObject lo in parcels)
+            // this 2 methods have locks (now)
+            ResetSimLandObjects();
+
+            if (setupDefaultParcel)
+                CreateDefaultParcel();
+
+            // fire outside events unlocked
+            foreach (ILandObject lo in landworkList.Values)
             {
                 //m_scene.SimulationDataService.RemoveLandObject(lo.LandData.GlobalID);
                 m_scene.EventManager.TriggerLandObjectRemoved(lo.LandData.GlobalID);
             }
+            landworkList.Clear();
 
-            lock (m_landList)
-            {
-                m_landList.Clear();
-
-                ResetSimLandObjects();
-            }
-            
-            if (setupDefaultParcel)
-                CreateDefaultParcel();
         }
 
         private void performFinalLandJoin(ILandObject master, ILandObject slave)
@@ -787,58 +752,37 @@ namespace OpenSim.Region.CoreModules.World.Land
         /// <returns>Land object at the point supplied</returns>
         public ILandObject GetLandObject(float x_float, float y_float)
         {
-            return GetLandObject((int)x_float, (int)y_float, true /* returnNullIfLandObjectNotFound */);
-            /*
-            int x;
-            int y;
-
-            if (x_float >= m_scene.RegionInfo.RegionSizeX || x_float < 0 || y_float >= m_scene.RegionInfo.RegionSizeX || y_float < 0)
-                return null;
+            return GetLandObject((int)x_float, (int)y_float, true);
+        }
 
-            try
-            {
-                x = Convert.ToInt32(Math.Floor(Convert.ToDouble(x_float) / (float)landUnit));
-                y = Convert.ToInt32(Math.Floor(Convert.ToDouble(y_float) / (float)landUnit));
-            }
-            catch (OverflowException)
-            {
-                return null;
-            }
+        // if x,y is off region this will return the parcel at cliped x,y
+        // as did code it replaces
+        public ILandObject GetLandObjectClipedXY(float x, float y)
+        {
+            //do clip inline
+            int avx = (int)x;
+            if (avx < 0)
+                avx = 0;
+            else if (avx >= m_scene.RegionInfo.RegionSizeX)
+                avx = (int)Constants.RegionSize - 1;
 
-            if (x >= (m_scene.RegionInfo.RegionSizeX / landUnit)
-                    || y >= (m_scene.RegionInfo.RegionSizeY / landUnit)
-                    || x < 0
-                    || y < 0)
-            {
-                return null;
-            }
+            int avy = (int)y;
+            if (avy < 0)
+                avy = 0;
+            else if (avy >= m_scene.RegionInfo.RegionSizeY)
+                avy = (int)Constants.RegionSize - 1;
 
-            lock (m_landList)
+            lock (m_landIDList)
             {
-                // Corner case. If an autoreturn happens during sim startup
-                // we will come here with the list uninitialized
-                //
-//                int landId = m_landIDList[x, y];
-                
-//                if (landId == 0)
-//                    m_log.DebugFormat(
-//                        "[LAND MANAGEMENT MODULE]: No land object found at ({0}, {1}) on {2}", 
-//                        x, y, m_scene.RegionInfo.RegionName);
-
                 try
                 {
-                    if (m_landList.ContainsKey(m_landIDList[x, y]))
-                        return m_landList[m_landIDList[x, y]];
+                    return m_landList[m_landIDList[avx / LandUnit, avy / LandUnit]];
                 }
-                catch (Exception e)
+                catch (IndexOutOfRangeException)
                 {
-                    m_log.DebugFormat("{0} GetLandObject exception. x={1}, y={2}, m_landIDList.len=({3},{4})",
-                        LogHeader, x, y, m_landIDList.GetLength(0), m_landIDList.GetLength(1));
+                    return null;
                 }
-                
-                return null;
             }
-             */
         }
 
         // Public entry.
@@ -848,30 +792,28 @@ namespace OpenSim.Region.CoreModules.World.Land
             return GetLandObject(x, y, false /* returnNullIfLandObjectNotFound */);
         }
 
-        /// <summary>
-        /// Given a region position, return the parcel land object for that location
-        /// </summary>
-        /// <returns>
-        /// The land object.
-        /// </returns>
-        /// <param name='x'></param>
-        /// <param name='y'></param>
-        /// <param name='returnNullIfLandObjectNotFound'>
-        /// Return null if the land object requested is not within the region's bounds.
-        /// </param>
-        private ILandObject GetLandObject(int x, int y, bool returnNullIfLandObjectOutsideBounds)
+        public ILandObject GetLandObject(int x, int y, bool returnNullIfLandObjectOutsideBounds)
         {
-            if (x >= m_scene.RegionInfo.RegionSizeX || y >=  m_scene.RegionInfo.RegionSizeY || x < 0 || y < 0)
+            if (x >= m_scene.RegionInfo.RegionSizeX || y >= m_scene.RegionInfo.RegionSizeY || x < 0 || y < 0)
             {
                 // These exceptions here will cause a lot of complaints from the users specifically because
                 // they happen every time at border crossings
                 if (returnNullIfLandObjectOutsideBounds)
                     return null;
                 else
-                    throw new Exception(
-                        String.Format("{0} GetLandObject for non-existent position. Region={1}, pos=<{2},{3}",
-                                                LogHeader, m_scene.RegionInfo.RegionName, x, y)
-                );
+                    throw new Exception("Error: Parcel not found at point " + x + ", " + y);
+            }
+
+            lock (m_landIDList)
+            {
+                try
+                {
+                        return m_landList[m_landIDList[x / 4, y / 4]];
+                }
+                catch (IndexOutOfRangeException)
+                {
+                        return null;
+                }
             }
 
             return m_landList[m_landIDList[x / 4, y / 4]];
@@ -1033,7 +975,7 @@ namespace OpenSim.Region.CoreModules.World.Land
 
             //If we are still here, then they are subdividing within one piece of land
             //Check owner
-            if (!m_scene.Permissions.CanEditParcelProperties(attempting_user_id, startLandObject, GroupPowers.LandDivideJoin))
+            if (!m_scene.Permissions.CanEditParcelProperties(attempting_user_id, startLandObject, GroupPowers.LandDivideJoin, true))
             {
                 return;
             }
@@ -1043,6 +985,8 @@ namespace OpenSim.Region.CoreModules.World.Land
             newLand.LandData.Name = newLand.LandData.Name;
             newLand.LandData.GlobalID = UUID.Random();
             newLand.LandData.Dwell = 0;
+            // Clear "Show in search" on the cut out parcel to prevent double-charging
+            newLand.LandData.Flags &= ~(uint)ParcelFlags.ShowDirectory;
 
             newLand.SetLandBitmap(newLand.GetSquareLandBitmap(start_x, start_y, end_x, end_y));
 
@@ -1058,11 +1002,11 @@ namespace OpenSim.Region.CoreModules.World.Land
             //Now add the new land object
             ILandObject result = AddLandObject(newLand);
 
-            if (result != null)
-            {
-                UpdateLandObject(startLandObject.LandData.LocalID, startLandObject.LandData);
-                result.SendLandUpdateToAvatarsOverMe();
-            }
+            UpdateLandObject(startLandObject.LandData.LocalID, startLandObject.LandData);
+            result.SendLandUpdateToAvatarsOverMe();
+            startLandObject.SendLandUpdateToAvatarsOverMe();
+            m_scene.ForEachClient(SendParcelOverlay);
+
         }
 
         /// <summary>
@@ -1104,7 +1048,7 @@ namespace OpenSim.Region.CoreModules.World.Land
             {
                 return;
             }
-            if (!m_scene.Permissions.CanEditParcelProperties(attempting_user_id, masterLandObject, GroupPowers.LandDivideJoin))
+            if (!m_scene.Permissions.CanEditParcelProperties(attempting_user_id, masterLandObject, GroupPowers.LandDivideJoin, true))
             {
                 return;
             }
@@ -1127,6 +1071,7 @@ namespace OpenSim.Region.CoreModules.World.Land
             }
 
             masterLandObject.SendLandUpdateToAvatarsOverMe();
+            m_scene.ForEachClient(SendParcelOverlay);
         }
 
         public void Join(int start_x, int start_y, int end_x, int end_y, UUID attempting_user_id)
@@ -1143,12 +1088,6 @@ namespace OpenSim.Region.CoreModules.World.Land
 
         #region Parcel Updating
 
-        // Send parcel layer info for the whole region
-        public void SendParcelOverlay(IClientAPI remote_client)
-        {
-            SendParcelOverlay(remote_client, 0, 0, (int)Constants.MaximumRegionSize);
-        }
-
         /// <summary>
         /// Send the parcel overlay blocks to the client. We send the overlay packets
         /// around a location and limited by the 'parcelLayerViewDistance'. This number
@@ -1162,145 +1101,116 @@ namespace OpenSim.Region.CoreModules.World.Land
         /// <param name="xPlace">X position in the region to send surrounding parcel layer info</param>
         /// <param name="yPlace">y position in the region to send surrounding parcel layer info</param>
         /// <param name="layerViewDistance">Distance from x,y position to send parcel layer info</param>
-        private  void SendParcelOverlay(IClientAPI remote_client, int xPlace, int yPlace, int layerViewDistance)
+        public void SendParcelOverlay(IClientAPI remote_client)
         {
+            if (remote_client.SceneAgent.PresenceType == PresenceType.Npc)
+                return;
+
             const int LAND_BLOCKS_PER_PACKET = 1024;
 
             byte[] byteArray = new byte[LAND_BLOCKS_PER_PACKET];
             int byteArrayCount = 0;
             int sequenceID = 0;
 
-            int xLow = 0;
-            int xHigh = (int)m_scene.RegionInfo.RegionSizeX;
-            int yLow = 0;
-            int yHigh = (int)m_scene.RegionInfo.RegionSizeY;
-
-            if (shouldLimitParcelLayerInfoToViewDistance)
+            // Layer data is in LandUnit (4m) chunks
+            for (int y = 0; y < m_scene.RegionInfo.RegionSizeY; y += LandUnit)
             {
-                // Compute view distance around the given point
-                int txLow = xPlace - layerViewDistance;
-                int txHigh = xPlace + layerViewDistance;
-                // If the distance is outside the region area, move the view distance to ba all in the region
-                if (txLow < xLow)
-                {
-                    txLow = xLow;
-                    txHigh = Math.Min(yLow + (layerViewDistance * 2), xHigh);
-                }
-                if (txHigh > xHigh)
+                for (int x = 0; x < m_scene.RegionInfo.RegionSizeX; x += LandUnit)
                 {
-                    txLow = Math.Max(xLow, xHigh - (layerViewDistance * 2));
-                    txHigh = xHigh;
-                }
-                xLow = txLow;
-                xHigh = txHigh;
+                    byte tempByte = 0; //This represents the byte for the current 4x4
 
-                int tyLow = yPlace - layerViewDistance;
-                int tyHigh = yPlace + layerViewDistance;
-                if (tyLow < yLow)
-                {
-                    tyLow = yLow;
-                    tyHigh = Math.Min(yLow + (layerViewDistance * 2), yHigh);
-                }
-                if (tyHigh > yHigh)
-                {
-                    tyLow = Math.Max(yLow, yHigh - (layerViewDistance * 2));
-                    tyHigh = yHigh;
-                }
-                yLow = tyLow;
-                yHigh = tyHigh;
-            }
-            // m_log.DebugFormat("{0} SendParcelOverlay: place=<{1},{2}>, vDist={3}, xLH=<{4},{5}, yLH=<{6},{7}>",
-            //     LogHeader, xPlace, yPlace, layerViewDistance, xLow, xHigh, yLow, yHigh);
+                    ILandObject currentParcelBlock = GetLandObject(x, y);
 
-            // Layer data is in landUnit (4m) chunks
-            for (int y = yLow; y < yHigh / Constants.TerrainPatchSize * (Constants.TerrainPatchSize / LandUnit); y++)
-            {
-                for (int x = xLow; x < xHigh / Constants.TerrainPatchSize * (Constants.TerrainPatchSize / LandUnit); x++)
-                {
-                    byteArray[byteArrayCount] = BuildLayerByte(GetLandObject(x * LandUnit, y * LandUnit), x, y, remote_client);
-                    byteArrayCount++;
-                    if (byteArrayCount >= LAND_BLOCKS_PER_PACKET)
+                    if (currentParcelBlock != null)
                     {
-                        // m_log.DebugFormat("{0} SendParcelOverlay, sending packet, bytes={1}", LogHeader, byteArray.Length);
-                        remote_client.SendLandParcelOverlay(byteArray, sequenceID);
-                        byteArrayCount = 0;
-                        sequenceID++;
-                        byteArray = new byte[LAND_BLOCKS_PER_PACKET];
-                    }
+                        // types 
+                        if (currentParcelBlock.LandData.OwnerID == remote_client.AgentId)
+                        {
+                            //Owner Flag
+                            tempByte = (byte)LandChannel.LAND_TYPE_OWNED_BY_REQUESTER;
+                        }
+                        else if (currentParcelBlock.LandData.IsGroupOwned && remote_client.IsGroupMember(currentParcelBlock.LandData.GroupID))
+                        {
+                            tempByte = (byte)LandChannel.LAND_TYPE_OWNED_BY_GROUP;
+                        }
+                        else if (currentParcelBlock.LandData.SalePrice > 0 &&
+                                 (currentParcelBlock.LandData.AuthBuyerID == UUID.Zero ||
+                                  currentParcelBlock.LandData.AuthBuyerID == remote_client.AgentId))
+                        {
+                            //Sale type
+                            tempByte = (byte)LandChannel.LAND_TYPE_IS_FOR_SALE;
+                        }
+                        else if (currentParcelBlock.LandData.OwnerID == UUID.Zero)
+                        {
+                            //Public type 
+                            tempByte = (byte)LandChannel.LAND_TYPE_PUBLIC; // this does nothing, its zero
+                        }
+                        // LAND_TYPE_IS_BEING_AUCTIONED still unsuported
+                        else
+                        {
+                            //Other Flag
+                            tempByte = (byte)LandChannel.LAND_TYPE_OWNED_BY_OTHER;
+                        }
 
-                }
-            }
+                        // now flags
+                        // border control
 
-            if (byteArrayCount != 0)
-            {
-                remote_client.SendLandParcelOverlay(byteArray, sequenceID);
-                // m_log.DebugFormat("{0} SendParcelOverlay, complete sending packet, bytes={1}", LogHeader, byteArray.Length);
-            }
-        }
+                        ILandObject westParcel = null;
+                        ILandObject southParcel = null;
+                        if (x > 0)
+                        {
+                            westParcel = GetLandObject((x - 1), y);
+                        }
+                        if (y > 0)
+                        {
+                            southParcel = GetLandObject(x, (y - 1));
+                        }
 
-        private byte BuildLayerByte(ILandObject currentParcelBlock, int x, int y, IClientAPI remote_client)
-        {
-            byte tempByte = 0; //This represents the byte for the current 4x4
+                        if (x == 0)
+                        {
+                            tempByte |= (byte)LandChannel.LAND_FLAG_PROPERTY_BORDER_WEST;
+                        }
+                        else if (westParcel != null && westParcel != currentParcelBlock)
+                        {
+                            tempByte |= (byte)LandChannel.LAND_FLAG_PROPERTY_BORDER_WEST;
+                        }
 
-            if (currentParcelBlock != null)
-            {
-                if (currentParcelBlock.LandData.OwnerID == remote_client.AgentId)
-                {
-                    //Owner Flag
-                    tempByte = Convert.ToByte(tempByte | LandChannel.LAND_TYPE_OWNED_BY_REQUESTER);
-                }
-                else if (currentParcelBlock.LandData.SalePrice > 0 &&
-                         (currentParcelBlock.LandData.AuthBuyerID == UUID.Zero ||
-                          currentParcelBlock.LandData.AuthBuyerID == remote_client.AgentId))
-                {
-                    //Sale Flag
-                    tempByte = Convert.ToByte(tempByte | LandChannel.LAND_TYPE_IS_FOR_SALE);
-                }
-                else if (currentParcelBlock.LandData.OwnerID == UUID.Zero)
-                {
-                    //Public Flag
-                    tempByte = Convert.ToByte(tempByte | LandChannel.LAND_TYPE_PUBLIC);
-                }
-                else
-                {
-                    //Other Flag
-                    tempByte = Convert.ToByte(tempByte | LandChannel.LAND_TYPE_OWNED_BY_OTHER);
-                }
+                        if (y == 0)
+                        {
+                            tempByte |= (byte)LandChannel.LAND_FLAG_PROPERTY_BORDER_SOUTH;
+                        }
+                        else if (southParcel != null && southParcel != currentParcelBlock)
+                        {
+                            tempByte |= (byte)LandChannel.LAND_FLAG_PROPERTY_BORDER_SOUTH;
+                        }
 
-                //Now for border control
+                        // local sound
+                        if ((currentParcelBlock.LandData.Flags & (uint)ParcelFlags.SoundLocal) != 0)
+                            tempByte |= (byte)LandChannel.LAND_FLAG_LOCALSOUND;
 
-                ILandObject westParcel = null;
-                ILandObject southParcel = null;
-                if (x > 0)
-                {
-                    westParcel = GetLandObject((x - 1) * LandUnit, y * LandUnit);
-                }
-                if (y > 0)
-                {
-                    southParcel = GetLandObject(x * LandUnit, (y - 1) * LandUnit);
-                }
+                        // hide avatars
+                        if (!currentParcelBlock.LandData.SeeAVs)
+                            tempByte |= (byte)LandChannel.LAND_FLAG_HIDEAVATARS;
 
-                if (x == 0)
-                {
-                    tempByte = Convert.ToByte(tempByte | LandChannel.LAND_FLAG_PROPERTY_BORDER_WEST);
-                }
-                else if (westParcel != null && westParcel != currentParcelBlock)
-                {
-                    tempByte = Convert.ToByte(tempByte | LandChannel.LAND_FLAG_PROPERTY_BORDER_WEST);
-                }
 
-                if (y == 0)
-                {
-                    tempByte = Convert.ToByte(tempByte | LandChannel.LAND_FLAG_PROPERTY_BORDER_SOUTH);
-                }
-                else if (southParcel != null && southParcel != currentParcelBlock)
-                {
-                    tempByte = Convert.ToByte(tempByte | LandChannel.LAND_FLAG_PROPERTY_BORDER_SOUTH);
+                        byteArray[byteArrayCount] = tempByte;
+                        byteArrayCount++;
+                        if (byteArrayCount >= LAND_BLOCKS_PER_PACKET)
+                        {
+                            remote_client.SendLandParcelOverlay(byteArray, sequenceID);
+                            byteArrayCount = 0;
+                            sequenceID++;
+                            byteArray = new byte[LAND_BLOCKS_PER_PACKET];
+                        }
+                    }
                 }
 
             }
 
-            return tempByte;
+            if (byteArrayCount > 0)
+            {
+                remote_client.SendLandParcelOverlay(byteArray, sequenceID);
+            }
         }
 
         public void ClientOnParcelPropertiesRequest(int start_x, int start_y, int end_x, int end_y, int sequence_id,
@@ -1320,8 +1230,11 @@ namespace OpenSim.Region.CoreModules.World.Land
                     {
                         if (!temp.Contains(currentParcel))
                         {
-                            currentParcel.ForceUpdateLandInfo();
-                            temp.Add(currentParcel);
+                            if (!currentParcel.IsEitherBannedOrRestricted(remote_client.AgentId))
+                            {
+                                currentParcel.ForceUpdateLandInfo();
+                                temp.Add(currentParcel);
+                            }
                         }
                     }
                 }
@@ -1338,8 +1251,45 @@ namespace OpenSim.Region.CoreModules.World.Land
                 temp[i].SendLandProperties(sequence_id, snap_selection, requestResult, remote_client);
             }
 
-            // Also send the layer data around the point of interest
-            SendParcelOverlay(remote_client, (start_x + end_x) / 2, (start_y + end_y) / 2, parcelLayerViewDistance);
+//            SendParcelOverlay(remote_client);
+        }
+
+        public void UpdateLandProperties(ILandObject land, LandUpdateArgs args, IClientAPI remote_client)
+        {
+            bool snap_selection = false;
+            bool needOverlay = false;
+            if (land.UpdateLandProperties(args, remote_client, out snap_selection, out needOverlay))
+            {
+                //the proprieties to who changed them
+                ScenePresence av = m_scene.GetScenePresence(remote_client.AgentId);
+                if(av.IsChildAgent || land != GetLandObject(av.AbsolutePosition.X, av.AbsolutePosition.Y))
+                    land.SendLandProperties(-10000, false, LandChannel.LAND_RESULT_SINGLE, remote_client);
+                else
+                    land.SendLandProperties(0, false, LandChannel.LAND_RESULT_SINGLE, remote_client);
+
+                UUID parcelID = land.LandData.GlobalID;
+                m_scene.ForEachScenePresence(delegate(ScenePresence avatar)
+                 {
+                     if (avatar.IsDeleted || avatar.isNPC)
+                         return;
+
+                     IClientAPI client = avatar.ControllingClient;
+                     if (needOverlay)
+                         SendParcelOverlay(client);
+
+                     if (avatar.IsChildAgent)
+                         return;
+
+                     ILandObject aland = GetLandObject(avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y);
+                     if (aland != null)
+                     {
+                         if (client != remote_client && land == aland)
+                             aland.SendLandProperties(0, false, LandChannel.LAND_RESULT_SINGLE, client);
+                     }
+                     if (avatar.currentParcelUUID == parcelID)
+                         avatar.currentParcelUUID = parcelID; // force parcel flags review
+                 });
+            }
         }
 
         public void ClientOnParcelPropertiesUpdateRequest(LandUpdateArgs args, int localID, IClientAPI remote_client)
@@ -1352,7 +1302,7 @@ namespace OpenSim.Region.CoreModules.World.Land
 
             if (land != null)
             {
-                land.UpdateLandProperties(args, remote_client);
+                UpdateLandProperties(land, args, remote_client);
                 m_scene.EventManager.TriggerOnParcelPropertiesUpdateRequest(args, localID, remote_client);
             }
         }
@@ -1408,7 +1358,6 @@ namespace OpenSim.Region.CoreModules.World.Land
                     land.LandData.GroupID = UUID.Zero;
                     land.LandData.IsGroupOwned = false;
                     land.LandData.Flags &= ~(uint) (ParcelFlags.ForSale | ParcelFlags.ForSaleObjects | ParcelFlags.SellParcelObjects | ParcelFlags.ShowDirectory);
-
                     m_scene.ForEachClient(SendParcelOverlay);
                     land.SendLandUpdateToClient(true, remote_client);
                     UpdateLandObject(land.LandData.LocalID, land.LandData);
@@ -1459,7 +1408,6 @@ namespace OpenSim.Region.CoreModules.World.Land
                     land.LandData.SalePrice = 0;
                     land.LandData.AuthBuyerID = UUID.Zero;
                     land.LandData.Flags &= ~(uint) (ParcelFlags.ForSale | ParcelFlags.ForSaleObjects | ParcelFlags.SellParcelObjects | ParcelFlags.ShowDirectory);
-
                     m_scene.ForEachClient(SendParcelOverlay);
                     land.SendLandUpdateToClient(true, remote_client);
                     UpdateLandObject(land.LandData.LocalID, land.LandData);
@@ -1545,17 +1493,12 @@ namespace OpenSim.Region.CoreModules.World.Land
 
         private void EventManagerOnIncomingLandDataFromStorage(List<LandData> data)
         {
-//            m_log.DebugFormat(
-//                "[LAND MANAGMENT MODULE]: Processing {0} incoming parcels on {1}", data.Count, m_scene.Name);
-
-            // Prevent race conditions from any auto-creation of new parcels for varregions whilst we are still loading
-            // the existing parcels.
             lock (m_landList)
             {
                 for (int i = 0; i < data.Count; i++)
                     IncomingLandObjectFromStorage(data[i]);
 
-                // Layer data is in landUnit (4m) chunks
+                // Layer data is in LandUnit (4m) chunks
                 for (int y = 0; y < m_scene.RegionInfo.RegionSizeY / Constants.TerrainPatchSize * (Constants.TerrainPatchSize / LandUnit); y++)
                 {
                     for (int x = 0; x < m_scene.RegionInfo.RegionSizeX / Constants.TerrainPatchSize * (Constants.TerrainPatchSize / LandUnit); x++)
@@ -1565,7 +1508,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                             if (m_landList.Count == 1)
                             {
                                 m_log.DebugFormat(
-                                    "[{0}]: Auto-extending land parcel as landID at {1},{2} is 0 and only one land parcel is present in {3}", 
+                                    "[{0}]: Auto-extending land parcel as landID at {1},{2} is 0 and only one land parcel is present in {3}",
                                     LogHeader, x, y, m_scene.Name);
 
                                 int onlyParcelID = 0;
@@ -1588,11 +1531,11 @@ namespace OpenSim.Region.CoreModules.World.Land
                             else if (m_landList.Count > 1)
                             {
                                 m_log.DebugFormat(
-                                    "{0}: Auto-creating land parcel as landID at {1},{2} is 0 and more than one land parcel is present in {3}", 
+                                    "{0}: Auto-creating land parcel as landID at {1},{2} is 0 and more than one land parcel is present in {3}",
                                     LogHeader, x, y, m_scene.Name);
 
                                 // There are several other parcels so we must create a new one for the unassigned space
-                                ILandObject newLand = new LandObject(UUID.Zero, false, m_scene);                                                
+                                ILandObject newLand = new LandObject(UUID.Zero, false, m_scene);
                                 // Claim all the unclaimed "0" ids
                                 newLand.SetLandBitmap(CreateBitmapForID(0));
                                 newLand.LandData.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner;
@@ -1603,7 +1546,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                             {
                                 // We should never reach this point as the separate code path when no land data exists should have fired instead.
                                 m_log.WarnFormat(
-                                    "{0}: Ignoring request to auto-create parcel in {1} as there are no other parcels present", 
+                                    "{0}: Ignoring request to auto-create parcel in {1} as there are no other parcels present",
                                     LogHeader, m_scene.Name);
                             }
                         }
@@ -1614,9 +1557,12 @@ namespace OpenSim.Region.CoreModules.World.Land
 
         private void IncomingLandObjectFromStorage(LandData data)
         {
-            ILandObject new_land = new LandObject(data, m_scene);
+            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)
@@ -1773,6 +1719,19 @@ namespace OpenSim.Region.CoreModules.World.Land
             land_update.ObscureMusic = properties.ObscureMusic;
             land_update.ObscureMedia = properties.ObscureMedia;
 
+            if (args.ContainsKey("see_avs"))
+            {
+                land_update.SeeAVs = args["see_avs"].AsBoolean();
+                land_update.AnyAVSounds = args["any_av_sounds"].AsBoolean();
+                land_update.GroupAVSounds = args["group_av_sounds"].AsBoolean();
+            }
+            else
+            {
+                land_update.SeeAVs = true;
+                land_update.AnyAVSounds = true;
+                land_update.GroupAVSounds = true;
+            }
+
             ILandObject land;
             lock (m_landList)
             {
@@ -1781,13 +1740,14 @@ namespace OpenSim.Region.CoreModules.World.Land
 
             if (land != null)
             {
-                land.UpdateLandProperties(land_update, client);
+                UpdateLandProperties(land,land_update, client);               
                 m_scene.EventManager.TriggerOnParcelPropertiesUpdateRequest(land_update, parcelID, client);
             }
             else
             {
                 m_log.WarnFormat("[LAND MANAGEMENT MODULE]: Unable to find parcelID {0}", parcelID);
             }
+
             return LLSDHelpers.SerialiseLLSDReply(new LLSDEmpty());
         }
         // we cheat here: As we don't have (and want) a grid-global parcel-store, we can't return the
@@ -1940,14 +1900,93 @@ namespace OpenSim.Region.CoreModules.World.Land
 
             if (land == null) return;
 
-            if (!m_scene.Permissions.CanEditParcelProperties(remoteClient.AgentId, land, GroupPowers.LandOptions))
+            if (!m_scene.Permissions.CanEditParcelProperties(remoteClient.AgentId, land, GroupPowers.LandOptions, false))
                 return;
 
             land.LandData.OtherCleanTime = otherCleanTime;
 
             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.ContainsScripts())
+                            {
+                                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.ContainsScripts())
+                                {
+                                    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)
@@ -1961,7 +2000,7 @@ namespace OpenSim.Region.CoreModules.World.Land
             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))
+                if (!((Scene)client.Scene).Permissions.CanEditParcelProperties(client.AgentId, land, GroupPowers.LandEjectAndFreeze, true))
                     return;
                 if (flags == 0)
                 {
@@ -1983,7 +2022,6 @@ namespace OpenSim.Region.CoreModules.World.Land
                 }
             }
         }
-
         private void OnEndParcelFrozen(object avatar)
         {
             ScenePresence targetAvatar = (ScenePresence)avatar;
@@ -1994,6 +2032,7 @@ namespace OpenSim.Region.CoreModules.World.Land
             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;
@@ -2010,15 +2049,16 @@ namespace OpenSim.Region.CoreModules.World.Land
 
             // Check if you even have permission to do this
             ILandObject land = m_scene.LandChannel.GetLandObject(targetAvatar.AbsolutePosition.X, targetAvatar.AbsolutePosition.Y);
-            if (!m_scene.Permissions.CanEditParcelProperties(client.AgentId, land, GroupPowers.LandEjectAndFreeze) &&
+            if (!m_scene.Permissions.CanEditParcelProperties(client.AgentId, land, GroupPowers.LandEjectAndFreeze, true) &&
                 !m_scene.Permissions.IsAdministrator(client.AgentId))
                 return;
+
             Vector3 pos = m_scene.GetNearestAllowedPosition(targetAvatar, land);
 
             targetAvatar.TeleportWithMomentum(pos, null);
             targetAvatar.ControllingClient.SendAlertMessage("You have been ejected by " + parcelManager.Firstname + " " + parcelManager.Lastname);
             parcelManager.ControllingClient.SendAlertMessage("Avatar Ejected.");
-
+            
             if ((flags & 1) != 0) // Ban TODO: Remove magic number
             {
                 LandAccessEntry entry = new LandAccessEntry();
@@ -2171,37 +2211,50 @@ namespace OpenSim.Region.CoreModules.World.Land
 
         private void AppendParcelsSummaryReport(StringBuilder report)
         {           
-            report.AppendFormat("Land information for {0}\n", m_scene.Name);
-
-            ConsoleDisplayTable cdt = new ConsoleDisplayTable();
-            cdt.AddColumn("Parcel Name", ConsoleDisplayUtil.ParcelNameSize);
-            cdt.AddColumn("ID", 3);
-            cdt.AddColumn("Area", 6);
-            cdt.AddColumn("Starts", ConsoleDisplayUtil.VectorSize);
-            cdt.AddColumn("Ends", ConsoleDisplayUtil.VectorSize);
-            cdt.AddColumn("Owner", ConsoleDisplayUtil.UserNameSize);
+            report.AppendFormat("Land information for {0}\n", m_scene.RegionInfo.RegionName);            
+            report.AppendFormat(
+                "{0,-20} {1,-10} {2,-9} {3,-18} {4,-18} {5,-20}\n",
+                "Parcel Name",
+                "Local ID",
+                "Area",
+                "AABBMin",
+                "AABBMax",
+                "Owner");
             
             lock (m_landList)
             {
                 foreach (ILandObject lo in m_landList.Values)
                 {
                     LandData ld = lo.LandData;
-                    string ownerName;
-                    if (ld.IsGroupOwned)
-                    {
-                        GroupRecord rec = m_groupManager.GetGroupRecord(ld.GroupID);
-                        ownerName = (rec != null) ? rec.GroupName : "Unknown Group";
-                    }
-                    else
-                    {
-                        ownerName = m_userManager.GetUserName(ld.OwnerID);
-                    }
-                    cdt.AddRow(
-                        ld.Name, ld.LocalID, ld.Area, lo.StartPoint, lo.EndPoint, ownerName);
+                    
+                    report.AppendFormat(
+                        "{0,-20} {1,-10} {2,-9} {3,-18} {4,-18} {5,-20}\n", 
+                        ld.Name, ld.LocalID, ld.Area, ld.AABBMin, ld.AABBMax, m_userManager.GetUserName(ld.OwnerID));
                 }
             }
+           
+        }         
+
+        public void EnforceBans(ILandObject land, ScenePresence avatar)
+        {
+            if (avatar.AbsolutePosition.Z > LandChannel.BAN_LINE_SAFETY_HIEGHT)
+                return;
 
-            report.Append(cdt.ToString());
+            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);
+                }
+            }
         } 
 
         private void AppendParcelReport(StringBuilder report, ILandObject lo)
@@ -2214,8 +2267,6 @@ namespace OpenSim.Region.CoreModules.World.Land
             cdl.AddRow("Description", ld.Description);
             cdl.AddRow("Snapshot ID", ld.SnapshotID);
             cdl.AddRow("Area", ld.Area);
-            cdl.AddRow("Starts", lo.StartPoint);
-            cdl.AddRow("Ends", lo.EndPoint);
             cdl.AddRow("AABB Min", ld.AABBMin);
             cdl.AddRow("AABB Max", ld.AABBMax);
             string ownerName;
diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
index a0c1b9d..040c90b 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
@@ -50,7 +50,8 @@ namespace OpenSim.Region.CoreModules.World.Land
         private readonly int landUnit = 4;
 
         private int m_lastSeqId = 0;
-              
+        private int m_expiryCounter = 0;
+
         protected Scene m_scene;
         protected List<SceneObjectGroup> primsOverMe = new List<SceneObjectGroup>();
         protected Dictionary<uint, UUID> m_listTransactions = new Dictionary<uint, UUID>();
@@ -58,7 +59,12 @@ namespace OpenSim.Region.CoreModules.World.Land
         protected ExpiringCache<UUID, bool> m_groupMemberCache = new ExpiringCache<UUID, bool>();
         protected TimeSpan m_groupMemberCacheTimeout = TimeSpan.FromSeconds(30);  // cache invalidation after 30 seconds
 
-        public bool[,] LandBitmap { get; set; }
+        private bool[,] m_landBitmap;
+        public bool[,] LandBitmap
+        {
+            get { return m_landBitmap; }
+            set { m_landBitmap = value; }
+        }
 
         #endregion
 
@@ -69,7 +75,13 @@ namespace OpenSim.Region.CoreModules.World.Land
             return free;
         }
 
-        public LandData LandData { get; set; }
+        protected LandData m_landData;        
+        public LandData LandData
+        {
+            get { return m_landData; }
+
+            set { m_landData = value; }
+        }
 
         public IPrimCounts PrimCounts { get; set; }
 
@@ -141,6 +153,8 @@ namespace OpenSim.Region.CoreModules.World.Land
             else
                 LandData.GroupID = UUID.Zero;
             LandData.IsGroupOwned = is_group_owned;
+            
+            m_scene.EventManager.OnFrame += OnFrame;
         }
 
         #endregion
@@ -195,10 +209,27 @@ namespace OpenSim.Region.CoreModules.World.Land
             else
             {
                 // Normal Calculations
-                int parcelMax = (int)(((float)LandData.Area / (m_scene.RegionInfo.RegionSizeX * m_scene.RegionInfo.RegionSizeY))
-                              * (float)m_scene.RegionInfo.ObjectCapacity
-                              * (float)m_scene.RegionInfo.RegionSettings.ObjectBonus);
-                // TODO: The calculation of ObjectBonus should be refactored. It does still not work in the same manner as SL!
+                int parcelMax = (int)( (long)LandData.Area
+                              * (long)m_scene.RegionInfo.ObjectCapacity
+                              * (long)m_scene.RegionInfo.RegionSettings.ObjectBonus
+                              / (long)(m_scene.RegionInfo.RegionSizeX * m_scene.RegionInfo.RegionSizeY) );
+                //m_log.DebugFormat("Area: {0}, Capacity {1}, Bonus {2}, Parcel {3}", LandData.Area, m_scene.RegionInfo.ObjectCapacity, m_scene.RegionInfo.RegionSettings.ObjectBonus, parcelMax);
+                return parcelMax;
+            }
+        }
+
+        private int GetParcelBasePrimCount()
+        {
+            if (overrideParcelMaxPrimCount != null)
+            {
+                return overrideParcelMaxPrimCount(this);
+            }
+            else
+            {
+                // Normal Calculations
+                int parcelMax = (int)((long)LandData.Area
+                              * (long)m_scene.RegionInfo.ObjectCapacity
+                              / 65536L);
                 return parcelMax;
             }
         }
@@ -212,8 +243,10 @@ namespace OpenSim.Region.CoreModules.World.Land
             else
             {
                 //Normal Calculations
-                int simMax = (int)(((float)LandData.SimwideArea / (m_scene.RegionInfo.RegionSizeX * m_scene.RegionInfo.RegionSizeY))
-                           * (float)m_scene.RegionInfo.ObjectCapacity);
+                int simMax = (int)(   (long)LandData.SimwideArea
+                                    * (long)m_scene.RegionInfo.ObjectCapacity
+                                    / (long)(m_scene.RegionInfo.RegionSizeX * m_scene.RegionInfo.RegionSizeY) );
+                // m_log.DebugFormat("Simwide Area: {0}, Capacity {1}, SimMax {2}", LandData.SimwideArea, m_scene.RegionInfo.ObjectCapacity, simMax);
                 return simMax;
             }
         }
@@ -224,6 +257,9 @@ namespace OpenSim.Region.CoreModules.World.Land
 
         public void SendLandProperties(int sequence_id, bool snap_selection, int request_result, IClientAPI remote_client)
         {
+            if (remote_client.SceneAgent.PresenceType == PresenceType.Npc)
+                return;
+
             IEstateModule estateModule = m_scene.RequestModuleInterface<IEstateModule>();
             // uint regionFlags = 336723974 & ~((uint)(RegionFlags.AllowLandmark | RegionFlags.AllowSetHome));
             uint regionFlags = (uint)(RegionFlags.PublicAllowed
@@ -248,14 +284,15 @@ namespace OpenSim.Region.CoreModules.World.Land
             remote_client.SendLandProperties(seq_id,
                     snap_selection, request_result, this,
                     (float)m_scene.RegionInfo.RegionSettings.ObjectBonus,
-                    GetParcelMaxPrimCount(),
+                    GetParcelBasePrimCount(),
                     GetSimulatorMaxPrimCount(), regionFlags);
         }
 
-        public void UpdateLandProperties(LandUpdateArgs args, IClientAPI remote_client)
+        public bool UpdateLandProperties(LandUpdateArgs args, IClientAPI remote_client, out bool snap_selection, out bool needOverlay)
         {
             //Needs later group support
-            bool snap_selection = false;
+            snap_selection = false;
+            needOverlay = false;
             LandData newData = LandData.Copy();
 
             uint allowedDelta = 0;
@@ -264,7 +301,7 @@ namespace OpenSim.Region.CoreModules.World.Land
             // ParcelFlags.ForSaleObjects
             // ParcelFlags.LindenHome
 
-            if (m_scene.Permissions.CanEditParcelProperties(remote_client.AgentId, this, GroupPowers.LandOptions))
+            if (m_scene.Permissions.CanEditParcelProperties(remote_client.AgentId, this, GroupPowers.LandOptions, false))
             {
                 allowedDelta |= (uint)(ParcelFlags.AllowLandmark |
                         ParcelFlags.AllowTerraform |
@@ -277,9 +314,12 @@ namespace OpenSim.Region.CoreModules.World.Land
                         ParcelFlags.AllowAPrimitiveEntry |
                         ParcelFlags.AllowGroupObjectEntry |
                         ParcelFlags.AllowFly);
+                newData.SeeAVs = args.SeeAVs;
+                newData.AnyAVSounds = args.AnyAVSounds;
+                newData.GroupAVSounds = args.GroupAVSounds;
             }
 
-            if (m_scene.Permissions.CanEditParcelProperties(remote_client.AgentId, this, GroupPowers.LandSetSale))
+            if (m_scene.Permissions.CanEditParcelProperties(remote_client.AgentId, this, GroupPowers.LandSetSale, true))
             {
                 if (args.AuthBuyerID != newData.AuthBuyerID ||
                     args.SalePrice != newData.SalePrice)
@@ -302,30 +342,30 @@ namespace OpenSim.Region.CoreModules.World.Land
                 allowedDelta |= (uint)ParcelFlags.ForSale;
             }
 
-            if (m_scene.Permissions.CanEditParcelProperties(remote_client.AgentId,this, GroupPowers.FindPlaces))
+            if (m_scene.Permissions.CanEditParcelProperties(remote_client.AgentId,this, GroupPowers.FindPlaces, false))
             {
                 newData.Category = args.Category;
 
                 allowedDelta |= (uint)(ParcelFlags.ShowDirectory |
                         ParcelFlags.AllowPublish |
-                        ParcelFlags.MaturePublish);
+                        ParcelFlags.MaturePublish) | (uint)(1 << 23);
             }
 
-            if (m_scene.Permissions.CanEditParcelProperties(remote_client.AgentId,this, GroupPowers.LandChangeIdentity))
+            if (m_scene.Permissions.CanEditParcelProperties(remote_client.AgentId,this, GroupPowers.LandChangeIdentity, false))
             {
                 newData.Description = args.Desc;
                 newData.Name = args.Name;
                 newData.SnapshotID = args.SnapshotID;
             }
 
-            if (m_scene.Permissions.CanEditParcelProperties(remote_client.AgentId,this, GroupPowers.SetLandingPoint))
+            if (m_scene.Permissions.CanEditParcelProperties(remote_client.AgentId,this, GroupPowers.SetLandingPoint, false))
             {
                 newData.LandingType = args.LandingType;
                 newData.UserLocation = args.UserLocation;
                 newData.UserLookAt = args.UserLookAt;
             }
 
-            if (m_scene.Permissions.CanEditParcelProperties(remote_client.AgentId,this, GroupPowers.ChangeMedia))
+            if (m_scene.Permissions.CanEditParcelProperties(remote_client.AgentId,this, GroupPowers.ChangeMedia, false))
             {
                 newData.MediaAutoScale = args.MediaAutoScale;
                 newData.MediaID = args.MediaID;
@@ -346,7 +386,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                         ParcelFlags.UseEstateVoiceChan);
             }
 
-            if (m_scene.Permissions.CanEditParcelProperties(remote_client.AgentId,this, GroupPowers.LandManagePasses))
+            if (m_scene.Permissions.CanEditParcelProperties(remote_client.AgentId,this, GroupPowers.LandManagePasses, false))
             {
                 newData.PassHours = args.PassHours;
                 newData.PassPrice = args.PassPrice;
@@ -354,13 +394,13 @@ namespace OpenSim.Region.CoreModules.World.Land
                 allowedDelta |= (uint)ParcelFlags.UsePassList;
             }
 
-            if (m_scene.Permissions.CanEditParcelProperties(remote_client.AgentId, this, GroupPowers.LandManageAllowed))
+            if (m_scene.Permissions.CanEditParcelProperties(remote_client.AgentId, this, GroupPowers.LandManageAllowed, false))
             {
                 allowedDelta |= (uint)(ParcelFlags.UseAccessGroup |
                         ParcelFlags.UseAccessList);
             }
 
-            if (m_scene.Permissions.CanEditParcelProperties(remote_client.AgentId, this, GroupPowers.LandManageBanned))
+            if (m_scene.Permissions.CanEditParcelProperties(remote_client.AgentId, this, GroupPowers.LandManageBanned, false))
             {
                 allowedDelta |= (uint)(ParcelFlags.UseBanList |
                         ParcelFlags.DenyAnonymous |
@@ -372,9 +412,16 @@ namespace OpenSim.Region.CoreModules.World.Land
                 uint preserve = LandData.Flags & ~allowedDelta;
                 newData.Flags = preserve | (args.ParcelFlags & allowedDelta);
 
+                uint curdelta = LandData.Flags ^ newData.Flags;
+                curdelta &= (uint)(ParcelFlags.SoundLocal);
+
+                if(curdelta != 0 || newData.SeeAVs != LandData.SeeAVs)
+                    needOverlay = true;
+
                 m_scene.LandChannel.UpdateLandObject(LandData.LocalID, newData);
-                SendLandUpdateToAvatarsOverMe(snap_selection);
+                return true; 
             }
+            return false;
         }
 
         public void UpdateLandSold(UUID avatarID, UUID groupID, bool groupOwned, uint AuctionID, int claimprice, int area)
@@ -395,7 +442,7 @@ namespace OpenSim.Region.CoreModules.World.Land
             UUID previousOwner = LandData.OwnerID;
 
             m_scene.LandChannel.UpdateLandObject(LandData.LocalID, newData);
-            m_scene.EventManager.TriggerParcelPrimCountUpdate();
+//            m_scene.EventManager.TriggerParcelPrimCountUpdate();
             SendLandUpdateToAvatarsOverMe(true);
 
             if (sellObjects) SellLandObjects(previousOwner);
@@ -568,6 +615,7 @@ namespace OpenSim.Region.CoreModules.World.Land
 
         public void SendLandUpdateToAvatarsOverMe(bool snap_selection)
         {
+            m_scene.EventManager.TriggerParcelPrimCountUpdate();
             m_scene.ForEachRootScenePresence(delegate(ScenePresence avatar)
             {
                 ILandObject over = null;
@@ -594,6 +642,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                             avatar.Invulnerable = true;
 
                         SendLandUpdateToClient(snap_selection, avatar.ControllingClient);
+                        avatar.currentParcelUUID = LandData.GlobalID;
                     }
                 }
             });
@@ -722,10 +771,11 @@ namespace OpenSim.Region.CoreModules.World.Land
         /// </summary>
         private void UpdateAABBAndAreaValues()
         {
-            int min_x = 10000;
-            int min_y = 10000;
-            int max_x = 0;
-            int max_y = 0;
+
+            int min_x = Int32.MaxValue;
+            int min_y = Int32.MaxValue;
+            int max_x = Int32.MinValue;
+            int max_y = Int32.MinValue;
             int tempArea = 0;
             int x, y;
             for (x = 0; x < LandBitmap.GetLength(0); x++)
@@ -734,10 +784,14 @@ namespace OpenSim.Region.CoreModules.World.Land
                 {
                     if (LandBitmap[x, y] == true)
                     {
-                        if (min_x > x) min_x = x;
-                        if (min_y > y) min_y = y;
-                        if (max_x < x) max_x = x;
-                        if (max_y < y) max_y = y;
+                        if (min_x > x)
+                            min_x = x;
+                        if (min_y > y)
+                            min_y = y;
+                        if (max_x < x)
+                            max_x = x;
+                        if (max_y < y)
+                            max_y = y;
                         tempArea += landUnit * landUnit; //16sqm peice of land
                     }
                 }
@@ -745,24 +799,42 @@ namespace OpenSim.Region.CoreModules.World.Land
             int tx = min_x * landUnit;
             if (tx > ((int)m_scene.RegionInfo.RegionSizeX - 1))
                 tx = ((int)m_scene.RegionInfo.RegionSizeX - 1);
+            int htx;
+            if (tx >= ((int)m_scene.RegionInfo.RegionSizeX))
+                htx = (int)m_scene.RegionInfo.RegionSizeX - 1;
+            else
+                htx = tx;
+            
             int ty = min_y * landUnit;
-            if (ty > ((int)m_scene.RegionInfo.RegionSizeY - 1))
-                ty = ((int)m_scene.RegionInfo.RegionSizeY - 1);
+            int hty;
+
+            if (ty >= ((int)m_scene.RegionInfo.RegionSizeY))
+                hty = (int)m_scene.RegionInfo.RegionSizeY - 1;
+            else
+                hty = ty;
 
             LandData.AABBMin =
                 new Vector3(
-                    (float)(min_x * landUnit), (float)(min_y * landUnit), m_scene != null ? (float)m_scene.Heightmap[tx, ty] : 0);
+                    (float)(tx), (float)(ty), m_scene != null ? (float)m_scene.Heightmap[htx, hty] : 0);
 
+            max_x++;
             tx = max_x * landUnit;
-            if (tx > ((int)m_scene.RegionInfo.RegionSizeX - 1))
-                tx = ((int)m_scene.RegionInfo.RegionSizeX - 1);
-            ty = max_y * landUnit;
-            if (ty > ((int)m_scene.RegionInfo.RegionSizeY - 1))
-                ty = ((int)m_scene.RegionInfo.RegionSizeY - 1);
+            if (tx >= ((int)m_scene.RegionInfo.RegionSizeX))
+                htx = (int)m_scene.RegionInfo.RegionSizeX - 1;
+            else
+                htx = tx;
+
+            max_y++;
+            ty = max_y * 4;
+           
+            if (ty >= ((int)m_scene.RegionInfo.RegionSizeY))
+                hty = (int)m_scene.RegionInfo.RegionSizeY - 1;
+            else
+                hty = ty;
 
             LandData.AABBMax 
                 = new Vector3(
-                    (float)(max_x * landUnit), (float)(max_y * landUnit), m_scene != null ? (float)m_scene.Heightmap[tx, ty] : 0);
+                    (float)(tx), (float)(ty), m_scene != null ? (float)m_scene.Heightmap[htx, hty] : 0);
 
             LandData.Area = tempArea;
         }
@@ -778,7 +850,6 @@ namespace OpenSim.Region.CoreModules.World.Land
         public void SetLandBitmap(bool[,] bitmap)
         {
             LandBitmap = bitmap;
-            // m_log.DebugFormat("{0} SetLandBitmap. BitmapSize=<{1},{2}>", LogHeader, LandBitmap.GetLength(0), LandBitmap.GetLength(1));
             ForceUpdateLandInfo();
         }
 
@@ -879,13 +950,32 @@ namespace OpenSim.Region.CoreModules.World.Land
         private byte[] ConvertLandBitmapToBytes()
         {
             byte[] tempConvertArr = new byte[LandBitmap.GetLength(0) * LandBitmap.GetLength(1) / 8];
-            byte tempByte = 0;
-            int byteNum = 0;
-            int i = 0;
+
+            int tempByte = 0;
+            int i, byteNum = 0;
+            int mask = 1;
+            i = 0;
             for (int y = 0; y < LandBitmap.GetLength(1); y++)
             {
                 for (int x = 0; x < LandBitmap.GetLength(0); x++)
                 {
+                    if (LandBitmap[x, y])
+                        tempByte |= mask;
+                    mask = mask << 1;
+                    if (mask == 0x100)
+                    {
+                        mask = 1;
+                        tempConvertArr[byteNum++] = (byte)tempByte;
+                        tempByte = 0;
+                    }
+                }
+            }
+
+            if(tempByte != 0 && byteNum < 512)
+                tempConvertArr[byteNum] = (byte)tempByte;
+
+
+/*
                     tempByte = Convert.ToByte(tempByte | Convert.ToByte(LandBitmap[x, y]) << (i++ % 8));
                     if (i % 8 == 0)
                     {
@@ -894,10 +984,13 @@ namespace OpenSim.Region.CoreModules.World.Land
                         i = 0;
                         byteNum++;
                     }
+<<<<<<< HEAD
                 }
             }
             // m_log.DebugFormat("{0} ConvertLandBitmapToBytes. BitmapSize=<{1},{2}>",
             //                         LogHeader, LandBitmap.GetLength(0), LandBitmap.GetLength(1));
+=======
+ */
             return tempConvertArr;
         }
 
@@ -951,7 +1044,7 @@ namespace OpenSim.Region.CoreModules.World.Land
 
         public void SendForceObjectSelect(int local_id, int request_type, List<UUID> returnIDs, IClientAPI remote_client)
         {
-            if (m_scene.Permissions.CanEditParcelProperties(remote_client.AgentId, this, GroupPowers.LandOptions))
+            if (m_scene.Permissions.CanEditParcelProperties(remote_client.AgentId, this, GroupPowers.LandOptions, true))
             {
                 List<uint> resultLocalIDs = new List<uint>();
                 try
@@ -1001,7 +1094,7 @@ namespace OpenSim.Region.CoreModules.World.Land
         /// </param>
         public void SendLandObjectOwners(IClientAPI remote_client)
         {
-            if (m_scene.Permissions.CanEditParcelProperties(remote_client.AgentId, this, GroupPowers.LandOptions))
+            if (m_scene.Permissions.CanEditParcelProperties(remote_client.AgentId, this, GroupPowers.LandOptions, true))
             {
                 Dictionary<UUID, int> primCount = new Dictionary<UUID, int>();
                 List<UUID> groups = new List<UUID>();
@@ -1233,6 +1326,7 @@ namespace OpenSim.Region.CoreModules.World.Land
         public void SetMediaUrl(string url)
         {
             LandData.MediaURL = url;
+            m_scene.LandChannel.UpdateLandObject(LandData.LocalID, LandData);
             SendLandUpdateToAvatarsOverMe();
         }
         
@@ -1243,6 +1337,7 @@ namespace OpenSim.Region.CoreModules.World.Land
         public void SetMusicUrl(string url)
         {
             LandData.MusicURL = url;
+            m_scene.LandChannel.UpdateLandObject(LandData.LocalID, LandData);
             SendLandUpdateToAvatarsOverMe();
         }
 
@@ -1257,6 +1352,17 @@ namespace OpenSim.Region.CoreModules.World.Land
 
         #endregion
 
+        private void OnFrame()
+        {
+            m_expiryCounter++;
+
+            if (m_expiryCounter >= 50)
+            {
+                ExpireAccessList();
+                m_expiryCounter = 0;
+            }
+        }
+
         private void ExpireAccessList()
         {
             List<LandAccessEntry> delete = new List<LandAccessEntry>();
@@ -1267,7 +1373,22 @@ namespace OpenSim.Region.CoreModules.World.Land
                     delete.Add(entry);
             }
             foreach (LandAccessEntry entry in delete)
+            {
                 LandData.ParcelAccessList.Remove(entry);
+                ScenePresence presence;
+                
+                if (m_scene.TryGetScenePresence(entry.AgentID, out presence) && (!presence.IsChildAgent))
+                {
+                    ILandObject land = m_scene.LandChannel.GetLandObject(presence.AbsolutePosition.X, presence.AbsolutePosition.Y);
+                    if (land.LandData.LocalID == LandData.LocalID)
+                    {
+                        Vector3 pos = m_scene.GetNearestAllowedPosition(presence, land);
+                        presence.TeleportWithMomentum(pos, null);
+                        presence.ControllingClient.SendAlertMessage("You have been ejected from this land");
+                    }
+                }
+                m_log.DebugFormat("[LAND]: Removing entry {0} because it has expired", entry.AgentID);
+            }
 
             if (delete.Count > 0)
                 m_scene.EventManager.TriggerLandObjectUpdated((uint)LandData.LocalID, this);
diff --git a/OpenSim/Region/CoreModules/World/Land/PrimCountModule.cs b/OpenSim/Region/CoreModules/World/Land/PrimCountModule.cs
index 9b51cc8..771fdd2 100644
--- a/OpenSim/Region/CoreModules/World/Land/PrimCountModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/PrimCountModule.cs
@@ -207,7 +207,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))
@@ -597,4 +597,4 @@ namespace OpenSim.Region.CoreModules.World.Land
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs b/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs
index 796a15f..5155804 100644
--- a/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs
+++ b/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs
@@ -112,7 +112,6 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
                     //}
                     //t = System.Environment.TickCount - t;
                     //m_log.InfoFormat("[MAPTILE] generation of 10 maptiles needed {0} ms", t);
-
                     if (drawPrimVolume)
                     {
                         DrawObjectVolume(m_scene, mapbmp);
diff --git a/OpenSim/Region/CoreModules/World/LegacyMap/TexturedMapTileRenderer.cs b/OpenSim/Region/CoreModules/World/LegacyMap/TexturedMapTileRenderer.cs
index 9f23141..0ec2053 100644
--- a/OpenSim/Region/CoreModules/World/LegacyMap/TexturedMapTileRenderer.cs
+++ b/OpenSim/Region/CoreModules/World/LegacyMap/TexturedMapTileRenderer.cs
@@ -288,7 +288,7 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
             if (mapbmp.Width != hm.Width || mapbmp.Height != hm.Height)
             {
                 m_log.ErrorFormat("{0} TerrainToBitmap. Passed bitmap wrong dimensions. passed=<{1},{2}>, size=<{3},{4}>",
-                    LogHeader, mapbmp.Width, mapbmp.Height, hm.Width, hm.Height);
+                    "[TEXTURED MAP TILE RENDERER]", mapbmp.Width, mapbmp.Height, hm.Width, hm.Height);
             }
 
             // These textures should be in the AssetCache anyway, as every client conneting to this
@@ -371,8 +371,8 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
                             // first, rescale h to 0.0 - 1.0
                             hmod = (hmod - low) / (high - low);
                             // now we have to split: 0.00 => color1, 0.33 => color2, 0.67 => color3, 1.00 => color4
-                            if (hmod < 1f/3f) hsv = interpolateHSV(ref hsv1, ref hsv2, hmod * 3f);
-                            else if (hmod < 2f/3f) hsv = interpolateHSV(ref hsv2, ref hsv3, (hmod * 3f) - 1f);
+                            if (hmod < 1f / 3f) hsv = interpolateHSV(ref hsv1, ref hsv2, hmod * 3f);
+                            else if (hmod < 2f / 3f) hsv = interpolateHSV(ref hsv2, ref hsv3, (hmod * 3f) - 1f);
                             else hsv = interpolateHSV(ref hsv3, ref hsv4, (hmod * 3f) - 2f);
                         }
 
diff --git a/OpenSim/Region/CoreModules/World/LightShare/LightShareModule.cs b/OpenSim/Region/CoreModules/World/LightShare/LightShareModule.cs
index 0a4e83e..f13d648 100644
--- a/OpenSim/Region/CoreModules/World/LightShare/LightShareModule.cs
+++ b/OpenSim/Region/CoreModules/World/LightShare/LightShareModule.cs
@@ -190,6 +190,9 @@ namespace OpenSim.Region.CoreModules.World.LightShare
 
         public void SendProfileToClient(IClientAPI client, RegionLightShareData wl)
         {
+            if (client == null)
+                return;
+
             if (m_enableWindlight)
             {
                 if (m_scene.RegionInfo.WindlightSettings.valid)
@@ -207,8 +210,8 @@ namespace OpenSim.Region.CoreModules.World.LightShare
 
         private void EventManager_OnMakeRootAgent(ScenePresence presence)
         {
-//            m_log.Debug("[WINDLIGHT]: Sending windlight scene to new client {0}", presence.Name);
-
+            if (m_enableWindlight && m_scene.RegionInfo.WindlightSettings.valid)
+                m_log.Debug("[WINDLIGHT]: Sending windlight scene to new client");
             SendProfileToClient(presence.ControllingClient);
         }
 
diff --git a/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs b/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs
index 2abc910..0e0f05f 100644
--- a/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs
+++ b/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs
@@ -173,6 +173,13 @@ namespace OpenSim.Region.CoreModules.World.Objects.BuySell
                     return false;
                 }
 
+                if ((perms & (uint)PermissionMask.Copy) == 0)
+                {
+                    if (m_dialogModule != null)
+                        m_dialogModule.SendAlertToUser(remoteClient, "This sale has been blocked by the permissions system");
+                    return false;
+                }
+
                 AssetBase asset = m_scene.CreateAsset(
                     group.GetPartName(localID),
                     group.GetPartDescription(localID),
diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
index 780ec69..12e8fb1 100644
--- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
+++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
@@ -43,8 +43,8 @@ using PermissionMask = OpenSim.Framework.PermissionMask;
 
 namespace OpenSim.Region.CoreModules.World.Permissions
 {
-    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "PermissionsModule")]
-    public class PermissionsModule : INonSharedRegionModule, IPermissionsModule
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "DefaultPermissionsModule")]
+    public class DefaultPermissionsModule : INonSharedRegionModule, IPermissionsModule
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
                 
@@ -349,7 +349,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
 
         public string Name
         {
-            get { return "PermissionsModule"; }
+            get { return "DefaultPermissionsModule"; }
         }
 
         public Type ReplaceableInterface
@@ -1052,7 +1052,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
             return GenericObjectPermission(editorID, objectID, false);
         }
 
-        private bool CanEditParcelProperties(UUID user, ILandObject parcel, GroupPowers p, Scene scene)
+        private bool CanEditParcelProperties(UUID user, ILandObject parcel, GroupPowers p, Scene scene, bool allowManager)
         {
             DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
             if (m_bypassPermissions) return m_bypassPermissionsValue;
diff --git a/OpenSim/Region/CoreModules/World/Region/RegionCommandsModule.cs b/OpenSim/Region/CoreModules/World/Region/RegionCommandsModule.cs
index 710c8da..8d192ba 100644
--- a/OpenSim/Region/CoreModules/World/Region/RegionCommandsModule.cs
+++ b/OpenSim/Region/CoreModules/World/Region/RegionCommandsModule.cs
@@ -271,8 +271,8 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
             float totalFrameTime          = stats[8];
 //            float netFrameTime            = stats.StatsBlock[9].StatValue; // Ignored - not used by OpenSimulator
             float physicsFrameTime        = stats[10];
-            float otherFrameTime          = stats[11];
-//            float imageFrameTime          = stats.StatsBlock[12].StatValue; // Ignored
+            float otherFrameTime          = stats[12];
+//            float imageFrameTime          = stats.StatsBlock[11].StatValue; // Ignored
             float inPacketsPerSecond      = stats[13];
             float outPacketsPerSecond     = stats[14];
             float unackedBytes            = stats[15];
@@ -280,7 +280,7 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
             float pendingDownloads        = stats[17];
             float pendingUploads          = stats[18];
             float activeScripts           = stats[19];
-            float scriptLinesPerSecond    = stats[20];
+            float scriptLinesPerSecond    = stats[23];
 
             StringBuilder sb = new StringBuilder();
             sb.AppendFormat("Scene statistics for {0}\n", m_scene.RegionInfo.RegionName);
diff --git a/OpenSim/Region/CoreModules/World/Region/RestartModule.cs b/OpenSim/Region/CoreModules/World/Region/RestartModule.cs
index 75a8295..e6a0205 100644
--- a/OpenSim/Region/CoreModules/World/Region/RestartModule.cs
+++ b/OpenSim/Region/CoreModules/World/Region/RestartModule.cs
@@ -29,6 +29,8 @@ using System;
 using System.Linq;
 using System.Reflection;
 using System.Timers;
+using System.IO;
+using System.Diagnostics;
 using System.Threading;
 using System.Collections.Generic;
 using log4net;
@@ -57,13 +59,24 @@ 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;
+        private int[] m_CurrentAlerts = null;
 
         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);
@@ -118,10 +131,14 @@ namespace OpenSim.Region.CoreModules.World.Region
         public void ScheduleRestart(UUID initiator, string message, int[] alerts, bool notice)
         {
             if (m_CountdownTimer != null)
-                return;
+            {
+                m_CountdownTimer.Stop();
+                m_CountdownTimer = null;
+            }
 
             if (alerts == null)
             {
+                CreateMarkerFile();
                 m_Scene.RestartNow();
                 return;
             }
@@ -129,25 +146,28 @@ namespace OpenSim.Region.CoreModules.World.Region
             m_Message = message;
             m_Initiator = initiator;
             m_Notice = notice;
+            m_CurrentAlerts = alerts;
             m_Alerts = new List<int>(alerts);
             m_Alerts.Sort();
             m_Alerts.Reverse();
 
             if (m_Alerts[0] == 0)
             {
+                CreateMarkerFile();
                 m_Scene.RestartNow();
                 return;
             }
 
-            int nextInterval = DoOneNotice();
+            int nextInterval = DoOneNotice(true);
 
             SetTimer(nextInterval);
         }
 
-        public int DoOneNotice()
+        public int DoOneNotice(bool sendOut)
         {
             if (m_Alerts.Count == 0 || m_Alerts[0] == 0)
             {
+                CreateMarkerFile();
                 m_Scene.RestartNow();
                 return 0;
             }
@@ -168,34 +188,37 @@ namespace OpenSim.Region.CoreModules.World.Region
 
             m_Alerts.RemoveAt(0);
 
-            int minutes = currentAlert / 60;
-            string currentAlertString = String.Empty;
-            if (minutes > 0)
+            if (sendOut)
             {
-                if (minutes == 1)
-                    currentAlertString += "1 minute";
-                else
-                    currentAlertString += String.Format("{0} minutes", minutes);
+                int minutes = currentAlert / 60;
+                string currentAlertString = String.Empty;
+                if (minutes > 0)
+                {
+                    if (minutes == 1)
+                        currentAlertString += "1 minute";
+                    else
+                        currentAlertString += String.Format("{0} minutes", minutes);
+                    if ((currentAlert % 60) != 0)
+                        currentAlertString += " and ";
+                }
                 if ((currentAlert % 60) != 0)
-                    currentAlertString += " and ";
-            }
-            if ((currentAlert % 60) != 0)
-            {
-                int seconds = currentAlert % 60;
-                if (seconds == 1)
-                    currentAlertString += "1 second";
-                else
-                    currentAlertString += String.Format("{0} seconds", seconds);
-            }
+                {
+                    int seconds = currentAlert % 60;
+                    if (seconds == 1)
+                        currentAlertString += "1 second";
+                    else
+                        currentAlertString += String.Format("{0} seconds", seconds);
+                }
 
-            string msg = String.Format(m_Message, currentAlertString);
+                string msg = String.Format(m_Message, currentAlertString);
 
-            if (m_DialogModule != null && msg != String.Empty)
-            {
-                if (m_Notice)
-                    m_DialogModule.SendGeneralAlert(msg);
-                else
-                    m_DialogModule.SendNotificationToUsersInRegion(m_Initiator, "System", msg);
+                if (m_DialogModule != null && msg != String.Empty)
+                {
+                    if (m_Notice)
+                        m_DialogModule.SendGeneralAlert(msg);
+                    else
+                        m_DialogModule.SendNotificationToUsersInRegion(m_Initiator, "System", msg);
+                }
             }
 
             return currentAlert - nextAlert;
@@ -226,7 +249,27 @@ namespace OpenSim.Region.CoreModules.World.Region
 
         private void OnTimer(object source, ElapsedEventArgs e)
         {
-            SetTimer(DoOneNotice());
+            int nextInterval = DoOneNotice(true);
+
+            SetTimer(nextInterval);
+        }
+
+        public void DelayRestart(int seconds, string message)
+        {
+            if (m_CountdownTimer == null)
+                return;
+
+            m_CountdownTimer.Stop();
+            m_CountdownTimer = null;
+
+            m_Alerts = new List<int>(m_CurrentAlerts);
+            m_Alerts.Add(seconds);
+            m_Alerts.Sort();
+            m_Alerts.Reverse();
+
+            int nextInterval = DoOneNotice(false);
+
+            SetTimer(nextInterval);
         }
 
         public void AbortRestart(string message)
@@ -236,8 +279,12 @@ namespace OpenSim.Region.CoreModules.World.Region
                 m_CountdownTimer.Stop();
                 m_CountdownTimer = null;
                 if (m_DialogModule != null && message != String.Empty)
-                    m_DialogModule.SendGeneralAlert(message);
+                    m_DialogModule.SendNotificationToUsersInRegion(UUID.Zero, "System", message);
+                    //m_DialogModule.SendGeneralAlert(message);
             }
+            if (m_MarkerPath != String.Empty)
+                File.Delete(Path.Combine(m_MarkerPath,
+                        m_Scene.RegionInfo.RegionID.ToString()));
         }
         
         private void HandleRegionRestart(string module, string[] args)
@@ -282,5 +329,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)
+            {
+            }
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs b/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs
index d093224..9c99c19 100644
--- a/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs
+++ b/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs
@@ -48,6 +48,18 @@ namespace OpenSim.Region.CoreModules.World.Sound
 
         private Scene m_scene;
 
+        public enum SoundFlags: byte
+        {
+            NONE =         0,
+            LOOP =         1 << 0,
+            SYNC_MASTER =  1<<1,
+            SYNC_SLAVE =   1<<2,
+            SYNC_PENDING = 1<<3,
+            QUEUE =        1<<4,
+            STOP =         1<<5,
+            SYNC_MASK = SYNC_MASTER | SYNC_SLAVE | SYNC_PENDING
+        }
+
         public bool Enabled { get; private set; }
 
         public float MaxDistance { get; private set; }
@@ -124,26 +136,30 @@ namespace OpenSim.Region.CoreModules.World.Sound
             if (radius == 0)
                 radius = MaxDistance;
 
-            m_scene.ForEachRootScenePresence(delegate(ScenePresence sp)
+            if (part.SoundQueueing)
+                flags |= (byte)SoundFlags.QUEUE;
+
+            if (grp.IsAttachment)
             {
-                double dis = Util.GetDistanceTo(sp.AbsolutePosition, position);
-                if (dis > MaxDistance) // Max audio distance
+                ScenePresence ssp = null;
+                if (!m_scene.TryGetScenePresence(grp.AttachedAvatar, out ssp))
                     return;
 
-                if (grp.IsAttachment)
-                {
-                    if (grp.HasPrivateAttachmentPoint && sp.ControllingClient.AgentId != grp.OwnerID)
-                        return;
+                if (!ssp.ParcelAllowThisAvatarSounds)
+                    return;
 
-                    if (sp.ControllingClient.AgentId == grp.OwnerID)
-                        dis = 0;
+                if (grp.HasPrivateAttachmentPoint)
+                {
+                    ssp.ControllingClient.SendPlayAttachedSound(soundID, objectID,
+                        ownerID, (float)gain, flags);
+                    return;
                 }
+            }
 
-                // Scale by distance
-                double thisSpGain = gain * ((radius - dis) / radius);
-
+            m_scene.ForEachRootScenePresence(delegate(ScenePresence sp)
+            {
                 sp.ControllingClient.SendPlayAttachedSound(soundID, objectID,
-                        ownerID, (float)thisSpGain, flags);
+                        ownerID, (float)gain, flags);
             });
         }
 
@@ -151,20 +167,33 @@ namespace OpenSim.Region.CoreModules.World.Sound
             UUID soundId, UUID ownerID, UUID objectID, UUID parentID, double gain, Vector3 position, UInt64 handle, float radius)
         {
             SceneObjectPart part;
+            ScenePresence ssp = null;
             if (!m_scene.TryGetSceneObjectPart(objectID, out part))
             {
-                ScenePresence sp;
-                if (!m_scene.TryGetScenePresence(ownerID, out sp))
+                if (!m_scene.TryGetScenePresence(ownerID, out ssp))
+                    return;
+                if (!ssp.ParcelAllowThisAvatarSounds)
                     return;
             }
             else
             {
                 SceneObjectGroup grp = part.ParentGroup;
 
-                if (grp.IsAttachment && grp.AttachmentPoint > 30)
+                if (grp.IsAttachment)
                 {
-                    objectID = ownerID;
-                    parentID = ownerID;
+                    if (!m_scene.TryGetScenePresence(grp.AttachedAvatar, out ssp))
+                        return;
+
+                    if (!ssp.ParcelAllowThisAvatarSounds)
+                        return;
+
+                    if (grp.HasPrivateAttachmentPoint)
+                    {
+                        ssp.ControllingClient.SendTriggeredSound(soundId, ownerID,
+                                objectID, parentID, handle, position,
+                                (float)gain);
+                        return;
+                    }
                 }
             }
 
@@ -174,16 +203,12 @@ namespace OpenSim.Region.CoreModules.World.Sound
             m_scene.ForEachRootScenePresence(delegate(ScenePresence sp)
             {
                 double dis = Util.GetDistanceTo(sp.AbsolutePosition, position);
-
-                if (dis > MaxDistance) // Max audio distance
+                if (dis > radius) // Max audio distance
                     return;
 
-                // Scale by distance
-                double thisSpGain = gain * ((radius - dis) / radius);
-
                 sp.ControllingClient.SendTriggeredSound(soundId, ownerID,
                         objectID, parentID, handle, position,
-                        (float)thisSpGain);
+                        (float)gain);
             });
         }
 
@@ -198,40 +223,13 @@ namespace OpenSim.Region.CoreModules.World.Sound
 
         private static void StopSound(SceneObjectPart m_host)
         {
-            m_host.AdjustSoundGain(0);
-            // Xantor 20080528: Clear prim data of sound instead
-            if (m_host.ParentGroup.LoopSoundSlavePrims.Contains(m_host))
-            {
-                if (m_host.ParentGroup.LoopSoundMasterPrim == m_host)
-                {
-                    foreach (SceneObjectPart part in m_host.ParentGroup.LoopSoundSlavePrims)
-                    {
-                        part.Sound = UUID.Zero;
-                        part.SoundFlags = 1 << 5;
-                        part.SoundRadius = 0;
-                        part.ScheduleFullUpdate();
-                        part.SendFullUpdateToAllClients();
-                    }
-                    m_host.ParentGroup.LoopSoundMasterPrim = null;
-                    m_host.ParentGroup.LoopSoundSlavePrims.Clear();
-                }
-                else
-                {
-                    m_host.Sound = UUID.Zero;
-                    m_host.SoundFlags = 1 << 5;
-                    m_host.SoundRadius = 0;
-                    m_host.ScheduleFullUpdate();
-                    m_host.SendFullUpdateToAllClients();
-                }
-            }
-            else
-            {
-                m_host.Sound = UUID.Zero;
-                m_host.SoundFlags = 1 << 5;
-                m_host.SoundRadius = 0;
-                m_host.ScheduleFullUpdate();
-                m_host.SendFullUpdateToAllClients();
-            }
+//            m_host.AdjustSoundGain(0);
+            m_host.Sound = UUID.Zero;
+            m_host.SoundFlags = (byte)SoundFlags.STOP;
+            m_host.SoundRadius = 0;
+            m_host.SoundGain = 0;
+            m_host.ScheduleFullUpdate();
+            m_host.SendFullUpdateToAllClients();
         }
 
         public virtual void PreloadSound(UUID objectID, UUID soundID, float radius)
@@ -248,7 +246,7 @@ namespace OpenSim.Region.CoreModules.World.Sound
 
             m_scene.ForEachRootScenePresence(delegate(ScenePresence sp)
             {
-                if (!(Util.GetDistanceTo(sp.AbsolutePosition, part.AbsolutePosition) >= MaxDistance))
+                if (Util.GetDistanceTo(sp.AbsolutePosition, part.AbsolutePosition) < radius)
                     sp.ControllingClient.SendPreLoadSound(objectID, objectID, soundID);
             });
         }
@@ -262,21 +260,24 @@ namespace OpenSim.Region.CoreModules.World.Sound
         // 20080530 Updated to remove code duplication
         // 20080530 Stop sound if there is one, otherwise volume only changes don't work
         public void LoopSound(UUID objectID, UUID soundID,
-                double volume, double radius, bool isMaster)
+                double volume, double radius, bool isMaster, bool isSlave)
         {
             SceneObjectPart m_host;
             if (!m_scene.TryGetSceneObjectPart(objectID, out m_host))
                 return;
 
+            byte iflags = 1; // looping
             if (isMaster)
-                m_host.ParentGroup.LoopSoundMasterPrim = m_host;
-
-            if (m_host.Sound != UUID.Zero)
-                StopSound(m_host);
+                iflags |= (byte)SoundFlags.SYNC_MASTER;
+            // TODO check viewer seems to accept both
+            if (isSlave)
+                iflags |= (byte)SoundFlags.SYNC_SLAVE;
+            if (m_host.SoundQueueing)
+                iflags |= (byte)SoundFlags.QUEUE;
 
             m_host.Sound = soundID;
             m_host.SoundGain = volume;
-            m_host.SoundFlags = 1;      // looping
+            m_host.SoundFlags = iflags;      
             m_host.SoundRadius = radius;
 
             m_host.ScheduleFullUpdate();
@@ -301,42 +302,19 @@ namespace OpenSim.Region.CoreModules.World.Sound
             Vector3 position = part.AbsolutePosition; // region local
             ulong regionHandle = m_scene.RegionInfo.RegionHandle;
 
-            if (useMaster)
-            {
-                if (isMaster)
-                {
-                    if (triggered)
-                        TriggerSound(soundID, part.OwnerID, part.UUID, parentID, volume, position, regionHandle, radius);
-                    else
-                        PlayAttachedSound(soundID, part.OwnerID, part.UUID, volume, position, flags, radius);
-                    part.ParentGroup.PlaySoundMasterPrim = part;
-                    if (triggered)
-                        TriggerSound(soundID, part.OwnerID, part.UUID, parentID, volume, position, regionHandle, radius);
-                    else
-                        PlayAttachedSound(soundID, part.OwnerID, part.UUID, volume, position, flags, radius);
-                    foreach (SceneObjectPart prim in part.ParentGroup.PlaySoundSlavePrims)
-                    {
-                        position = prim.AbsolutePosition; // region local
-                        if (triggered)
-                            TriggerSound(soundID, part.OwnerID, prim.UUID, parentID, volume, position, regionHandle, radius);
-                        else
-                            PlayAttachedSound(soundID, part.OwnerID, prim.UUID, volume, position, flags, radius);
-                    }
-                    part.ParentGroup.PlaySoundSlavePrims.Clear();
-                    part.ParentGroup.PlaySoundMasterPrim = null;
-                }
-                else
-                {
-                    part.ParentGroup.PlaySoundSlavePrims.Add(part);
-                }
-            }
+            if(triggered)
+                TriggerSound(soundID, part.OwnerID, part.UUID, parentID, volume, position, regionHandle, radius);
             else
             {
-                if (triggered)
-                    TriggerSound(soundID, part.OwnerID, part.UUID, parentID, volume, position, regionHandle, radius);
-                else
-                    PlayAttachedSound(soundID, part.OwnerID, part.UUID, volume, position, flags, radius);
-            }
+                byte bflags = 0;
+                
+                if (isMaster)
+                    bflags |= (byte)SoundFlags.SYNC_MASTER;
+                // TODO check viewer seems to accept both
+                if (useMaster)
+                    bflags |= (byte)SoundFlags.SYNC_SLAVE;
+                PlayAttachedSound(soundID, part.OwnerID, part.UUID, volume, position, bflags, radius);
+            } 
         }
 
         public void TriggerSoundLimited(UUID objectID, UUID sound,
diff --git a/OpenSim/Region/CoreModules/World/Terrain/Effects/ChannelDigger.cs b/OpenSim/Region/CoreModules/World/Terrain/Effects/ChannelDigger.cs
index 36917e9..b456aa1 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/Effects/ChannelDigger.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/Effects/ChannelDigger.cs
@@ -64,7 +64,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain.Effects
 
             for (int i = 0; i < rounds; i++)
             {
-                smoothFunction.FloodEffect(map, bitmap, 1.0);
+                smoothFunction.FloodEffect(map, bitmap, 1.0, 0, map.Width - 1, 0, map.Height - 1);
             }
         }
 
@@ -99,7 +99,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain.Effects
                         }
                     }
 
-                    raiseFunction.FloodEffect(map, bitmap, height);
+                    raiseFunction.FloodEffect(map, bitmap, height, 0, map.Width - 1, 0, map.Height - 1);
                 }
             }
         }
diff --git a/OpenSim/Region/CoreModules/World/Terrain/Effects/CookieCutter.cs b/OpenSim/Region/CoreModules/World/Terrain/Effects/CookieCutter.cs
index dc76ad5..3222524 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/Effects/CookieCutter.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/Effects/CookieCutter.cs
@@ -84,7 +84,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain.Effects
                 for (y = 0; y < map.Height; y++)
                 {
                     if (cliffMask[x, y])
-                        eroder.PaintEffect(map, allowMask, x, y, -1, 4, 0.1);
+                        eroder.PaintEffect(map, allowMask, x, y, -1, 4, 0.1,0,map.Width - 1,0,map.Height - 1);
                 }
             }
 
diff --git a/OpenSim/Region/CoreModules/World/Terrain/Effects/DefaultTerrainGenerator.cs b/OpenSim/Region/CoreModules/World/Terrain/Effects/DefaultTerrainGenerator.cs
index 89087b1..80396c4 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/Effects/DefaultTerrainGenerator.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/Effects/DefaultTerrainGenerator.cs
@@ -53,4 +53,4 @@ namespace OpenSim.Region.CoreModules.World.Terrain.Effects
 
         #endregion
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/FlattenArea.cs b/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/FlattenArea.cs
index 774e7b2..0c4171e 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/FlattenArea.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/FlattenArea.cs
@@ -33,15 +33,16 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FloodBrushes
     {
         #region ITerrainFloodEffect Members
 
-        public void FloodEffect(ITerrainChannel map, bool[,] fillArea, double strength)
+        public void FloodEffect(ITerrainChannel map, bool[,] fillArea, double strength,
+            int startX, int endX, int startY, int endY)
         {
             double sum = 0.0;
             double steps = 0.0;
 
             int x, y;
-            for (x = 0; x < map.Width; x++)
+            for (x = startX; x <= endX; x++)
             {
-                for (y = 0; y < map.Height; y++)
+                for (y = startY; y <= endY; y++)
                 {
                     if (fillArea[x, y])
                     {
@@ -55,9 +56,9 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FloodBrushes
 
             double str = 0.1 * strength; // == 0.2 in the default client
 
-            for (x = 0; x < map.Width; x++)
+            for (x = startX; x <= endX; x++)
             {
-                for (y = 0; y < map.Height; y++)
+                for (y = startY; y <= endY; y++)
                 {
                     if (fillArea[x, y])
                         map[x, y] = (map[x, y] * (1.0 - str)) + (avg * str);
diff --git a/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/LowerArea.cs b/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/LowerArea.cs
index 3e87390..a275a86 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/LowerArea.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/LowerArea.cs
@@ -33,13 +33,13 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FloodBrushes
     {
         #region ITerrainFloodEffect Members
 
-        public void FloodEffect(ITerrainChannel map, bool[,] fillArea, double strength)
+        public void FloodEffect(ITerrainChannel map, bool[,] fillArea, double strength,
+            int startX, int endX, int startY, int endY)
         {
-            int x;
-            for (x = 0; x < map.Width; x++)
+            int x,y;
+            for (x = startX; x <= endX; x++)
             {
-                int y;
-                for (y = 0; y < map.Height; y++)
+                for (y = startY; y <= endY; y++)
                 {
                     if (fillArea[x, y])
                     {
diff --git a/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/NoiseArea.cs b/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/NoiseArea.cs
index b6c635c..d634e8b 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/NoiseArea.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/NoiseArea.cs
@@ -35,18 +35,17 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FloodBrushes
     {
         #region ITerrainFloodEffect Members
 
-        public void FloodEffect(ITerrainChannel map, bool[,] fillArea, double strength)
+        public void FloodEffect(ITerrainChannel map, bool[,] fillArea, double strength,
+            int startX, int endX, int startY, int endY)
         {
-            int x;
-            for (x = 0; x < map.Width; x++)
+            int x, y;
+            for (x = startX; x <= endX; x++)
             {
-                int y;
-                for (y = 0; y < map.Height; y++)
+                for (y = startY; y <= endY; y++)
                 {
                     if (fillArea[x, y])
                     {
                         double noise = TerrainUtil.PerlinNoise2D((double) x / map.Width, (double) y / map.Height, 8, 1.0);
-
                         map[x, y] += noise * strength;
                     }
                 }
@@ -55,4 +54,4 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FloodBrushes
 
         #endregion
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/RaiseArea.cs b/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/RaiseArea.cs
index 3bdc5e7..6ccd5df 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/RaiseArea.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/RaiseArea.cs
@@ -33,13 +33,13 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FloodBrushes
     {
         #region ITerrainFloodEffect Members
 
-        public void FloodEffect(ITerrainChannel map, bool[,] fillArea, double strength)
+        public void FloodEffect(ITerrainChannel map, bool[,] fillArea, double strength,
+            int startX, int endX, int startY, int endY)
         {
-            int x;
-            for (x = 0; x < map.Width; x++)
+            int x,y;
+            for (x = startX; x <= endX; x++)
             {
-                int y;
-                for (y = 0; y < map.Height; y++)
+                for (y = startY; y <= endY; y++)
                 {
                     if (fillArea[x, y])
                     {
diff --git a/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/RevertArea.cs b/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/RevertArea.cs
index c5527fa..4230133 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/RevertArea.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/RevertArea.cs
@@ -46,13 +46,13 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FloodBrushes
         /// <param name="map">the current heightmap</param>
         /// <param name="fillArea">array indicating which sections of the map are to be reverted</param>
         /// <param name="strength">unused</param>
-        public void FloodEffect(ITerrainChannel map, bool[,] fillArea, double strength)
+        public void FloodEffect(ITerrainChannel map, bool[,] fillArea, double strength,
+            int startX, int endX, int startY, int endY)
         {
-            int x;
-            for (x = 0; x < map.Width; x++)
+            int x, y;
+            for (x = startX; x <= endX; x++)
             {
-                int y;
-                for (y = 0; y < map.Height; y++)
+                for (y = startY; y <= endY; y++)
                 {
                     if (fillArea[x, y])
                     {
diff --git a/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/SmoothArea.cs b/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/SmoothArea.cs
index 6b07747..6c0d60d 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/SmoothArea.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/SmoothArea.cs
@@ -33,16 +33,17 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FloodBrushes
     {
         #region ITerrainFloodEffect Members
 
-        public void FloodEffect(ITerrainChannel map, bool[,] fillArea, double strength)
+        public void FloodEffect(ITerrainChannel map, bool[,] fillArea, double strength,
+            int startX, int endX, int startY, int endY)
         {
             double area = strength;
             double step = strength / 4.0;
 
             double[,] manipulate = new double[map.Width,map.Height];
             int x, y;
-            for (x = 0; x < map.Width; x++)
+            for (x = startX; x <= endX; x++)
             {
-                for (y = 0; y < map.Height; y++)
+                for (y = startY; y <= endY; y++)
                 {
                     if (!fillArea[x, y])
                         continue;
@@ -64,9 +65,9 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FloodBrushes
                     manipulate[x, y] = average / avgsteps;
                 }
             }
-            for (x = 0; x < map.Width; x++)
+            for (x = startX; x <= endX; x++)
             {
-                for (y = 0; y < map.Height; y++)
+                for (y = startY; y <= endY; y++)
                 {
                     if (!fillArea[x, y])
                         continue;
diff --git a/OpenSim/Region/CoreModules/World/Terrain/ITerrainFloodEffect.cs b/OpenSim/Region/CoreModules/World/Terrain/ITerrainFloodEffect.cs
index 3984a30..6324aca 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/ITerrainFloodEffect.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/ITerrainFloodEffect.cs
@@ -32,6 +32,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
 {
     public interface ITerrainFloodEffect
     {
-        void FloodEffect(ITerrainChannel map, Boolean[,] fillArea, double strength);
+        void FloodEffect(ITerrainChannel map, Boolean[,] fillArea, double strength, 
+            int startX, int endX, int startY, int endY);
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/CoreModules/World/Terrain/ITerrainPaintableEffect.cs b/OpenSim/Region/CoreModules/World/Terrain/ITerrainPaintableEffect.cs
index b73defd..d0b05e4 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/ITerrainPaintableEffect.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/ITerrainPaintableEffect.cs
@@ -31,6 +31,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
 {
     public interface ITerrainPaintableEffect
     {
-        void PaintEffect(ITerrainChannel map, bool[,] allowMask, double x, double y, double z, double strength, double duration);
+        void PaintEffect(ITerrainChannel map, bool[,] allowMask, double x, double y, double z,
+            double strength, double duration, int startX, int endX, int startY, int endY);
     }
 }
diff --git a/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/ErodeSphere.cs b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/ErodeSphere.cs
index 7a78cd8..7358ba3 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/ErodeSphere.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/ErodeSphere.cs
@@ -151,7 +151,8 @@ namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes
 
         #region ITerrainPaintableEffect Members
 
-        public void PaintEffect(ITerrainChannel map, bool[,] mask, double rx, double ry, double rz, double strength, double duration)
+        public void PaintEffect(ITerrainChannel map, bool[,] mask, double rx, double ry, double rz,
+            double strength, double duration, int startX, int endX, int startY, int endY)
         {
             strength = TerrainUtil.MetersToSphericalStrength(strength);
 
@@ -163,18 +164,23 @@ namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes
             ITerrainChannel sediment = new TerrainChannel(map.Width, map.Height);
 
             // Fill with rain
-            for (x = 0; x < water.Width; x++)
-                for (y = 0; y < water.Height; y++)
-                    water[x, y] = Math.Max(0.0, TerrainUtil.SphericalFactor(x, y, rx, ry, strength) * rainHeight * duration);
+            for (x = startX; x <= endX; x++)
+            {
+                for (y = startY; y <= endY; y++)
+                {
+                    if (mask[x, y])
+                        water[x, y] = Math.Max(0.0, TerrainUtil.SphericalFactor(x, y, rx, ry, strength) * rainHeight * duration);
+                }
+            }
 
             for (int i = 0; i < rounds; i++)
             {
                 // Erode underlying terrain
-                for (x = 0; x < water.Width; x++)
+                for (x = startX; x <= endX; x++)
                 {
-                    for (y = 0; y < water.Height; y++)
+                    for (y = startY; y <= endY; y++)
                     {
-                        if (mask[x,y])
+                        if (mask[x, y])
                         {
                             const double solConst = (1.0 / rounds);
                             double sedDelta = water[x, y] * solConst;
@@ -185,9 +191,9 @@ namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes
                 }
 
                 // Move water
-                for (x = 0; x < water.Width; x++)
+                for (x = startX; x <= endX; x++)
                 {
-                    for (y = 0; y < water.Height; y++)
+                    for (y = startY; y <= endY; y++)
                     {
                         if (water[x, y] <= 0)
                             continue;
@@ -296,7 +302,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes
                         double sedimentDeposit = sediment[x, y] - waterCapacity;
                         if (sedimentDeposit > 0)
                         {
-                            if (mask[x,y])
+                            if (mask[x, y])
                             {
                                 sediment[x, y] -= sedimentDeposit;
                                 map[x, y] += sedimentDeposit;
@@ -309,10 +315,9 @@ namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes
             // Deposit any remainder (should be minimal)
             for (x = 0; x < water.Width; x++)
                 for (y = 0; y < water.Height; y++)
-                    if (mask[x,y] && sediment[x, y] > 0)
+                    if (mask[x, y] && sediment[x, y] > 0)
                         map[x, y] += sediment[x, y];
         }
-
         #endregion
     }
 }
diff --git a/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/FlattenSphere.cs b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/FlattenSphere.cs
index 9aa3dff..8937f63 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/FlattenSphere.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/FlattenSphere.cs
@@ -35,16 +35,17 @@ namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes
     {
         #region ITerrainPaintableEffect Members
 
-        public void PaintEffect(ITerrainChannel map, bool[,] mask, double rx, double ry, double rz, double strength, double duration)
+        public void PaintEffect(ITerrainChannel map, bool[,] mask, double rx, double ry, double rz,
+            double strength, double duration, int startX, int endX, int startY, int endY)
         {
             strength = TerrainUtil.MetersToSphericalStrength(strength);
 
             int x, y;
 
             // blend in map
-            for (x = 0; x < map.Width; x++)
+            for (x = startX; x <= endX; x++)
             {
-                for (y = 0; y < map.Height; y++)
+                for (y = startY; y <= endY; y++)
                 {
                     if (!mask[x,y])
                         continue;
diff --git a/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/LowerSphere.cs b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/LowerSphere.cs
index 68145f2..bbf9407 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/LowerSphere.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/LowerSphere.cs
@@ -34,34 +34,18 @@ namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes
     {
         #region ITerrainPaintableEffect Members
 
-        public void PaintEffect(ITerrainChannel map, bool[,] mask, double rx, double ry, double rz, double strength, double duration)
+        public void PaintEffect(ITerrainChannel map, bool[,] mask, double rx, double ry, double rz,
+            double strength, double duration, int startX, int endX, int startY, int endY)
         {
             int s = (int) (Math.Pow(2, strength) + 0.5);
 
-            int x;
-            int xFrom = (int)(rx-s+0.5);
-            int xTo   = (int)(rx+s+0.5) + 1;
-            int yFrom = (int)(ry-s+0.5);
-            int yTo   = (int)(ry+s+0.5) + 1;
+            int x, y;
 
-            if (xFrom < 0)
-                xFrom = 0;
-
-            if (yFrom < 0)
-                yFrom = 0;
-
-            if (xTo > map.Width)
-                xTo = map.Width;
-
-            if (yTo > map.Width)
-                yTo = map.Width;
-
-            for (x = xFrom; x < xTo; x++)
+            for (x = startX; x <= endX; x++)
             {
-                int y;
-                for (y = yFrom; y < yTo; y++)
+                for (y = startY; y <= endY; y++)
                 {
-                    if (!mask[x,y])
+                    if (!mask[x, y])
                         continue;
 
                     // Calculate a cos-sphere and add it to the heighmap
diff --git a/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/NoiseSphere.cs b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/NoiseSphere.cs
index e7df3f8..46d47b4 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/NoiseSphere.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/NoiseSphere.cs
@@ -35,17 +35,18 @@ namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes
     {
         #region ITerrainPaintableEffect Members
 
-        public void PaintEffect(ITerrainChannel map, bool[,] mask, double rx, double ry, double rz, double strength, double duration)
+        public void PaintEffect(ITerrainChannel map, bool[,] mask, double rx, double ry, double rz,
+            double strength, double duration, int startX, int endX, int startY, int endY)
         {
             strength = TerrainUtil.MetersToSphericalStrength(strength);
 
-            int x;
-            for (x = 0; x < map.Width; x++)
+            int x, y;
+
+            for (x = startX; x <= endX; x++)
             {
-                int y;
-                for (y = 0; y < map.Height; y++)
+                for (y = startY; y <= endY; y++)
                 {
-                    if (!mask[x,y])
+                    if (!mask[x, y])
                         continue;
 
                     // Calculate a sphere and add it to the heighmap
diff --git a/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/OlsenSphere.cs b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/OlsenSphere.cs
index b199df3..281690d 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/OlsenSphere.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/OlsenSphere.cs
@@ -152,18 +152,18 @@ namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes
 
         #region ITerrainPaintableEffect Members
 
-        public void PaintEffect(ITerrainChannel map, bool[,] mask, double rx, double ry, double rz, double strength, double duration)
+        public void PaintEffect(ITerrainChannel map, bool[,] mask, double rx, double ry, double rz,
+            double strength, double duration, int startX, int endX, int startY, int endY)
         {
             strength = TerrainUtil.MetersToSphericalStrength(strength);
 
-            int x;
+            int x, y;
 
-            for (x = 0; x < map.Width; x++)
+            for (x = startX; x <= endX; x++)
             {
-                int y;
-                for (y = 0; y < map.Height; y++)
+                for (y = startY; y <= endY; y++)
                 {
-                    if (!mask[x,y])
+                    if (!mask[x, y])
                         continue;
 
                     double z = TerrainUtil.SphericalFactor(x, y, rx, ry, strength);
diff --git a/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/RaiseSphere.cs b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/RaiseSphere.cs
index bd9a8a0..1b704bb 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/RaiseSphere.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/RaiseSphere.cs
@@ -35,38 +35,22 @@ namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes
         #region ITerrainPaintableEffect Members
         
 
-        public void PaintEffect(ITerrainChannel map, bool[,] mask, double rx, double ry, double rz, double strength, double duration)
+        public void PaintEffect(ITerrainChannel map, bool[,] mask, double rx, double ry, double rz,
+            double strength, double duration, int startX, int endX, int startY, int endY)
         {
             int s = (int) (Math.Pow(2, strength) + 0.5);
 
-            int x;
-            int xFrom = (int)(rx-s+0.5);
-            int xTo   = (int)(rx+s+0.5) + 1;
-            int yFrom = (int)(ry-s+0.5);
-            int yTo   = (int)(ry+s+0.5) + 1;
+            int x,y;
 
-            if (xFrom < 0)
-                xFrom = 0;
-
-            if (yFrom < 0)
-                yFrom = 0;
-
-            if (xTo > map.Width)
-                xTo = map.Width;
-
-            if (yTo > map.Width)
-                yTo = map.Width;
-
-            for (x = xFrom; x < xTo; x++)
+            for (x = startX; x <= endX; x++)
             {
-                int y;
-                for (y = yFrom; y < yTo; y++)
+                for (y = startY; y <= endY; y++)
                 {
-                    if (!mask[x,y])
+                    if (!mask[x, y])
                         continue;
 
                     // Calculate a cos-sphere and add it to the heighmap
-                    double r = Math.Sqrt((x-rx) * (x-rx) + ((y-ry) * (y-ry)));
+                    double r = Math.Sqrt((x - rx) * (x - rx) + ((y - ry) * (y - ry)));
                     double z = Math.Cos(r * Math.PI / (s * 2));
                     if (z > 0.0)
                         map[x, y] += z * duration;
diff --git a/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/RevertSphere.cs b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/RevertSphere.cs
index 4b28275..efc5324 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/RevertSphere.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/RevertSphere.cs
@@ -41,7 +41,8 @@ namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes
 
         #region ITerrainPaintableEffect Members
 
-        public void PaintEffect(ITerrainChannel map, bool[,] mask, double rx, double ry, double rz, double strength, double duration)
+        public void PaintEffect(ITerrainChannel map, bool[,] mask, double rx, double ry, double rz,
+            double strength, double duration, int startX, int endX, int startY, int endY)
         {
             strength = TerrainUtil.MetersToSphericalStrength(strength);
             duration = 0.03; //MCP Should be read from ini file
@@ -51,13 +52,12 @@ namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes
             if (duration < 0)
                 return;
 
-            int x;
-            for (x = 0; x < map.Width; x++)
+            int x,y;
+            for (x = startX; x <= endX; x++)
             {
-                int y;
-                for (y = 0; y < map.Height; y++)
+                for (y = startY; y <= endY; y++)
                 {
-                    if (!mask[x,y])
+                    if (!mask[x, y])
                         continue;
 
                     // Calculate a sphere and add it to the heighmap
diff --git a/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/SmoothSphere.cs b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/SmoothSphere.cs
index 4834c86..65dd0a6 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/SmoothSphere.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/SmoothSphere.cs
@@ -34,7 +34,8 @@ namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes
     {
         #region ITerrainPaintableEffect Members
 
-        public void PaintEffect(ITerrainChannel map, bool[,] mask, double rx, double ry, double rz, double strength, double duration)
+        public void PaintEffect(ITerrainChannel map, bool[,] mask, double rx, double ry, double rz,
+            double strength, double duration, int startX, int endX, int startY, int endY)
         {
             strength = TerrainUtil.MetersToSphericalStrength(strength);
 
@@ -47,10 +48,13 @@ namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes
  
 
             // compute delta map
-            for (x = 0; x < map.Width; x++)
+            for (x = startX; x <= endX; x++)
             {
-                for (y = 0; y < map.Height; y++)
+                for (y = startY; y <= endY; y++)
                 {
+                    if (!mask[x, y])
+                        continue;
+
                     double z = TerrainUtil.SphericalFactor(x, y, rx, ry, strength);
 
                     if (z > 0) // add in non-zero amount
@@ -73,11 +77,11 @@ namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes
                 }
             }
             // blend in map
-            for (x = 0; x < map.Width; x++)
+            for (x = startX; x <= endX; x++)
             {
-                for (y = 0; y < map.Height; y++)
+                for (y = startY; y <= endY; y++)
                 {
-                    if (!mask[x,y])
+                    if (!mask[x, y])
                         continue;
 
                     double z = TerrainUtil.SphericalFactor(x, y, rx, ry, strength);
diff --git a/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/WeatherSphere.cs b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/WeatherSphere.cs
index f31c8b6..f52fe07 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/WeatherSphere.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/WeatherSphere.cs
@@ -148,16 +148,16 @@ namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes
 
         #region ITerrainPaintableEffect Members
 
-        public void PaintEffect(ITerrainChannel map, bool[,] mask, double rx, double ry, double rz, double strength, double duration)
+        public void PaintEffect(ITerrainChannel map, bool[,] mask, double rx, double ry, double rz,
+            double strength, double duration, int startX, int endX, int startY, int endY)
         {
             strength = TerrainUtil.MetersToSphericalStrength(strength);
 
-            int x;
+            int x,y;
 
-            for (x = 0; x < map.Width; x++)
+            for (x = startX; x <= endX; x++)
             {
-                int y;
-                for (y = 0; y < map.Height; y++)
+                for (y = startY; y <= endY; y++)
                 {
                     if (!mask[x,y])
                         continue;
diff --git a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
index 932652c..22723fc 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
@@ -86,14 +86,13 @@ namespace OpenSim.Region.CoreModules.World.Terrain
         private readonly Dictionary<string, ITerrainLoader> m_loaders = new Dictionary<string, ITerrainLoader>();
         private readonly Dictionary<StandardTerrainEffects, ITerrainPaintableEffect> m_painteffects =
             new Dictionary<StandardTerrainEffects, ITerrainPaintableEffect>();
+
         private Dictionary<string, ITerrainEffect> m_plugineffects;
-        private Dictionary<string, ITerrainModifier> m_modifyOperations =
-            new Dictionary<string, ITerrainModifier>();
         private ITerrainChannel m_channel;
-        private ITerrainChannel m_revert;
+        private ITerrainChannel m_baked;
         private Scene m_scene;
         private volatile bool m_tainted;
-        private readonly Stack<LandUndoState> m_undo = new Stack<LandUndoState>(5);
+
         private String m_InitialTerrain = "pinhead-island";
 
         // If true, send terrain patch updates to clients based on their view distance
@@ -107,13 +106,12 @@ namespace OpenSim.Region.CoreModules.World.Terrain
             private bool[,] updated;    // for each patch, whether it needs to be sent to this client
             private int updateCount;    // number of patches that need to be sent
             public ScenePresence Presence;   // a reference to the client to send to
-            public TerrainData Terrain; // reference to the underlying terrain
+
             public PatchUpdates(TerrainData terrData, ScenePresence pPresence)
             {
                 updated = new bool[terrData.SizeX / Constants.TerrainPatchSize, terrData.SizeY / Constants.TerrainPatchSize];
                 updateCount = 0;
                 Presence = pPresence;
-                Terrain = terrData;
                 // Initially, send all patches to the client
                 SetAll(true);
             }
@@ -146,12 +144,13 @@ namespace OpenSim.Region.CoreModules.World.Terrain
             public void SetAll(bool state)
             {
                 updateCount = 0;
-                for(int xx = 0; xx < updated.GetLength(0); xx++)
-                    for(int yy = 0; yy < updated.GetLength(1); yy++)
+                for (int xx = 0; xx < updated.GetLength(0); xx++)
+                    for (int yy = 0; yy < updated.GetLength(1); yy++)
                         updated[xx, yy] = state;
                 if (state)
                     updateCount = updated.GetLength(0) * updated.GetLength(1);
             }
+
             // Logically OR's the terrain data's patch taint map into this client's update map.
             public void SetAll(TerrainData terrData)
             {
@@ -164,9 +163,10 @@ namespace OpenSim.Region.CoreModules.World.Terrain
                                 terrData.SizeX / Constants.TerrainPatchSize, terrData.SizeY / Constants.TerrainPatchSize)
                     );
                 }
-                for(int xx = 0; xx < terrData.SizeX; xx += Constants.TerrainPatchSize)
+
+                for (int xx = 0; xx < terrData.SizeX; xx += Constants.TerrainPatchSize)
                 {
-                    for(int yy = 0; yy < terrData.SizeY; yy += Constants.TerrainPatchSize)
+                    for (int yy = 0; yy < terrData.SizeY; yy += Constants.TerrainPatchSize)
                     {
                         // Only set tainted. The patch bit may be set if the patch was to be sent later.
                         if (terrData.IsTaintedAt(xx, yy, false))
@@ -227,12 +227,13 @@ namespace OpenSim.Region.CoreModules.World.Terrain
                                                                      (int)m_scene.RegionInfo.RegionSizeY,
                                                                      (int)m_scene.RegionInfo.RegionSizeZ);
                     m_scene.Heightmap = m_channel;
-                    UpdateRevertMap();
+
+                    UpdateBakedMap();
                 }
                 else
                 {
                     m_channel = m_scene.Heightmap;
-                    UpdateRevertMap();
+                    UpdateBakedMap();
                 }
 
                 m_scene.RegisterModuleInterface<ITerrainModule>(this);
@@ -240,7 +241,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
                 m_scene.EventManager.OnClientClosed += EventManager_OnClientClosed;
                 m_scene.EventManager.OnPluginConsole += EventManager_OnPluginConsole;
                 m_scene.EventManager.OnTerrainTick += EventManager_OnTerrainTick;
-                m_scene.EventManager.OnFrame += EventManager_OnFrame;
+                m_scene.EventManager.OnTerrainCheckUpdates += EventManager_TerrainCheckUpdates;
             }
 
             InstallDefaultEffects();
@@ -279,7 +280,8 @@ namespace OpenSim.Region.CoreModules.World.Terrain
                 // remove the commands
                 m_scene.UnregisterModuleCommander(m_commander.Name);
                 // remove the event-handlers
-                m_scene.EventManager.OnFrame -= EventManager_OnFrame;
+
+                m_scene.EventManager.OnTerrainCheckUpdates -= EventManager_TerrainCheckUpdates;
                 m_scene.EventManager.OnTerrainTick -= EventManager_OnTerrainTick;
                 m_scene.EventManager.OnPluginConsole -= EventManager_OnPluginConsole;
                 m_scene.EventManager.OnClientClosed -= EventManager_OnClientClosed;
@@ -334,7 +336,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
                             m_log.DebugFormat("[TERRAIN]: Loaded terrain, wd/ht: {0}/{1}", channel.Width, channel.Height);
                             m_scene.Heightmap = channel;
                             m_channel = channel;
-                            UpdateRevertMap();
+                            UpdateBakedMap();
                         }
                         catch(NotImplementedException)
                         {
@@ -426,7 +428,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
                         {
                             ITerrainChannel channel = loader.Value.LoadStream(stream);
                             m_channel.Merge(channel, displacement, radianRotation, rotationDisplacement);
-                            UpdateRevertMap();
+                            UpdateBakedMap();
                         }
                         catch(NotImplementedException)
                         {
@@ -506,12 +508,12 @@ namespace OpenSim.Region.CoreModules.World.Terrain
 
         // Someone diddled terrain outside the normal code paths. Set the taintedness for all clients.
         // ITerrainModule.TaintTerrain()
-        public void TaintTerrain()
+        public void TaintTerrain ()
         {
-            lock(m_perClientPatchUpdates)
+            lock (m_perClientPatchUpdates)
             {
                 // Set the flags for all clients so the tainted patches will be sent out
-                foreach(PatchUpdates pups in m_perClientPatchUpdates.Values)
+                foreach (PatchUpdates pups in m_perClientPatchUpdates.Values)
                 {
                     pups.SetAll(m_scene.Heightmap.GetTerrainData());
                 }
@@ -521,32 +523,23 @@ namespace OpenSim.Region.CoreModules.World.Terrain
         // ITerrainModule.PushTerrain()
         public void PushTerrain(IClientAPI pClient)
         {
-            // If view distance based, set the modified patch bits and the frame event will send the updates
-            if (m_sendTerrainUpdatesByViewDistance)
+            ScenePresence presence = m_scene.GetScenePresence(pClient.AgentId);
+            if (presence != null)
             {
-                ScenePresence presence = m_scene.GetScenePresence(pClient.AgentId);
-                if (presence != null)
+                lock (m_perClientPatchUpdates)
                 {
-                    lock(m_perClientPatchUpdates)
+                    PatchUpdates pups;
+                    if (!m_perClientPatchUpdates.TryGetValue(pClient.AgentId, out pups))
                     {
-                        PatchUpdates pups;
-                        if (!m_perClientPatchUpdates.TryGetValue(pClient.AgentId, out pups))
-                        {
-                            // There is a ScenePresence without a send patch map. Create one.
-                            pups = new PatchUpdates(m_scene.Heightmap.GetTerrainData(), presence);
-                            m_perClientPatchUpdates.Add(presence.UUID, pups);
-                        }
-                        // By setting all to modified, the next update tick will send the patches
-                        pups.SetAll(true);
+                        // There is a ScenePresence without a send patch map. Create one.
+                        pups = new PatchUpdates(m_scene.Heightmap.GetTerrainData(), presence);
+                        m_perClientPatchUpdates.Add(presence.UUID, pups);
                     }
+                    pups.SetAll(true);
                 }
             }
-            else
-            {
-                // The traditional way is to call into the protocol stack to send them all.
-                pClient.SendLayerData(new float[10]);
-            }
         }
+
         #region Plugin Loading Methods
 
         private void LoadPlugins()
@@ -636,7 +629,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
             m_painteffects[StandardTerrainEffects.Smooth] = new SmoothSphere();
             m_painteffects[StandardTerrainEffects.Noise] = new NoiseSphere();
             m_painteffects[StandardTerrainEffects.Flatten] = new FlattenSphere();
-            m_painteffects[StandardTerrainEffects.Revert] = new RevertSphere(m_revert);
+            m_painteffects[StandardTerrainEffects.Revert] = new RevertSphere(m_baked);
             m_painteffects[StandardTerrainEffects.Erode] = new ErodeSphere();
             m_painteffects[StandardTerrainEffects.Weather] = new WeatherSphere();
             m_painteffects[StandardTerrainEffects.Olsen] = new OlsenSphere();
@@ -647,9 +640,10 @@ namespace OpenSim.Region.CoreModules.World.Terrain
             m_floodeffects[StandardTerrainEffects.Smooth] = new SmoothArea();
             m_floodeffects[StandardTerrainEffects.Noise] = new NoiseArea();
             m_floodeffects[StandardTerrainEffects.Flatten] = new FlattenArea();
-            m_floodeffects[StandardTerrainEffects.Revert] = new RevertArea(m_revert);
+            m_floodeffects[StandardTerrainEffects.Revert] = new RevertArea(m_baked);
 
             // Terrain Modifier operations
+/*
             m_modifyOperations["min"] = new MinModifier(this);
             m_modifyOperations["max"] = new MaxModifier(this);
             m_modifyOperations["raise"] = new RaiseModifier(this);
@@ -657,7 +651,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
             m_modifyOperations["fill"] = new FillModifier(this);
             m_modifyOperations["smooth"] = new SmoothModifier(this);
             m_modifyOperations["noise"] = new NoiseModifier(this);
-
+*/
             // Filesystem load/save loaders
             m_loaders[".r32"] = new RAW32();
             m_loaders[".f32"] = m_loaders[".r32"];
@@ -673,22 +667,14 @@ namespace OpenSim.Region.CoreModules.World.Terrain
         }
 
         /// <summary>
-        /// Saves the current state of the region into the revert map buffer.
+        /// Saves the current state of the region into the baked map buffer.
+        
         /// </summary>
-        public void UpdateRevertMap()
+        public void UpdateBakedMap()
         {
-            /*
-            int x;
-            for (x = 0; x < m_channel.Width; x++)
-            {
-                int y;
-                for (y = 0; y < m_channel.Height; y++)
-                {
-                    m_revert[x, y] = m_channel[x, y];
-                }
-            }
-             */
-            m_revert = m_channel.MakeCopy();
+            m_baked = m_channel.MakeCopy();
+            m_painteffects[StandardTerrainEffects.Revert] = new RevertSphere(m_baked);
+            m_floodeffects[StandardTerrainEffects.Revert] = new RevertArea(m_baked);
         }
 
         /// <summary>
@@ -715,11 +701,11 @@ namespace OpenSim.Region.CoreModules.World.Terrain
                         {
                             ITerrainChannel channel = loader.Value.LoadFile(filename, offsetX, offsetY,
                                                                             fileWidth, fileHeight,
-                                                                            (int)m_scene.RegionInfo.RegionSizeX,
-                                                                            (int)m_scene.RegionInfo.RegionSizeY);
+                                                                            (int) m_scene.RegionInfo.RegionSizeX,
+                                                                            (int) m_scene.RegionInfo.RegionSizeY);
                             m_scene.Heightmap = channel;
                             m_channel = channel;
-                            UpdateRevertMap();
+                            UpdateBakedMap();
                         }
 
                         return;
@@ -782,22 +768,22 @@ namespace OpenSim.Region.CoreModules.World.Terrain
         }
 
         /// <summary>
-        /// Called before processing of every simulation frame.
         /// This is used to check to see of any of the terrain is tainted and, if so, schedule
         /// updates for all the presences.
         /// This also checks to see if there are updates that need to be sent for each presence.
         /// This is where the logic is to send terrain updates to clients.
         /// </summary>
-        private void EventManager_OnFrame()
+        private void EventManager_TerrainCheckUpdates()
         {
+            // this needs fixing
             TerrainData terrData = m_channel.GetTerrainData();
 
             bool shouldTaint = false;
-            for(int x = 0; x < terrData.SizeX; x += Constants.TerrainPatchSize)
+            for (int x = 0; x < terrData.SizeX; x += Constants.TerrainPatchSize)
             {
-                for(int y = 0; y < terrData.SizeY; y += Constants.TerrainPatchSize)
+                for (int y = 0; y < terrData.SizeY; y += Constants.TerrainPatchSize)
                 {
-                    if (terrData.IsTaintedAt(x, y))
+                    if (terrData.IsTaintedAt(x, y,true))
                     {
                         // Found a patch that was modified. Push this flag into the clients.
                         SendToClients(terrData, x, y);
@@ -883,11 +869,10 @@ namespace OpenSim.Region.CoreModules.World.Terrain
                 presence.ControllingClient.OnLandUndo -= client_OnLandUndo;
                 presence.ControllingClient.OnUnackedTerrain -= client_OnUnackedTerrain;
             }
-
-            lock(m_perClientPatchUpdates)
+            lock (m_perClientPatchUpdates)
                 m_perClientPatchUpdates.Remove(client);
         }
-
+        
         /// <summary>
         /// Scan over changes in the terrain and limit height changes. This enforces the
         ///     non-estate owner limits on rate of terrain editting.
@@ -898,12 +883,12 @@ namespace OpenSim.Region.CoreModules.World.Terrain
             TerrainData terrData = m_channel.GetTerrainData();
 
             bool wasLimited = false;
-            for(int x = 0; x < terrData.SizeX; x += Constants.TerrainPatchSize)
+            for (int x = 0; x < terrData.SizeX; x += Constants.TerrainPatchSize)
             {
-                for(int y = 0; y < terrData.SizeY; y += Constants.TerrainPatchSize)
+                for (int y = 0; y < terrData.SizeY; y += Constants.TerrainPatchSize)
                 {
                     if (terrData.IsTaintedAt(x, y, false /* clearOnTest */))
-                    {
+                   {
                         // If we should respect the estate settings then
                         //     fixup and height deltas that don't respect them.
                         // Note that LimitChannelChanges() modifies the TerrainChannel with the limited height values.
@@ -926,13 +911,13 @@ namespace OpenSim.Region.CoreModules.World.Terrain
             float maxDelta = (float)m_scene.RegionInfo.RegionSettings.TerrainRaiseLimit;
 
             // loop through the height map for this patch and compare it against
-            // the revert map
-            for(int x = xStart; x < xStart + Constants.TerrainPatchSize; x++)
+            // the baked map
+            for (int x = xStart; x < xStart + Constants.TerrainPatchSize; x++)
             {
                 for(int y = yStart; y < yStart + Constants.TerrainPatchSize; y++)
                 {
                     float requestedHeight = terrData[x, y];
-                    float bakedHeight = (float)m_revert[x, y];
+                    float bakedHeight = (float)m_baked[x, y];
                     float requestedDelta = requestedHeight - bakedHeight;
 
                     if (requestedDelta > maxDelta)
@@ -953,15 +938,6 @@ namespace OpenSim.Region.CoreModules.World.Terrain
 
         private void client_OnLandUndo(IClientAPI client)
         {
-            lock(m_undo)
-            {
-                if (m_undo.Count > 0)
-                {
-                    LandUndoState goback = m_undo.Pop();
-                    if (goback != null)
-                        goback.PlaybackState();
-                }
-            }
         }
 
         /// <summary>
@@ -972,12 +948,10 @@ namespace OpenSim.Region.CoreModules.World.Terrain
         /// <param name="y">The patch corner to send</param>
         private void SendToClients(TerrainData terrData, int x, int y)
         {
-            if (m_sendTerrainUpdatesByViewDistance)
+            // Add that this patch needs to be sent to the accounting for each client.
+            lock (m_perClientPatchUpdates)
             {
-                // Add that this patch needs to be sent to the accounting for each client.
-                lock(m_perClientPatchUpdates)
-                {
-                    m_scene.ForEachScenePresence(presence =>
+                m_scene.ForEachScenePresence(presence =>
                     {
                         PatchUpdates thisClientUpdates;
                         if (!m_perClientPatchUpdates.TryGetValue(presence.UUID, out thisClientUpdates))
@@ -988,22 +962,6 @@ namespace OpenSim.Region.CoreModules.World.Terrain
                         }
                         thisClientUpdates.SetByXY(x, y, true);
                     }
-                    );
-                }
-            }
-            else
-            {
-                // Legacy update sending where the update is sent out as soon as noticed
-                // We know the actual terrain data that is passed is ignored so this passes a dummy heightmap.
-                //float[] heightMap = terrData.GetFloatsSerialized();
-                float[] heightMap = new float[10];
-                m_scene.ForEachClient(
-                    delegate(IClientAPI controller)
-                    {
-                        controller.SendLayerData(x / Constants.TerrainPatchSize,
-                                                 y / Constants.TerrainPatchSize,
-                                                 heightMap);
-                    }
                 );
             }
         }
@@ -1013,14 +971,12 @@ namespace OpenSim.Region.CoreModules.World.Terrain
             public int PatchX;
             public int PatchY;
             public float Dist;
-
             public PatchesToSend(int pX, int pY, float pDist)
             {
                 PatchX = pX;
                 PatchY = pY;
                 Dist = pDist;
             }
-
             public int CompareTo(PatchesToSend other)
             {
                 return Dist.CompareTo(other.Dist);
@@ -1029,15 +985,17 @@ namespace OpenSim.Region.CoreModules.World.Terrain
 
         // Called each frame time to see if there are any patches to send to any of the
         //    ScenePresences.
-        // We know this is only called if we are doing view distance patch sending so some
-        //    tests are not made.
         // Loop through all the per-client info and send any patches necessary.
         private void CheckSendingPatchesToClients()
         {
-            lock(m_perClientPatchUpdates)
+            lock (m_perClientPatchUpdates)
             {
-                foreach(PatchUpdates pups in m_perClientPatchUpdates.Values)
+                foreach (PatchUpdates pups in m_perClientPatchUpdates.Values)
                 {
+                    // throught acording to land queue free to send bytes
+                    if (!pups.Presence.ControllingClient.CanSendLayerData())
+                        continue;
+
                     if (pups.HasUpdates())
                     {
                         // There is something that could be sent to this client.
@@ -1048,7 +1006,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
                             //                     LogHeader, toSend.Count, pups.Presence.Name, m_scene.RegionInfo.RegionName);
                             // Sort the patches to send by the distance from the presence
                             toSend.Sort();
-                            /* old way that sent individual patches
+                            /*
                             foreach (PatchesToSend pts in toSend)
                             {
                                 pups.Presence.ControllingClient.SendLayerData(pts.PatchX, pts.PatchY, null);
@@ -1056,12 +1014,11 @@ namespace OpenSim.Region.CoreModules.World.Terrain
                             }
                             */
 
-                            // new way that sends all patches to the protocol so they can be sent in one block
                             int[] xPieces = new int[toSend.Count];
                             int[] yPieces = new int[toSend.Count];
                             float[] patchPieces = new float[toSend.Count * 2];
                             int pieceIndex = 0;
-                            foreach(PatchesToSend pts in toSend)
+                            foreach (PatchesToSend pts in toSend)
                             {
                                 patchPieces[pieceIndex++] = pts.PatchX;
                                 patchPieces[pieceIndex++] = pts.PatchY;
@@ -1073,69 +1030,94 @@ namespace OpenSim.Region.CoreModules.World.Terrain
             }
         }
 
-        // Compute a list of modified patches that are within our view distance.
         private List<PatchesToSend> GetModifiedPatchesInViewDistance(PatchUpdates pups)
         {
             List<PatchesToSend> ret = new List<PatchesToSend>();
 
+            int npatchs = 0;
+
             ScenePresence presence = pups.Presence;
             if (presence == null)
                 return ret;
 
-            Vector3 presencePos = presence.AbsolutePosition;
+            float minz = presence.AbsolutePosition.Z;
+            if (presence.CameraPosition.Z < minz)
+                minz = presence.CameraPosition.Z;
+
+            // this limit should be max terrainheight + max draw
+            if (minz > 1500f)
+                return ret;
+
+            int DrawDistance = (int)presence.DrawDistance;
 
-            // Before this distance check, the whole region just showed up. Adding the distance
-            //   check causes different things to happen for the current and adjacent regions.
-            //   So, to keep legacy views, if the region is legacy sized, don't do distance check.
-            bool isLegacySizedRegion = pups.Terrain.SizeX == Constants.RegionSize && pups.Terrain.SizeY == Constants.RegionSize;
-            bool shouldCheckViewDistance = m_sendTerrainUpdatesByViewDistance && !isLegacySizedRegion;
+            DrawDistance = DrawDistance / Constants.TerrainPatchSize;
 
-            int startX = 0;
-            int endX = (int)m_scene.RegionInfo.RegionSizeX / Constants.TerrainPatchSize;
-            int startY = 0;
-            int endY = (int)m_scene.RegionInfo.RegionSizeY / Constants.TerrainPatchSize;
+            int testposX;
+            int testposY;
 
-            // The following only reduces the size of area scanned for updates. Only significant for very large varregions.
-            if (shouldCheckViewDistance)
+            if (Math.Abs(presence.AbsolutePosition.X - presence.CameraPosition.X) > 30
+                || Math.Abs(presence.AbsolutePosition.Y - presence.CameraPosition.Y) > 30)
             {
-                // Compute the area of patches within our draw distance
-                startX = (((int)(presencePos.X - presence.DrawDistance)) / Constants.TerrainPatchSize) - 2;
-                startX = Math.Max(startX, 0);
-                startX = Math.Min(startX, (int)m_scene.RegionInfo.RegionSizeX / Constants.TerrainPatchSize);
-                startY = (((int)(presencePos.Y - presence.DrawDistance)) / Constants.TerrainPatchSize) - 2;
-                startY = Math.Max(startY, 0);
-                startY = Math.Min(startY, (int)m_scene.RegionInfo.RegionSizeY / Constants.TerrainPatchSize);
-                endX = (((int)(presencePos.X + presence.DrawDistance)) / Constants.TerrainPatchSize) + 2;
-                endX = Math.Max(endX, 0);
-                endX = Math.Min(endX, (int)m_scene.RegionInfo.RegionSizeX / Constants.TerrainPatchSize);
-                endY = (((int)(presencePos.Y + presence.DrawDistance)) / Constants.TerrainPatchSize) + 2;
-                endY = Math.Max(endY, 0);
-                endY = Math.Min(endY, (int)m_scene.RegionInfo.RegionSizeY / Constants.TerrainPatchSize);
+                testposX = (int)presence.CameraPosition.X / Constants.TerrainPatchSize;
+                testposY = (int)presence.CameraPosition.Y / Constants.TerrainPatchSize;
             }
-
-            // m_log.DebugFormat("{0} GetModifiedPatchesInViewDistance. rName={1}, ddist={2}, apos={3}, cpos={4}, isChild={5}, start=<{6},{7}>, end=<{8},{9}>",
-            //                                     LogHeader, m_scene.RegionInfo.RegionName,
-            //                                     presence.DrawDistance, presencePos, presence.CameraPosition,
-            //                                     isLegacySizeChildRegion,
-            //                                     startX, startY, endX, endY);
-            for(int x = startX; x < endX; x++)
+            else
             {
-                for(int y = startY; y < endY; y++)
+                testposX = (int)presence.AbsolutePosition.X / Constants.TerrainPatchSize;
+                testposY = (int)presence.AbsolutePosition.Y / Constants.TerrainPatchSize;
+            }
+            int limitX = (int)m_scene.RegionInfo.RegionSizeX / Constants.TerrainPatchSize;
+            int limitY = (int)m_scene.RegionInfo.RegionSizeY / Constants.TerrainPatchSize;
+
+            // Compute the area of patches within our draw distance
+            int startX = testposX - DrawDistance;
+            if (startX < 0)
+                startX = 0;
+            else if (startX > limitX)
+                startX = limitX;
+
+            int startY = testposY - DrawDistance;
+            if (startY < 0)
+                startY = 0;
+            else if (startY > limitY)
+                startY = limitY;
+
+            int endX = testposX + DrawDistance;
+            if (endX < 0)
+                endX = 0;
+            else if (endX > limitX)
+                endX = limitX;
+
+            int endY = testposY + DrawDistance;
+            if (endY < 0)
+                endY = 0;
+            else if (endY > limitY)
+                endY = limitY;
+
+            int distx;
+            int disty;
+            int distsq;
+
+            DrawDistance *= DrawDistance;
+  
+            for (int x = startX; x < endX; x++)
+            {
+                for (int y = startY; y < endY; y++)
                 {
-                    //Need to make sure we don't send the same ones over and over
-                    Vector3 patchPos = new Vector3(x * Constants.TerrainPatchSize, y * Constants.TerrainPatchSize, presencePos.Z);
                     if (pups.GetByPatch(x, y))
                     {
-                        //Check which has less distance, camera or avatar position, both have to be done.
-                        //Its not a radius, its a diameter and we add 50 so that it doesn't look like it cuts off
-                        if (!shouldCheckViewDistance
-                            || Util.DistanceLessThan(presencePos, patchPos, presence.DrawDistance + 50)
-                            || Util.DistanceLessThan(presence.CameraPosition, patchPos, presence.DrawDistance + 50))
+                        distx = x - testposX;
+                        disty = y - testposY;
+                        distsq = distx * distx + disty * disty;
+                        if (distsq < DrawDistance)
                         {
-                            //They can see it, send it to them
                             pups.SetByPatch(x, y, false);
-                            float dist = Vector3.DistanceSquared(presencePos, patchPos);
-                            ret.Add(new PatchesToSend(x, y, dist));
+                            ret.Add(new PatchesToSend(x, y, (float)distsq));
+                            if (npatchs++ > 65536)
+                            {
+                                y = endY;
+                                x = endX;
+                            }
                         }
                     }
                 }
@@ -1161,31 +1143,42 @@ namespace OpenSim.Region.CoreModules.World.Terrain
                     int zx = (int)(west + 0.5);
                     int zy = (int)(north + 0.5);
 
-                    int dx;
-                    for(dx=-n; dx<=n; dx++)
+                    int startX = zx - n;
+                    if (startX < 0)
+                        startX = 0;
+
+                    int startY = zy - n;
+                    if (startY < 0)
+                        startY = 0;
+
+                    int endX = zx + n;
+                    if (endX >= m_channel.Width)
+                        endX = m_channel.Width - 1;
+                    int endY = zy + n;
+                    if (endY >= m_channel.Height)
+                        endY = m_channel.Height - 1;
+
+                    int x, y;
+
+                    for (x = startX; x <= endX; x++)
                     {
-                        int dy;
-                        for(dy=-n; dy<=n; dy++)
+                        for (y = startY; y <= endY; y++)
                         {
-                            int x = zx + dx;
-                            int y = zy + dy;
-                            if (x >= 0 && y >= 0 && x < m_channel.Width && y < m_channel.Height)
+                            if (m_scene.Permissions.CanTerraformLand(agentId, new Vector3(x, y, 0)))
                             {
-                                if (m_scene.Permissions.CanTerraformLand(agentId, new Vector3(x, y, 0)))
-                                {
-                                    allowMask[x, y] = true;
-                                    allowed = true;
-                                }
+                                allowMask[x, y] = true;
+                                allowed = true;
                             }
                         }
                     }
                     if (allowed)
                     {
                         StoreUndoState();
-                        m_painteffects[(StandardTerrainEffects)action].PaintEffect(
-                            m_channel, allowMask, west, south, height, size, seconds);
+                        m_painteffects[(StandardTerrainEffects) action].PaintEffect(
+                            m_channel, allowMask, west, south, height, size, seconds,
+                            startX, endX, startY, endY);
 
-                        //revert changes outside estate limits
+                        //block changes outside estate limits
                         if (!god)
                             EnforceEstateLimits();
                     }
@@ -1202,22 +1195,42 @@ namespace OpenSim.Region.CoreModules.World.Terrain
                     bool[,] fillArea = new bool[m_channel.Width, m_channel.Height];
                     fillArea.Initialize();
 
-                    int x;
-                    for(x = 0; x < m_channel.Width; x++)
+                    int startX = (int)west;
+                    int startY = (int)south;
+                    int endX = (int)east;
+                    int endY = (int)north;
+
+                    if (startX < 0)
+                        startX = 0;
+                    else if (startX >= m_channel.Width)
+                        startX = m_channel.Width - 1;
+
+                    if (endX < 0)
+                        endX = 0;
+                    else if (endX >= m_channel.Width)
+                        endX = m_channel.Width - 1;
+
+                    if (startY < 0)
+                        startY = 0;
+                    else if (startY >= m_channel.Height)
+                        startY = m_channel.Height - 1;
+
+                    if (endY < 0)
+                        endY = 0;
+                    else if (endY >= m_channel.Height)
+                        endY = m_channel.Height - 1;
+
+
+                    int x, y;
+
+                    for (x = startX; x <= endX; x++)
                     {
-                        int y;
-                        for(y = 0; y < m_channel.Height; y++)
+                        for (y = startY; y <= endY; y++)
                         {
-                            if (x < east && x > west)
+                            if (m_scene.Permissions.CanTerraformLand(agentId, new Vector3(x, y, 0)))
                             {
-                                if (y < north && y > south)
-                                {
-                                    if (m_scene.Permissions.CanTerraformLand(agentId, new Vector3(x, y, 0)))
-                                    {
-                                        fillArea[x, y] = true;
-                                        allowed = true;
-                                    }
-                                }
+                                fillArea[x, y] = true;
+                                allowed = true;
                             }
                         }
                     }
@@ -1225,9 +1238,10 @@ namespace OpenSim.Region.CoreModules.World.Terrain
                     if (allowed)
                     {
                         StoreUndoState();
-                        m_floodeffects[(StandardTerrainEffects)action].FloodEffect(m_channel, fillArea, size);
+                        m_floodeffects[(StandardTerrainEffects)action].FloodEffect(m_channel, fillArea, size,
+                            startX, endX, startY, endY);
 
-                        //revert changes outside estate limits
+                        //block changes outside estate limits
                         if (!god)
                             EnforceEstateLimits();
                     }
@@ -1260,37 +1274,22 @@ namespace OpenSim.Region.CoreModules.World.Terrain
 
         private void StoreUndoState()
         {
-            lock(m_undo)
-            {
-                if (m_undo.Count > 0)
-                {
-                    LandUndoState last = m_undo.Peek();
-                    if (last != null)
-                    {
-                        if (last.Compare(m_channel))
-                            return;
-                    }
-                }
-
-                LandUndoState nUndo = new LandUndoState(this, m_channel);
-                m_undo.Push(nUndo);
-            }
         }
 
         #region Console Commands
 
         private void InterfaceLoadFile(Object[] args)
         {
-            LoadFromFile((string)args[0]);
+            LoadFromFile((string) args[0]);
         }
 
         private void InterfaceLoadTileFile(Object[] args)
         {
-            LoadFromFile((string)args[0],
-                         (int)args[1],
-                         (int)args[2],
-                         (int)args[3],
-                         (int)args[4]);
+            LoadFromFile((string) args[0],
+                         (int) args[1],
+                         (int) args[2],
+                         (int) args[3],
+                         (int) args[4]);
         }
 
         private void InterfaceSaveFile(Object[] args)
@@ -1309,15 +1308,15 @@ namespace OpenSim.Region.CoreModules.World.Terrain
 
         private void InterfaceBakeTerrain(Object[] args)
         {
-            UpdateRevertMap();
+            UpdateBakedMap();
         }
 
         private void InterfaceRevertTerrain(Object[] args)
         {
             int x, y;
-            for(x = 0; x < m_channel.Width; x++)
-                for(y = 0; y < m_channel.Height; y++)
-                    m_channel[x, y] = m_revert[x, y];
+            for (x = 0; x < m_channel.Width; x++)
+                for (y = 0; y < m_channel.Height; y++)
+                    m_channel[x, y] = m_baked[x, y];
 
         }
 
@@ -1327,9 +1326,9 @@ namespace OpenSim.Region.CoreModules.World.Terrain
 
             if (direction.ToLower().StartsWith("y"))
             {
-                for(int x = 0; x < m_channel.Width; x++)
+                for (int x = 0; x < m_channel.Width; x++)
                 {
-                    for(int y = 0; y < m_channel.Height / 2; y++)
+                    for (int y = 0; y < m_channel.Height / 2; y++)
                     {
                         double height = m_channel[x, y];
                         double flippedHeight = m_channel[x, (int)m_channel.Height - 1 - y];
@@ -1341,9 +1340,9 @@ namespace OpenSim.Region.CoreModules.World.Terrain
             }
             else if (direction.ToLower().StartsWith("x"))
             {
-                for(int y = 0; y < m_channel.Height; y++)
+                for (int y = 0; y < m_channel.Height; y++)
                 {
-                    for(int x = 0; x < m_channel.Width / 2; x++)
+                    for (int x = 0; x < m_channel.Width / 2; x++)
                     {
                         double height = m_channel[x, y];
                         double flippedHeight = m_channel[(int)m_channel.Width - 1 - x, y];
@@ -1420,45 +1419,53 @@ namespace OpenSim.Region.CoreModules.World.Terrain
 
         private void InterfaceElevateTerrain(Object[] args)
         {
+            double val = (double)args[0];
+
             int x, y;
-            for(x = 0; x < m_channel.Width; x++)
-                for(y = 0; y < m_channel.Height; y++)
-                    m_channel[x, y] += (double)args[0];
+            for (x = 0; x < m_channel.Width; x++)
+                for (y = 0; y < m_channel.Height; y++)
+                    m_channel[x, y] += val;
         }
 
         private void InterfaceMultiplyTerrain(Object[] args)
         {
             int x, y;
-            for(x = 0; x < m_channel.Width; x++)
-                for(y = 0; y < m_channel.Height; y++)
-                    m_channel[x, y] *= (double)args[0];
+            double val = (double)args[0];
+
+            for (x = 0; x < m_channel.Width; x++)
+                for (y = 0; y < m_channel.Height; y++)
+                    m_channel[x, y] *= val;
         }
 
         private void InterfaceLowerTerrain(Object[] args)
         {
             int x, y;
-            for(x = 0; x < m_channel.Width; x++)
-                for(y = 0; y < m_channel.Height; y++)
-                    m_channel[x, y] -= (double)args[0];
+            double val = (double)args[0];
+
+            for (x = 0; x < m_channel.Width; x++)
+                for (y = 0; y < m_channel.Height; y++)
+                    m_channel[x, y] -= val;
         }
 
         public void InterfaceFillTerrain(Object[] args)
         {
             int x, y;
+            double val = (double)args[0];
 
-            for(x = 0; x < m_channel.Width; x++)
-                for(y = 0; y < m_channel.Height; y++)
-                    m_channel[x, y] = (double)args[0];
+            for (x = 0; x < m_channel.Width; x++)
+                for (y = 0; y < m_channel.Height; y++)
+                    m_channel[x, y] = val;
         }
 
         private void InterfaceMinTerrain(Object[] args)
         {
             int x, y;
-            for(x = 0; x < m_channel.Width; x++)
+            double val = (double)args[0];
+            for (x = 0; x < m_channel.Width; x++)
             {
                 for(y = 0; y < m_channel.Height; y++)
                 {
-                    m_channel[x, y] = Math.Max((double)args[0], m_channel[x, y]);
+                    m_channel[x, y] = Math.Max(val, m_channel[x, y]);
                 }
             }
         }
@@ -1466,11 +1473,12 @@ namespace OpenSim.Region.CoreModules.World.Terrain
         private void InterfaceMaxTerrain(Object[] args)
         {
             int x, y;
-            for(x = 0; x < m_channel.Width; x++)
+            double val = (double)args[0];
+            for (x = 0; x < m_channel.Width; x++)
             {
                 for(y = 0; y < m_channel.Height; y++)
                 {
-                    m_channel[x, y] = Math.Min((double)args[0], m_channel[x, y]);
+                    m_channel[x, y] = Math.Min(val, m_channel[x, y]);
                 }
             }
         }
@@ -1620,9 +1628,9 @@ namespace OpenSim.Region.CoreModules.World.Terrain
             multiplyCommand.AddArgument("value", "The value to multiply the heightmap by.", "Double");
 
             Command bakeRegionCommand =
-                new Command("bake", CommandIntentions.COMMAND_HAZARDOUS, InterfaceBakeTerrain, "Saves the current terrain into the regions revert map.");
+                new Command("bake", CommandIntentions.COMMAND_HAZARDOUS, InterfaceBakeTerrain, "Saves the current terrain into the regions baked map.");
             Command revertRegionCommand =
-                new Command("revert", CommandIntentions.COMMAND_HAZARDOUS, InterfaceRevertTerrain, "Loads the revert map terrain into the regions heightmap.");
+                new Command("revert", CommandIntentions.COMMAND_HAZARDOUS, InterfaceRevertTerrain, "Loads the baked map terrain into the regions heightmap.");
 
             Command flipCommand =
                 new Command("flip", CommandIntentions.COMMAND_HAZARDOUS, InterfaceFlipTerrain, "Flips the current terrain about the X or Y axis");
@@ -1699,6 +1707,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
 
         public void ModifyCommand(string module, string[] cmd)
         {
+            /*
             string result;
             Scene scene = SceneManager.Instance.CurrentScene;
             if ((scene != null) && (scene != m_scene))
@@ -1738,6 +1747,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
             {
                 MainConsole.Instance.Output(result);
             }
+             */
         }
 
 #endregion
diff --git a/OpenSim/Region/CoreModules/World/Terrain/Tests/TerrainTest.cs b/OpenSim/Region/CoreModules/World/Terrain/Tests/TerrainTest.cs
index 29e80ef..b209b33 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/Tests/TerrainTest.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/Tests/TerrainTest.cs
@@ -60,7 +60,8 @@ namespace OpenSim.Region.CoreModules.World.Terrain.Tests
             TerrainChannel map = new TerrainChannel((int)Constants.RegionSize, (int)Constants.RegionSize);
             ITerrainPaintableEffect effect = new RaiseSphere();
 
-            effect.PaintEffect(map, allowMask, midRegion, midRegion, -1.0, 2, 6.0);
+            effect.PaintEffect(map, allowMask, midRegion, midRegion, -1.0, 2, 6.0,
+                0, midRegion - 1,0, (int)Constants.RegionSize -1);
             Assert.That(map[127, midRegion] > 0.0, "Raise brush should raising value at this point (127,128).");
             Assert.That(map[125, midRegion] > 0.0, "Raise brush should raising value at this point (124,128).");
             Assert.That(map[120, midRegion] == 0.0, "Raise brush should not change value at this point (120,128).");
@@ -79,7 +80,8 @@ namespace OpenSim.Region.CoreModules.World.Terrain.Tests
             }
             effect = new LowerSphere();
 
-            effect.PaintEffect(map, allowMask, midRegion, midRegion, -1.0, 2, 6.0);
+            effect.PaintEffect(map, allowMask, midRegion, midRegion, -1.0, 2, 6.0,
+                0, (int)Constants.RegionSize -1,0, (int)Constants.RegionSize -1);
             Assert.That(map[127, midRegion] >= 0.0, "Lower should not lowering value below 0.0 at this point (127,128).");
             Assert.That(map[127, midRegion] == 0.0, "Lower brush should lowering value to 0.0 at this point (127,128).");
             Assert.That(map[125, midRegion] < 1.0, "Lower brush should lowering value at this point (124,128).");
diff --git a/OpenSim/Region/CoreModules/World/Warp3DMap/TerrainSplat.cs b/OpenSim/Region/CoreModules/World/Warp3DMap/TerrainSplat.cs
index 9534ad3..4719ba3 100644
--- a/OpenSim/Region/CoreModules/World/Warp3DMap/TerrainSplat.cs
+++ b/OpenSim/Region/CoreModules/World/Warp3DMap/TerrainSplat.cs
@@ -79,6 +79,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
         /// <remarks>Based on the algorithm described at http://opensimulator.org/wiki/Terrain_Splatting
         /// Note we create a 256x256 dimension texture even if the actual terrain is larger.
         /// </remarks>
+
         public static Bitmap Splat(ITerrainChannel terrain,
                 UUID[] textureIDs, float[] startHeights, float[] heightRanges,
                 Vector3d regionPosition, IAssetService assetService, bool textureTerrain)
@@ -129,8 +130,8 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
                             asset = assetService.Get(textureIDs[i].ToString());
                             if (asset != null)
                             {
-//                                    m_log.DebugFormat(
-//                                        "[TERRAIN SPLAT]: Got cached original JPEG2000 terrain texture {0} {1}", i, asset.ID);
+                                //                                    m_log.DebugFormat(
+                                //                                        "[TERRAIN SPLAT]: Got cached original JPEG2000 terrain texture {0} {1}", i, asset.ID);
 
                                 try { detailTexture[i] = (Bitmap)CSJ2K.J2kImage.FromBytes(asset.Data); }
                                 catch (Exception ex)
@@ -140,7 +141,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
                             }
 
                             if (detailTexture[i] != null)
-                            {    
+                            {
                                 // Make sure this texture is the correct size, otherwise resize
                                 if (detailTexture[i].Width != 256 || detailTexture[i].Height != 256)
                                 {
@@ -352,7 +353,6 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
             b.Dispose();
             return result;
         }
-
         public static Bitmap SplatSimple(float[] heightmap)
         {
             const float BASE_HSV_H = 93f / 360f;
diff --git a/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs b/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs
index 5f2534b..443eee1 100644
--- a/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs
+++ b/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs
@@ -80,6 +80,9 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
 
         private bool m_Enabled = false;
 
+        private Bitmap lastImage = null;
+        private DateTime lastImageTime = DateTime.MinValue;
+
         #region Region Module interface
 
         public void Initialise(IConfigSource source)
@@ -118,14 +121,9 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
 
             List<string> renderers = RenderingLoader.ListRenderers(Util.ExecutingDirectory());
             if (renderers.Count > 0)
-            {
-                m_primMesher = RenderingLoader.LoadRenderer(renderers[0]);
-                m_log.DebugFormat("[WARP 3D IMAGE MODULE]: Loaded prim mesher {0}", m_primMesher);
-            }
+                m_log.Info("[MAPTILE]: Loaded prim mesher " + renderers[0]);
             else
-            {
-                m_log.Debug("[WARP 3D IMAGE MODULE]: No prim mesher loaded, prim rendering will be disabled");
-            }
+                m_log.Info("[MAPTILE]: No prim mesher loaded, prim rendering will be disabled");
 
             m_scene.RegisterModuleInterface<IMapImageGenerator>(this);
         }
@@ -158,18 +156,36 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
 
         public Bitmap CreateMapTile()
         {
-            // Vector3 camPos = new Vector3(127.5f, 127.5f, 221.7025033688163f);
-            // Camera above the middle of the region
+            /* this must be on all map, not just its image
+            if ((DateTime.Now - lastImageTime).TotalSeconds < 3600)
+            {
+                return (Bitmap)lastImage.Clone();
+            }
+            */
+
+            List<string> renderers = RenderingLoader.ListRenderers(Util.ExecutingDirectory());
+            if (renderers.Count > 0)
+            {
+                m_primMesher = RenderingLoader.LoadRenderer(renderers[0]);
+            }
+
             Vector3 camPos = new Vector3(
-                            m_scene.RegionInfo.RegionSizeX/2 - 0.5f,
-                            m_scene.RegionInfo.RegionSizeY/2 - 0.5f,
+                            m_scene.RegionInfo.RegionSizeX / 2 - 0.5f,
+                            m_scene.RegionInfo.RegionSizeY / 2 - 0.5f,
                             221.7025033688163f);
             // Viewport viewing down onto the region
             Viewport viewport = new Viewport(camPos, -Vector3.UnitZ, 1024f, 0.1f,
                         (int)m_scene.RegionInfo.RegionSizeX, (int)m_scene.RegionInfo.RegionSizeY,
-                        (float)m_scene.RegionInfo.RegionSizeX, (float)m_scene.RegionInfo.RegionSizeY );
-            // Fill the viewport and return the image
-            return CreateMapTile(viewport, false);
+                        (float)m_scene.RegionInfo.RegionSizeX, (float)m_scene.RegionInfo.RegionSizeY);
+
+            Bitmap tile = CreateMapTile(viewport, false);
+            m_primMesher = null;
+            return tile;
+/*
+            lastImage = tile;
+            lastImageTime = DateTime.Now;
+            return (Bitmap)lastImage.Clone();
+ */
         }
 
         public Bitmap CreateViewImage(Vector3 camPos, Vector3 camDir, float fov, int width, int height, bool useTextures)
@@ -285,9 +301,9 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
             float waterHeight = (float)m_scene.RegionInfo.RegionSettings.WaterHeight;
 
             renderer.AddPlane("Water", m_scene.RegionInfo.RegionSizeX * 0.5f);
-            renderer.Scene.sceneobject("Water").setPos(m_scene.RegionInfo.RegionSizeX/2 - 0.5f,
+            renderer.Scene.sceneobject("Water").setPos(m_scene.RegionInfo.RegionSizeX / 2 - 0.5f,
                                                        waterHeight,
-                                                       m_scene.RegionInfo.RegionSizeY/2 - 0.5f );
+                                                       m_scene.RegionInfo.RegionSizeY / 2 - 0.5f);
 
             warp_Material waterColorMaterial = new warp_Material(ConvertColor(WATER_COLOR));
                         waterColorMaterial.setReflectivity(0);  // match water color with standard map module thanks lkalif
@@ -316,7 +332,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
                     warp_Vector pos = ConvertVector(x, y, (float)terrain[(int)x, (int)y]);
                     obj.addVertex(new warp_Vertex(pos,
                         x / (float)m_scene.RegionInfo.RegionSizeX,
-                        (((float)m_scene.RegionInfo.RegionSizeY) - y) / m_scene.RegionInfo.RegionSizeY) );
+                        (((float)m_scene.RegionInfo.RegionSizeY) - y) / m_scene.RegionInfo.RegionSizeY));
                 }
             }
 
@@ -384,7 +400,8 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
             warp_Texture texture;
             using (
                 Bitmap image
-                    = TerrainSplat.Splat(terrain, textureIDs, startHeights, heightRanges,
+                    = TerrainSplat.Splat(
+                        terrain, textureIDs, startHeights, heightRanges,
                         new Vector3d(globalX, globalY, 0.0), m_scene.AssetService, textureTerrain))
             {
                 texture = new warp_Texture(image);
@@ -660,7 +677,6 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
         #endregion Rendering Methods
 
         #region Static Helpers
-
         // Note: axis change.
         private static warp_Vector ConvertVector(float x, float y, float z)
         {
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
index d862f18..e08bdc0 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
@@ -141,25 +141,23 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
 
         private void OnMapNameRequest(IClientAPI remoteClient, string mapName, uint flags)
         {
-            List<MapBlockData> blocks = new List<MapBlockData>();
-            if (mapName.Length < 3 || (mapName.EndsWith("#") && mapName.Length < 4))
+            Util.FireAndForget(x =>
             {
-                // final block, closing the search result
-                AddFinalBlock(blocks);
+                List<MapBlockData> blocks = new List<MapBlockData>();
+                if (mapName.Length < 3 || (mapName.EndsWith("#") && mapName.Length < 4))
+                {
+                    // final block, closing the search result
+                    AddFinalBlock(blocks);
 
-                // flags are agent flags sent from the viewer.
-                // they have different values depending on different viewers, apparently
-                remoteClient.SendMapBlock(blocks, flags);
-                remoteClient.SendAlertMessage("Use a search string with at least 3 characters");
-                return;
-            }
+                    // flags are agent flags sent from the viewer.
+                    // they have different values depending on different viewers, apparently
+                    remoteClient.SendMapBlock(blocks, flags);
+                    remoteClient.SendAlertMessage("Use a search string with at least 3 characters");
+                    return;
+                }
 
+                //m_log.DebugFormat("MAP NAME=({0})", mapName);
 
-            List<GridRegion> regionInfos = m_scene.GridService.GetRegionsByName(m_scene.RegionInfo.ScopeID, mapName, 20);
-            
-            string mapNameOrig = mapName;
-            if (regionInfos.Count == 0)
-            {
                 // Hack to get around the fact that ll V3 now drops the port from the
                 // map name. See https://jira.secondlife.com/browse/VWR-28570
                 //
@@ -168,6 +166,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                 // or url encode if possible.
                 // the hacks we do with this viewer...
                 //
+                string mapNameOrig = mapName;
                 if (mapName.Contains("|"))
                     mapName = mapName.Replace('|', ':');
                 if (mapName.Contains("+"))
@@ -175,52 +174,70 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                 if (mapName.Contains("!"))
                     mapName = mapName.Replace('!', '/');
                 
-                if (mapName != mapNameOrig)
-                    regionInfos = m_scene.GridService.GetRegionsByName(m_scene.RegionInfo.ScopeID, mapName, 20);
-            }
-            
-            m_log.DebugFormat("[MAPSEARCHMODULE]: search {0} returned {1} regions. Flags={2}", mapName, regionInfos.Count, flags);
-            
-            if (regionInfos.Count > 0)
-            {
-                foreach (GridRegion info in regionInfos)
+                // try to fetch from GridServer
+                List<GridRegion> regionInfos = m_scene.GridService.GetRegionsByName(m_scene.RegionInfo.ScopeID, mapName, 20);
+    //            if (regionInfos.Count == 0)
+    //                remoteClient.SendAlertMessage("Hyperlink could not be established.");
+
+                //m_log.DebugFormat("[MAPSEARCHMODULE]: search {0} returned {1} regions", mapName, regionInfos.Count);
+ 
+                MapBlockData data;
+                if (regionInfos.Count > 0)
                 {
-                    if ((flags & 2) == 2) // V2 sends this
+                    foreach (GridRegion info in regionInfos)
                     {
-                        List<MapBlockData> datas = WorldMap.Map2BlockFromGridRegion(info, flags);
+                        data = new MapBlockData();
+                        data.Agents = 0;
+                        data.Access = info.Access;
+                        if (flags == 2) // V2 sends this
+                        {
+                            List<MapBlockData> datas = WorldMap.Map2BlockFromGridRegion(info, flags);
+                            // ugh! V2-3 is very sensitive about the result being
+                            // exactly the same as the requested name
+
+                            if (regionInfos.Count == 1 && (mapName != mapNameOrig))
+                                datas.ForEach(d => d.Name = mapNameOrig);
+
+                            blocks.AddRange(datas);                         
+                        }
+                        else
+                        {
+                            MapBlockData block = new MapBlockData();
+                            WorldMap.MapBlockFromGridRegion(block,info, flags);
+                            blocks.Add(block);
+                        }
                         // ugh! V2-3 is very sensitive about the result being
                         // exactly the same as the requested name
-                        if (regionInfos.Count == 1 && (mapName != mapNameOrig))
-                            datas.ForEach(d => d.Name = mapNameOrig);
-
-                        blocks.AddRange(datas);
-                    }
-                    else
-                    {
-                        MapBlockData data = WorldMap.MapBlockFromGridRegion(info, flags);
+                        if (regionInfos.Count == 1 && mapNameOrig.Contains("|") || mapNameOrig.Contains("+"))
+                            data.Name = mapNameOrig;
+                        else
+                            data.Name = info.RegionName;
+                        data.RegionFlags = 0; // TODO not used?
+                        data.WaterHeight = 0; // not used
+                        data.X = (ushort)(info.RegionLocX / Constants.RegionSize);
+                        data.Y = (ushort)(info.RegionLocY / Constants.RegionSize);
                         blocks.Add(data);
                     }
                 }
-            }
 
-            // final block, closing the search result
-            AddFinalBlock(blocks);
+                // final block, closing the search result
+                AddFinalBlock(blocks);
 
-            // flags are agent flags sent from the viewer.
-            // they have different values depending on different viewers, apparently
-            remoteClient.SendMapBlock(blocks, flags);
+                // flags are agent flags sent from the viewer.
+                // they have different values depending on different viewers, apparently
+                remoteClient.SendMapBlock(blocks, flags);
 
-            // send extra user messages for V3
-            // because the UI is very confusing
-            // while we don't fix the hard-coded urls
-            if (flags == 2) 
-            {
-                if (regionInfos.Count == 0)
-                    remoteClient.SendAlertMessage("No regions found with that name.");
-                // this seems unnecessary because found regions will show up in the search results
-                //else if (regionInfos.Count == 1)
-                //    remoteClient.SendAlertMessage("Region found!");
-            }
+                // send extra user messages for V3
+                // because the UI is very confusing
+                // while we don't fix the hard-coded urls
+                if (flags == 2) 
+                {
+                    if (regionInfos.Count == 0)
+                        remoteClient.SendAgentAlertMessage("No regions found with that name.", true);
+//                    else if (regionInfos.Count == 1)
+//                        remoteClient.SendAgentAlertMessage("Region found!", false);
+                }
+            });
         }
 
         private void AddFinalBlock(List<MapBlockData> blocks)
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
index db1187e..f34cfe5 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
@@ -68,26 +68,27 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
         private static readonly UUID STOP_UUID = UUID.Random();
         private static readonly string m_mapLayerPath = "0001/";
 
+        private ManualResetEvent queueEvent = new ManualResetEvent(false);
+        private Queue<MapRequestState> requests = new Queue<MapRequestState>();
+
+        private ManualResetEvent m_mapBlockRequestEvent = new ManualResetEvent(false);
+        private Dictionary<UUID, Queue<MapBlockRequestData>> m_mapBlockRequests = new Dictionary<UUID, Queue<MapBlockRequestData>>();
+
         private IMapImageGenerator m_mapImageGenerator;
         private IMapImageUploadModule m_mapImageServiceModule;
 
-        private OpenSim.Framework.BlockingQueue<MapRequestState> requests = new OpenSim.Framework.BlockingQueue<MapRequestState>();
-
         protected Scene m_scene;
         private List<MapBlockData> cachedMapBlocks = new List<MapBlockData>();
         private int cachedTime = 0;
         private int blacklistTimeout = 10*60*1000; // 10 minutes
         private byte[] myMapImageJPEG;
         protected volatile bool m_Enabled = false;
-        private Dictionary<UUID, MapRequestState> m_openRequests = new Dictionary<UUID, MapRequestState>();
         private Dictionary<string, int> m_blacklistedurls = new Dictionary<string, int>();
         private Dictionary<ulong, int> m_blacklistedregions = new Dictionary<ulong, int>();
         private Dictionary<ulong, string> m_cachedRegionMapItemsAddress = new Dictionary<ulong, string>();
         private List<UUID> m_rootAgents = new List<UUID>();
         private volatile bool threadrunning = false;
 
-        private IServiceThrottleModule m_ServiceThrottle;
-
         //private int CacheRegionsDistance = 256;
 
         #region INonSharedRegionModule Members
@@ -98,7 +99,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
             if (Util.GetConfigVarFromSections<string>(
                 config, "WorldMapModule", configSections, "WorldMap") == "WorldMap")
                 m_Enabled = true;
-
+  
             blacklistTimeout 
                 = Util.GetConfigVarFromSections<int>(config, "BlacklistTimeout", configSections, 10 * 60) * 1000;
         }
@@ -146,8 +147,6 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
             if (!m_Enabled)
                 return;
 
-            m_ServiceThrottle = scene.RequestModuleInterface<IServiceThrottleModule>();
-
             m_mapImageGenerator = m_scene.RequestModuleInterface<IMapImageGenerator>();
             m_mapImageServiceModule = m_scene.RequestModuleInterface<IMapImageUploadModule>();
         }
@@ -197,13 +196,13 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
             m_scene.EventManager.OnMakeRootAgent += MakeRootAgent;
             m_scene.EventManager.OnRegionUp += OnRegionUp;
 
-//            StartThread(new object());
+            StartThread(new object());
         }
 
         // this has to be called with a lock on m_scene
         protected virtual void RemoveHandlers()
         {
-//            StopThread();
+            StopThread();
 
             m_scene.EventManager.OnRegionUp -= OnRegionUp;
             m_scene.EventManager.OnMakeRootAgent -= MakeRootAgent;
@@ -261,54 +260,54 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
             // 6/8/2011 -- I'm adding an explicit 2048 check, so that we never forget that there is
             // a hack here, and so that regions below 4096 don't get spammed with unnecessary map blocks.
 
-            if (m_scene.RegionInfo.RegionLocX >= 2048 || m_scene.RegionInfo.RegionLocY >= 2048)
-            {
-                ScenePresence avatarPresence = null;
-
-                m_scene.TryGetScenePresence(agentID, out avatarPresence);
-
-                if (avatarPresence != null)
-                {
-                    bool lookup = false;
-
-                    lock (cachedMapBlocks)
-                    {
-                        if (cachedMapBlocks.Count > 0 && ((cachedTime + 1800) > Util.UnixTimeSinceEpoch()))
-                        {
-                            List<MapBlockData> mapBlocks;
-
-                            mapBlocks = cachedMapBlocks;
-                            avatarPresence.ControllingClient.SendMapBlock(mapBlocks, 0);
-                        }
-                        else
-                        {
-                            lookup = true;
-                        }
-                    }
-                    if (lookup)
-                    {
-                        List<MapBlockData> mapBlocks = new List<MapBlockData>(); ;
-
-                        // Get regions that are within 8 regions of here
-                        List<GridRegion> regions = m_scene.GridService.GetRegionRange(m_scene.RegionInfo.ScopeID,
-                                    (int)Util.RegionToWorldLoc(m_scene.RegionInfo.RegionLocX - 8),
-                                    (int)Util.RegionToWorldLoc(m_scene.RegionInfo.RegionLocX + 8),
-                                    (int)Util.RegionToWorldLoc(m_scene.RegionInfo.RegionLocY - 8),
-                                    (int)Util.RegionToWorldLoc(m_scene.RegionInfo.RegionLocY + 8) );
-                        foreach (GridRegion r in regions)
-                        {
-                            MapBlockData block = MapBlockFromGridRegion(r, 0);
-                            mapBlocks.Add(block);
-                        }
-                        avatarPresence.ControllingClient.SendMapBlock(mapBlocks, 0);
-
-                        lock (cachedMapBlocks)
-                            cachedMapBlocks = mapBlocks;
-
-                        cachedTime = Util.UnixTimeSinceEpoch();
-                    }
-                }
-            }
+            //if (m_scene.RegionInfo.RegionLocX >= 2048 || m_scene.RegionInfo.RegionLocY >= 2048)
+            //{
+            //    ScenePresence avatarPresence = null;
+
+            //    m_scene.TryGetScenePresence(agentID, out avatarPresence);
+
+            //    if (avatarPresence != null)
+            //    {
+            //        bool lookup = false;
+
+            //        lock (cachedMapBlocks)
+            //        {
+            //            if (cachedMapBlocks.Count > 0 && ((cachedTime + 1800) > Util.UnixTimeSinceEpoch()))
+            //            {
+            //                List<MapBlockData> mapBlocks;
+
+            //                mapBlocks = cachedMapBlocks;
+            //                avatarPresence.ControllingClient.SendMapBlock(mapBlocks, 0);
+            //            }
+            //            else
+            //            {
+            //                lookup = true;
+            //            }
+            //        }
+            //        if (lookup)
+            //        {
+            //            List<MapBlockData> mapBlocks = new List<MapBlockData>(); ;
+
+            //            List<GridRegion> regions = m_scene.GridService.GetRegionRange(m_scene.RegionInfo.ScopeID,
+            //                (int)(m_scene.RegionInfo.RegionLocX - 8) * (int)Constants.RegionSize,
+            //                (int)(m_scene.RegionInfo.RegionLocX + 8) * (int)Constants.RegionSize,
+            //                (int)(m_scene.RegionInfo.RegionLocY - 8) * (int)Constants.RegionSize,
+            //                (int)(m_scene.RegionInfo.RegionLocY + 8) * (int)Constants.RegionSize);
+            //            foreach (GridRegion r in regions)
+            //            {
+            //                MapBlockData block = new MapBlockData();
+            //                MapBlockFromGridRegion(block, r, 0);
+            //                mapBlocks.Add(block);
+            //            }
+            //            avatarPresence.ControllingClient.SendMapBlock(mapBlocks, 0);
+
+            //            lock (cachedMapBlocks)
+            //                cachedMapBlocks = mapBlocks;
+
+            //            cachedTime = Util.UnixTimeSinceEpoch();
+            //        }
+            //    }
+            //}
 
             LLSDMapLayerResponse mapResponse = new LLSDMapLayerResponse();
             mapResponse.LayerData.Array.Add(GetOSDMapLayerResponse());
@@ -335,7 +334,9 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
         protected static OSDMapLayer GetOSDMapLayerResponse()
         {
             OSDMapLayer mapLayer = new OSDMapLayer();
+//            mapLayer.Right = 2048;
             mapLayer.Right = 5000;
+//            mapLayer.Top = 2048;
             mapLayer.Top = 5000;
             mapLayer.ImageID = new UUID("00000000-0000-1111-9999-000000000006");
 
@@ -365,6 +366,11 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
             {
                 m_rootAgents.Remove(AgentId);
             }
+            lock (m_mapBlockRequestEvent)
+            {
+                if (m_mapBlockRequests.ContainsKey(AgentId))
+                    m_mapBlockRequests.Remove(AgentId);
+            }
         }
         #endregion
 
@@ -387,6 +393,12 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                 ThreadPriority.BelowNormal,
                 true,
                 true);
+            WorkManager.StartThread(
+                MapBlockSendThread,
+                string.Format("MapBlockSendThread ({0})", m_scene.RegionInfo.RegionName),
+                ThreadPriority.BelowNormal,
+                true,
+                true);
         }
 
         /// <summary>
@@ -402,7 +414,27 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
             st.itemtype=0;
             st.regionhandle=0;
 
-            requests.Enqueue(st);
+            lock (requests)
+            {
+                queueEvent.Set();
+                requests.Enqueue(st);
+            }
+
+            MapBlockRequestData req = new MapBlockRequestData();
+
+            req.client = null;
+            req.minX = 0;
+            req.maxX = 0;
+            req.minY = 0;
+            req.maxY = 0;
+            req.flags = 0;
+
+            lock (m_mapBlockRequestEvent)
+            {
+                m_mapBlockRequests[UUID.Zero] = new Queue<MapBlockRequestData>();
+                m_mapBlockRequests[UUID.Zero].Enqueue(req);
+                m_mapBlockRequestEvent.Set();
+            }
         }
 
         public virtual void HandleMapItemRequest(IClientAPI remoteClient, uint flags,
@@ -418,7 +450,8 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
             uint xstart = 0;
             uint ystart = 0;
             Util.RegionHandleToWorldLoc(m_scene.RegionInfo.RegionHandle, out xstart, out ystart);
-            if (itemtype == (int)GridItemType.AgentLocations)
+
+            if (itemtype == (int)GridItemType.AgentLocations) // Service 6 right now (MAP_ITEM_AGENTS_LOCATION; green dots)
             {
                 if (regionhandle == 0 || regionhandle == m_scene.RegionInfo.RegionHandle)
                 {
@@ -492,7 +525,6 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                                 Vector3 max = parcel.AABBMax;
                                 float x = (min.X+max.X)/2;
                                 float y = (min.Y+max.Y)/2;
-
                                 mapitem = new mapItemReply(
                                                 xstart + (uint)x,
                                                 ystart + (uint)y,
@@ -552,12 +584,26 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
         /// </summary>
         public void process()
         {
-            //const int MAX_ASYNC_REQUESTS = 20;
+            const int MAX_ASYNC_REQUESTS = 20;
             try
             {
                 while (true)
                 {
-                    MapRequestState st = requests.Dequeue(1000);
+                    MapRequestState st = new MapRequestState();
+                    bool valid = false;
+                    queueEvent.WaitOne();
+                    lock (requests)
+                    {
+                        if (requests.Count > 0)
+                        {
+                            st = requests.Dequeue();
+                            valid = true;
+                        }
+                        if (requests.Count == 0)
+                            queueEvent.Reset();
+                    }
+                    if (!valid)
+                        continue;
 
                     // end gracefully
                     if (st.agentID == STOP_UUID)
@@ -575,13 +621,13 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                         if (dorequest &&  !m_blacklistedregions.ContainsKey(st.regionhandle))
                         {
                             while (nAsyncRequests >= MAX_ASYNC_REQUESTS) // hit the break
-                                Thread.Sleep(80);
+                                Thread.Sleep(100);
 
-                            RequestMapItemsDelegate d = RequestMapItemsAsync;
-                            d.BeginInvoke(st.agentID, st.flags, st.EstateID, st.godlike, st.itemtype, st.regionhandle, RequestMapItemsCompleted, null);
-                            //OSDMap response = RequestMapItemsAsync(st.agentID, st.flags, st.EstateID, st.godlike, st.itemtype, st.regionhandle);
-                            //RequestMapItemsCompleted(response);
                             Interlocked.Increment(ref nAsyncRequests);
+                            Util.FireAndForget(x =>
+                            {
+                                RequestMapItemsAsync(st.agentID, st.flags, st.EstateID, st.godlike, st.itemtype, st.regionhandle);
+                            });
                         }
                     }
 
@@ -597,132 +643,17 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
             Watchdog.RemoveThread();
         }
 
-        const int MAX_ASYNC_REQUESTS = 20;
-
         /// <summary>
-        /// Enqueues the map item request into the services throttle processing thread
+        /// Enqueues the map item request into the processing thread
         /// </summary>
         /// <param name="state"></param>
-        public void EnqueueMapItemRequest(MapRequestState st)
-        {
-
-            m_ServiceThrottle.Enqueue("map-item", st.regionhandle.ToString() + st.agentID.ToString(), delegate
-            {
-                if (st.agentID != UUID.Zero)
-                {
-                    bool dorequest = true;
-                    lock (m_rootAgents)
-                    {
-                        if (!m_rootAgents.Contains(st.agentID))
-                            dorequest = false;
-                    }
-
-                    if (dorequest && !m_blacklistedregions.ContainsKey(st.regionhandle))
-                    {
-                        if (nAsyncRequests >= MAX_ASYNC_REQUESTS) // hit the break
-                        {
-                            // AH!!! Recursive !
-                            // Put this request back in the queue and return
-                            EnqueueMapItemRequest(st);
-                            return;
-                        }
-
-                        RequestMapItemsDelegate d = RequestMapItemsAsync;
-                        d.BeginInvoke(st.agentID, st.flags, st.EstateID, st.godlike, st.itemtype, st.regionhandle, RequestMapItemsCompleted, null);
-                        //OSDMap response = RequestMapItemsAsync(st.agentID, st.flags, st.EstateID, st.godlike, st.itemtype, st.regionhandle);
-                        //RequestMapItemsCompleted(response);
-                        Interlocked.Increment(ref nAsyncRequests);
-                    }
-                }
-            });
-        }
-
-        /// <summary>
-        /// Sends the mapitem response to the IClientAPI
-        /// </summary>
-        /// <param name="response">The OSDMap Response for the mapitem</param>
-        private void RequestMapItemsCompleted(IAsyncResult iar)
+        public void EnqueueMapItemRequest(MapRequestState state)
         {
-            AsyncResult result = (AsyncResult)iar;
-            RequestMapItemsDelegate icon = (RequestMapItemsDelegate)result.AsyncDelegate;
-
-            OSDMap response = (OSDMap)icon.EndInvoke(iar);
-
-            Interlocked.Decrement(ref nAsyncRequests);
-
-            if (!response.ContainsKey("requestID"))
-                return;
-
-            UUID requestID = response["requestID"].AsUUID();
-
-            if (requestID != UUID.Zero)
+            lock (requests)
             {
-                MapRequestState mrs = new MapRequestState();
-                mrs.agentID = UUID.Zero;
-                lock (m_openRequests)
-                {
-                    if (m_openRequests.ContainsKey(requestID))
-                    {
-                        mrs = m_openRequests[requestID];
-                        m_openRequests.Remove(requestID);
-                    }
-                }
+                queueEvent.Set();
+                requests.Enqueue(state);
 
-                if (mrs.agentID != UUID.Zero)
-                {
-                    ScenePresence av = null;
-                    m_scene.TryGetScenePresence(mrs.agentID, out av);
-                    if (av != null)
-                    {
-                        if (response.ContainsKey(mrs.itemtype.ToString()))
-                        {
-                            List<mapItemReply> returnitems = new List<mapItemReply>();
-                            OSDArray itemarray = (OSDArray)response[mrs.itemtype.ToString()];
-                            for (int i = 0; i < itemarray.Count; i++)
-                            {
-                                OSDMap mapitem = (OSDMap)itemarray[i];
-                                mapItemReply mi = new mapItemReply();
-                                mi.FromOSD(mapitem);
-                                returnitems.Add(mi);
-                            }
-                            av.ControllingClient.SendMapItemReply(returnitems.ToArray(), mrs.itemtype, mrs.flags);
-                        }
-
-                        // Service 7 (MAP_ITEM_LAND_FOR_SALE)
-                        uint itemtype = (uint)GridItemType.LandForSale;
-
-                        if (response.ContainsKey(itemtype.ToString()))
-                        {
-                            List<mapItemReply> returnitems = new List<mapItemReply>();
-                            OSDArray itemarray = (OSDArray)response[itemtype.ToString()];
-                            for (int i = 0; i < itemarray.Count; i++)
-                            {
-                                OSDMap mapitem = (OSDMap)itemarray[i];
-                                mapItemReply mi = new mapItemReply();
-                                mi.FromOSD(mapitem);
-                                returnitems.Add(mi);
-                            }
-                            av.ControllingClient.SendMapItemReply(returnitems.ToArray(), itemtype, mrs.flags);
-                        }
-
-                        // Service 1 (MAP_ITEM_TELEHUB)
-                        itemtype = (uint)GridItemType.Telehub;
-
-                        if (response.ContainsKey(itemtype.ToString()))
-                        {
-                            List<mapItemReply> returnitems = new List<mapItemReply>();
-                            OSDArray itemarray = (OSDArray)response[itemtype.ToString()];
-                            for (int i = 0; i < itemarray.Count; i++)
-                            {
-                                OSDMap mapitem = (OSDMap)itemarray[i];
-                                mapItemReply mi = new mapItemReply();
-                                mi.FromOSD(mapitem);
-                                returnitems.Add(mi);
-                            }
-                            av.ControllingClient.SendMapItemReply(returnitems.ToArray(), itemtype, mrs.flags);
-                        }
-                    }
-                }
             }
         }
 
@@ -749,8 +680,6 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
             EnqueueMapItemRequest(st);
         }
 
-        private delegate OSDMap RequestMapItemsDelegate(UUID id, uint flags,
-            uint EstateID, bool godlike, uint itemtype, ulong regionhandle);
         /// <summary>
         /// Does the actual remote mapitem request
         /// This should be called from an asynchronous thread
@@ -765,7 +694,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
         /// <param name="itemtype">passed in from packet</param>
         /// <param name="regionhandle">Region we're looking up</param>
         /// <returns></returns>
-        private OSDMap RequestMapItemsAsync(UUID id, uint flags,
+        private void RequestMapItemsAsync(UUID id, uint flags,
             uint EstateID, bool godlike, uint itemtype, ulong regionhandle)
         {
 //            m_log.DebugFormat("[WORLDMAP]: RequestMapItemsAsync; region handle: {0} {1}", regionhandle, itemtype);
@@ -788,7 +717,10 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
             }
 
             if (blacklisted)
-                return new OSDMap();
+            {
+                Interlocked.Decrement(ref nAsyncRequests);
+                return;
+            }
 
             UUID requestID = UUID.Random();
             lock (m_cachedRegionMapItemsAddress)
@@ -796,6 +728,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                 if (m_cachedRegionMapItemsAddress.ContainsKey(regionhandle))
                     httpserver = m_cachedRegionMapItemsAddress[regionhandle];
             }
+
             if (httpserver.Length == 0)
             {
                 uint x = 0, y = 0;
@@ -840,18 +773,10 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
 
             // Can't find the http server
             if (httpserver.Length == 0 || blacklisted)
-                return new OSDMap();
-
-            MapRequestState mrs = new MapRequestState();
-            mrs.agentID = id;
-            mrs.EstateID = EstateID;
-            mrs.flags = flags;
-            mrs.godlike = godlike;
-            mrs.itemtype=itemtype;
-            mrs.regionhandle = regionhandle;
-
-            lock (m_openRequests)
-                m_openRequests.Add(requestID, mrs);
+            {
+                Interlocked.Decrement(ref nAsyncRequests);
+                return;
+            }
 
             WebRequest mapitemsrequest = null;
             try
@@ -861,7 +786,8 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
             catch (Exception e)
             {
                 m_log.DebugFormat("[WORLD MAP]: Access to {0} failed with {1}", httpserver, e);
-                return new OSDMap();
+                Interlocked.Decrement(ref nAsyncRequests);
+                return;
             }
 
             mapitemsrequest.Method = "POST";
@@ -895,13 +821,14 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
 
                 m_log.WarnFormat("[WORLD MAP]: Blacklisted {0}", httpserver);
 
-                return responseMap;
+                Interlocked.Decrement(ref nAsyncRequests);
+                return;
             }
             catch
             {
                 m_log.DebugFormat("[WORLD MAP]: RequestMapItems failed for {0}", httpserver);
-                responseMap["connect"] = OSD.FromBoolean(false);
-                return responseMap;
+                Interlocked.Decrement(ref nAsyncRequests);
+                return;
             }
             finally
             {
@@ -910,26 +837,24 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
             }
 
             string response_mapItems_reply = null;
-            {
+            { // get the response
+                StreamReader sr = null;
                 try
                 {
-                    using (WebResponse webResponse = mapitemsrequest.GetResponse())
+                    WebResponse webResponse = mapitemsrequest.GetResponse();
+                    if (webResponse != null)
                     {
-                        if (webResponse != null)
-                        {
-                            using (Stream s = webResponse.GetResponseStream())
-                                using (StreamReader sr = new StreamReader(s))
-                                    response_mapItems_reply = sr.ReadToEnd().Trim();
-                        }
-                        else
-                        {
-                            return new OSDMap();
-                        }
-                        }
+                        sr = new StreamReader(webResponse.GetResponseStream());
+                        response_mapItems_reply = sr.ReadToEnd().Trim();
+                    }
+                    else
+                    {
+                        Interlocked.Decrement(ref nAsyncRequests);
+                        return;
+                    }
                 }
                 catch (WebException)
-                {
-                    responseMap["connect"] = OSD.FromBoolean(false);
+                {                   
                     lock (m_blacklistedurls)
                     {
                         if (!m_blacklistedurls.ContainsKey(httpserver))
@@ -938,19 +863,25 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
 
                     m_log.WarnFormat("[WORLD MAP]: Blacklisted {0}", httpserver);
 
-                    return responseMap;
+                    Interlocked.Decrement(ref nAsyncRequests);
+                    return;
                 }
                 catch
                 {
                     m_log.DebugFormat("[WORLD MAP]: RequestMapItems failed for {0}", httpserver);
-                    responseMap["connect"] = OSD.FromBoolean(false);
                     lock (m_blacklistedregions)
                     {
                         if (!m_blacklistedregions.ContainsKey(regionhandle))
                             m_blacklistedregions.Add(regionhandle, Environment.TickCount);
                     }
 
-                    return responseMap;
+                    Interlocked.Decrement(ref nAsyncRequests);
+                    return;
+                }
+                finally
+                {
+                    if (sr != null)
+                        sr.Close();
                 }
 
                 OSD rezResponse = null;
@@ -964,15 +895,14 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                 catch (Exception ex)
                 {
                     m_log.InfoFormat("[WORLD MAP]: exception on parse of RequestMapItems reply from {0}: {1}", httpserver, ex.Message);
-                    responseMap["connect"] = OSD.FromBoolean(false);
-
                     lock (m_blacklistedregions)
                     {
                         if (!m_blacklistedregions.ContainsKey(regionhandle))
                             m_blacklistedregions.Add(regionhandle, Environment.TickCount);
                     }
 
-                    return responseMap;
+                    Interlocked.Decrement(ref nAsyncRequests);
+                    return;
                 }
             }
 
@@ -986,7 +916,78 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                 }
             }
 
-            return responseMap;
+            Interlocked.Decrement(ref nAsyncRequests);
+
+            if (id != UUID.Zero)
+            {
+                ScenePresence av = null;
+                m_scene.TryGetScenePresence(id, out av);
+                if (av != null)
+                {
+                    if (responseMap.ContainsKey(itemtype.ToString()))
+                    {
+                        List<mapItemReply> returnitems = new List<mapItemReply>();
+                        OSDArray itemarray = (OSDArray)responseMap[itemtype.ToString()];
+                        for (int i = 0; i < itemarray.Count; i++)
+                        {
+                            OSDMap mapitem = (OSDMap)itemarray[i];
+                            mapItemReply mi = new mapItemReply();
+                            mi.x = (uint)mapitem["X"].AsInteger();
+                            mi.y = (uint)mapitem["Y"].AsInteger();
+                            mi.id = mapitem["ID"].AsUUID();
+                            mi.Extra = mapitem["Extra"].AsInteger();
+                            mi.Extra2 = mapitem["Extra2"].AsInteger();
+                            mi.name = mapitem["Name"].AsString();
+                            returnitems.Add(mi);
+                        }
+                        av.ControllingClient.SendMapItemReply(returnitems.ToArray(), itemtype, flags);
+                    }
+
+                    // Service 7 (MAP_ITEM_LAND_FOR_SALE)
+                    itemtype = 7;
+
+                    if (responseMap.ContainsKey(itemtype.ToString()))
+                    {
+                        List<mapItemReply> returnitems = new List<mapItemReply>();
+                        OSDArray itemarray = (OSDArray)responseMap[itemtype.ToString()];
+                        for (int i = 0; i < itemarray.Count; i++)
+                        {
+                            OSDMap mapitem = (OSDMap)itemarray[i];
+                            mapItemReply mi = new mapItemReply();
+                            mi.x = (uint)mapitem["X"].AsInteger();
+                            mi.y = (uint)mapitem["Y"].AsInteger();
+                            mi.id = mapitem["ID"].AsUUID();
+                            mi.Extra = mapitem["Extra"].AsInteger();
+                            mi.Extra2 = mapitem["Extra2"].AsInteger();
+                            mi.name = mapitem["Name"].AsString();
+                            returnitems.Add(mi);
+                        }
+                        av.ControllingClient.SendMapItemReply(returnitems.ToArray(), itemtype, flags);
+                    }
+
+                    // Service 1 (MAP_ITEM_TELEHUB)
+                    itemtype = 1;
+
+                    if (responseMap.ContainsKey(itemtype.ToString()))
+                    {
+                        List<mapItemReply> returnitems = new List<mapItemReply>();
+                        OSDArray itemarray = (OSDArray)responseMap[itemtype.ToString()];
+                        for (int i = 0; i < itemarray.Count; i++)
+                        {
+                            OSDMap mapitem = (OSDMap)itemarray[i];
+                            mapItemReply mi = new mapItemReply();
+                            mi.x = (uint)mapitem["X"].AsInteger();
+                            mi.y = (uint)mapitem["Y"].AsInteger();
+                            mi.id = mapitem["ID"].AsUUID();
+                            mi.Extra = mapitem["Extra"].AsInteger();
+                            mi.Extra2 = mapitem["Extra2"].AsInteger();
+                            mi.name = mapitem["Name"].AsString();
+                            returnitems.Add(mi);
+                        }
+                        av.ControllingClient.SendMapItemReply(returnitems.ToArray(), itemtype, flags);
+                    }
+                }
+            }
         }
 
         /// <summary>
@@ -996,8 +997,10 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
         /// <param name="minY"></param>
         /// <param name="maxX"></param>
         /// <param name="maxY"></param>
-        public virtual void RequestMapBlocks(IClientAPI remoteClient, int minX, int minY, int maxX, int maxY, uint flag)
+        public void RequestMapBlocks(IClientAPI remoteClient, int minX, int minY, int maxX, int maxY, uint flag)
         {
+            m_log.DebugFormat("[WoldMapModule] RequestMapBlocks {0}={1}={2}={3} {4}", minX, minY, maxX, maxY, flag);
+/*  this flag does not seem to mean what his says
             if ((flag & 0x10000) != 0)  // user clicked on qthe map a tile that isn't visible
             {
                 List<MapBlockData> response = new List<MapBlockData>();
@@ -1006,24 +1009,27 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                 // on an unloaded square.
                 // But make sure: Look whether the one we requested is in there
                 List<GridRegion> regions = m_scene.GridService.GetRegionRange(m_scene.RegionInfo.ScopeID,
-                                    (int)Util.RegionToWorldLoc((uint)minX), (int)Util.RegionToWorldLoc((uint)maxX),
-                                    (int)Util.RegionToWorldLoc((uint)minY), (int)Util.RegionToWorldLoc((uint)maxY) );
-
-                m_log.DebugFormat("[WORLD MAP MODULE] RequestMapBlocks min=<{0},{1}>, max=<{2},{3}>, flag={4}, cntFound={5}",
-                                            minX, minY, maxX, maxY, flag.ToString("X"), regions.Count);
+                    (int)Util.RegionToWorldLoc((uint)minX),
+                    (int)Util.RegionToWorldLoc((uint)maxX),
+                    (int)Util.RegionToWorldLoc((uint)minY),
+                    (int)Util.RegionToWorldLoc((uint)maxY) );
+ 
                 if (regions != null)
                 {
                     foreach (GridRegion r in regions)
                     {
-                        if (r.RegionLocX == Util.RegionToWorldLoc((uint)minX)
-                            && r.RegionLocY == Util.RegionToWorldLoc((uint)minY) )
+                        if (r.RegionLocX == Util.RegionToWorldLoc((uint)minX) &&
+                            r.RegionLocY == Util.RegionToWorldLoc((uint)minY))
                         {
                             // found it => add it to response
-                            // Version 2 viewers can handle the larger regions
+                            MapBlockData block = new MapBlockData();
                             if ((flag & 2) == 2)
                                 response.AddRange(Map2BlockFromGridRegion(r, flag));
                             else
-                                response.Add(MapBlockFromGridRegion(r, flag));
+                            {
+                                MapBlockFromGridRegion(block, r, flag);
+                                response.Add(block);
+                            }
                             break;
                         }
                     }
@@ -1036,7 +1042,10 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                     block.X = (ushort)minX;
                     block.Y = (ushort)minY;
                     block.Access = (byte)SimAccess.Down; // means 'simulator is offline'
+<<<<<<< HEAD
                     // block.Access = (byte)SimAccess.NonExistent;
+=======
+>>>>>>> avn/ubitvar
                     response.Add(block);
                 }
                 // The lower 16 bits are an unsigned int16
@@ -1045,36 +1054,126 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
             else
             {
                 // normal mapblock request. Use the provided values
+ */
                 GetAndSendBlocks(remoteClient, minX, minY, maxX, maxY, flag);
-            }
+ //           }
         }
 
         protected virtual List<MapBlockData> GetAndSendBlocks(IClientAPI remoteClient, int minX, int minY, int maxX, int maxY, uint flag)
         {
+            MapBlockRequestData req = new MapBlockRequestData();
+
+            req.client = remoteClient;
+            req.minX = minX;
+            req.maxX = maxX;
+            req.minY = minY;
+            req.maxY = maxY;
+            req.flags = flag;
+
+            lock (m_mapBlockRequestEvent)
+            {
+                if (!m_mapBlockRequests.ContainsKey(remoteClient.AgentId))
+                    m_mapBlockRequests[remoteClient.AgentId] = new Queue<MapBlockRequestData>();
+                m_mapBlockRequests[remoteClient.AgentId].Enqueue(req);
+                m_mapBlockRequestEvent.Set();
+            }
+
+            return new List<MapBlockData>();
+        }
+
+        protected void MapBlockSendThread()
+        {
+            while (true)
+            {
+                List<MapBlockRequestData> thisRunData = new List<MapBlockRequestData>();
+
+                m_mapBlockRequestEvent.WaitOne();
+                lock (m_mapBlockRequestEvent)
+                {
+                    int total = 0;
+                    foreach (Queue<MapBlockRequestData> q in m_mapBlockRequests.Values)
+                    {
+                        if (q.Count > 0)
+                            thisRunData.Add(q.Dequeue());
+
+                        total += q.Count;
+                    }
+
+                    if (total == 0)
+                        m_mapBlockRequestEvent.Reset();
+                }
+
+                foreach (MapBlockRequestData req in thisRunData)
+                {
+                    // Null client stops thread
+                    if (req.client == null)
+                        return;
+
+                    GetAndSendBlocksInternal(req.client, req.minX, req.minY, req.maxX, req.maxY, req.flags);
+                }
+
+                Thread.Sleep(50);
+            }
+        }
+
+        protected virtual List<MapBlockData> GetAndSendBlocksInternal(IClientAPI remoteClient, int minX, int minY, int maxX, int maxY, uint flag)
+        {
+            List<MapBlockData> allBlocks = new List<MapBlockData>();
             List<MapBlockData> mapBlocks = new List<MapBlockData>();
             List<GridRegion> regions = m_scene.GridService.GetRegionRange(m_scene.RegionInfo.ScopeID,
-                        (int)Util.RegionToWorldLoc((uint)(minX - 4)), (int)Util.RegionToWorldLoc((uint)(maxX + 4)),
-                        (int)Util.RegionToWorldLoc((uint)(minY - 4)), (int)Util.RegionToWorldLoc((uint)(maxY + 4)) );
-            //m_log.DebugFormat("{0} GetAndSendBlocks. min=<{1},{2}>, max=<{3},{4}>, cntFound={5}",
-            //                            LogHeader, minX, minY, maxX, maxY, regions.Count);
+                minX * (int)Constants.RegionSize,
+                maxX * (int)Constants.RegionSize,
+                minY * (int)Constants.RegionSize,
+                maxY * (int)Constants.RegionSize);
+//                (minX - 4) * (int)Constants.RegionSize,
+//                (maxX + 4) * (int)Constants.RegionSize,
+//                (minY - 4) * (int)Constants.RegionSize,
+//                (maxY + 4) * (int)Constants.RegionSize);
+
+            //mb it means this
+            if(regions.Count == 0 && (flag & 0x10000) != 0)
+            {
+                MapBlockData block = new MapBlockData();
+                block.X = (ushort)minX;
+                block.Y = (ushort)minY;
+                block.MapImageId = UUID.Zero;
+                block.Access = (byte)SimAccess.NonExistent;
+                allBlocks.Add(block);
+                mapBlocks.Add(block);
+                remoteClient.SendMapBlock(mapBlocks, flag & 0xffff);
+                return allBlocks;
+            }
+
             foreach (GridRegion r in regions)
             {
-                // Version 2 viewers can handle the larger regions
+                MapBlockData block = new MapBlockData();
                 if ((flag & 2) == 2)
-                    mapBlocks.AddRange(Map2BlockFromGridRegion(r, flag));
+                {
+                    List<MapBlockData> blocks = Map2BlockFromGridRegion(r, flag);
+                    mapBlocks.AddRange(blocks);
+                    allBlocks.AddRange(blocks);
+                }
                 else
-                    mapBlocks.Add(MapBlockFromGridRegion(r, flag));
+                {
+                    MapBlockFromGridRegion(block, r, flag);
+                    mapBlocks.Add(block);
+                    allBlocks.Add(block);
+                }
+                if (mapBlocks.Count >= 10)
+                {
+                    remoteClient.SendMapBlock(mapBlocks, flag & 0xffff);
+                    mapBlocks.Clear();
+                    Thread.Sleep(50);
+                }
             }
-            remoteClient.SendMapBlock(mapBlocks, flag & 0xffff);
+            if (mapBlocks.Count > 0)
+                remoteClient.SendMapBlock(mapBlocks, flag & 0xffff);
 
-            return mapBlocks;
+            return allBlocks;
         }
 
-        // Fill a passed MapBlockData from a GridRegion
-        public MapBlockData MapBlockFromGridRegion(GridRegion r, uint flag)
+        public void MapBlockFromGridRegion(MapBlockData block, GridRegion r, uint flag)
         {
-            MapBlockData block = new MapBlockData();
-
             block.Access = r.Access;
             switch (flag & 0xffff)
             {
@@ -1089,12 +1188,10 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                     break;
             }
             block.Name = r.RegionName;
-            block.X = (ushort)Util.WorldToRegionLoc((uint)r.RegionLocX);
-            block.Y = (ushort)Util.WorldToRegionLoc((uint)r.RegionLocY);
-            block.SizeX = (ushort) r.RegionSizeX;
-            block.SizeY = (ushort) r.RegionSizeY;
-
-            return block;
+            block.X = (ushort)(r.RegionLocX / Constants.RegionSize);
+            block.Y = (ushort)(r.RegionLocY / Constants.RegionSize);
+            block.SizeX = (ushort)r.RegionSizeX;
+            block.SizeY = (ushort)r.RegionSizeY;
         }
 
         public List<MapBlockData> Map2BlockFromGridRegion(GridRegion r, uint flag)
@@ -1132,7 +1229,6 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
             return blocks;
         }
 
-
         public Hashtable OnHTTPThrottled(Hashtable keysvals)
         {
             Hashtable reply = new Hashtable();
@@ -1267,7 +1363,8 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
 
             foreach (GridRegion r in regions)
             {
-                MapBlockData mapBlock = MapBlockFromGridRegion(r, 0);
+                MapBlockData mapBlock = new MapBlockData();
+                MapBlockFromGridRegion(mapBlock, r , 0);
                 AssetBase texAsset = m_scene.AssetService.Get(mapBlock.MapImageId.ToString());
 
                 if (texAsset != null)
@@ -1320,6 +1417,9 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
             if (consoleScene != null && consoleScene != m_scene)
                 return;
 
+            GenerateMaptile();
+        }
+/*
             if (m_mapImageGenerator == null)
             {
                 Console.WriteLine("No map image generator available for {0}", m_scene.Name);
@@ -1329,18 +1429,17 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
             using (Bitmap mapbmp = m_mapImageGenerator.CreateMapTile())
             {
                 GenerateMaptile(mapbmp);
-                m_mapImageServiceModule.UploadMapTile(m_scene, mapbmp);
+                if(m_mapImageServiceModule != null)
+                    m_mapImageServiceModule.UploadMapTile(m_scene, mapbmp);
             }
         }
-
+*/
         public OSD HandleRemoteMapItemRequest(string path, OSD request, string endpoint)
         {
             uint xstart = 0;
             uint ystart = 0;
 
-            Util.RegionHandleToWorldLoc(m_scene.RegionInfo.RegionHandle,out xstart,out ystart);
-            // m_log.DebugFormat("{0} HandleRemoteMapItemRequest. loc=<{1},{2}>",
-            //             LogHeader, Util.WorldToRegionLoc(xstart), Util.WorldToRegionLoc(ystart));
+            Util.RegionHandleToWorldLoc(m_scene.RegionInfo.RegionHandle, out xstart, out ystart);
 
             // Service 6 (MAP_ITEM_AGENTS_LOCATION; green dots)
 
@@ -1362,7 +1461,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.ForEachRootScenePresence(delegate(ScenePresence sp)
                 {
                     OSDMap responsemapdata = new OSDMap();
@@ -1459,15 +1558,23 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
             if (m_scene.Heightmap == null)
                 return;
 
+            if (m_mapImageGenerator == null)
+            {
+                Console.WriteLine("No map image generator available for {0}", m_scene.Name);
+                return;
+            }
             m_log.DebugFormat("[WORLD MAP]: Generating map image for {0}", m_scene.Name);
 
             using (Bitmap mapbmp = m_mapImageGenerator.CreateMapTile())
             {
                 // V1 (This Module)
-                GenerateMaptile(mapbmp);
+                if(m_scene.RegionInfo.RegionSizeX <= Constants.RegionSize &&
+                    m_scene.RegionInfo.RegionSizeY <= Constants.RegionSize)
+                    GenerateMaptile(mapbmp);
 
                 // v2/3 (MapImageServiceModule)
-                m_mapImageServiceModule.UploadMapTile(m_scene, mapbmp);
+                if(m_mapImageServiceModule !=null)
+                    m_mapImageServiceModule.UploadMapTile(m_scene, mapbmp);
             }
         }
 
@@ -1553,6 +1660,12 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
             {
                 m_rootAgents.Remove(avatar.UUID);
             }
+
+            lock (m_mapBlockRequestEvent)
+            {
+                if (m_mapBlockRequests.ContainsKey(avatar.UUID))
+                    m_mapBlockRequests.Remove(avatar.UUID);
+            }
         }
 
         public void OnRegionUp(GridRegion otherRegion)
@@ -1630,15 +1743,16 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
 
                     using (SolidBrush yellow = new SolidBrush(Color.FromArgb(255, 249, 223, 9)))
                     {
-                        for (int x = 0 ; x < regionLandTilesX ; x++)
+                        for (int x = 0; x < regionLandTilesX ; x++)
                         {
-                            for (int y = 0 ; y < regionLandTilesY ; y++)
+                            for (int y = 0; y < regionLandTilesY ; y++)
                             {
                                 if (saleBitmap[x, y])
                                     g.FillRectangle(
-                                        yellow, x * landTileSize, 
-                                        regionSizeX - landTileSize - (y * landTileSize), 
-                                        landTileSize, 
+                                        yellow,
+                                        x * landTileSize,
+                                        regionSizeX - landTileSize - (y * landTileSize),
+                                        landTileSize,
                                         landTileSize);
                             }
                         }
@@ -1668,4 +1782,14 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
         public uint itemtype;
         public ulong regionhandle;
     }
+
+    public struct MapBlockRequestData
+    {
+        public IClientAPI client;
+        public int minX;
+        public int minY;
+        public int maxX;
+        public int maxY;
+        public uint flags;
+    }
 }