79 files changed, 7001 insertions, 4346 deletions

diff --git a/OpenSim/Region/CoreModules/World/Access/AccessModule.cs b/OpenSim/Region/CoreModules/World/Access/AccessModule.cs
index f567cab..081439a 100644
--- a/OpenSim/Region/CoreModules/World/Access/AccessModule.cs
+++ b/OpenSim/Region/CoreModules/World/Access/AccessModule.cs
@@ -44,7 +44,7 @@ namespace OpenSim.Region.CoreModules.World
     public class AccessModule : ISharedRegionModule
     {
 //        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-                
+
         private List<Scene> m_SceneList = new List<Scene>();
 
         public void Initialise(IConfigSource config)
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
index 9c6706f..41515c0 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
@@ -40,6 +40,7 @@ using OpenSim.Framework.Monitoring;
 using OpenSim.Framework.Serialization;
 using OpenSim.Framework.Serialization.External;
 using OpenSim.Region.CoreModules.World.Terrain;
+using OpenSim.Region.CoreModules.World.Land;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Framework.Scenes.Serialization;
@@ -76,14 +77,14 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                 SceneObjects = new List<SceneObjectGroup>();
             }
         }
-        
+
 
         /// <summary>
         /// The maximum major version of OAR that we can read.  Minor versions shouldn't need a max number since version
         /// bumps here should be compatible.
         /// </summary>
         public static int MAX_MAJOR_VERSION = 1;
-        
+
         /// <summary>
         /// Has the control file been loaded for this archive?
         /// </summary>
@@ -126,12 +127,29 @@ namespace OpenSim.Region.CoreModules.World.Archiver
         /// </value>
         protected float m_rotation = 0f;
 
+       /// <value>
+        /// original oar region size. not using Constants.RegionSize
+        /// </value>
+        protected Vector3 m_incomingRegionSize = new Vector3(256f, 256f, float.MaxValue);
+
+        /// <value>
+        /// Center around which to apply the rotation relative to the original oar position
+        /// </value>
+        protected Vector3 m_rotationCenter = new Vector3(128f, 128f, 0f);
+
+        /// <value>
+        /// Corner 1 of a bounding cuboid which specifies which objects we load from the oar
+        /// </value>
+        protected Vector3 m_boundingOrigin = Vector3.Zero;
+
         /// <value>
-        /// Center around which to apply the rotation relative to the origional oar position
+        /// Size of a bounding cuboid which specifies which objects we load from the oar
         /// </value>
-        protected Vector3 m_rotationCenter = new Vector3(Constants.RegionSize / 2f, Constants.RegionSize / 2f, 0f);
+        protected Vector3 m_boundingSize = new Vector3(Constants.MaximumRegionSize, Constants.MaximumRegionSize, float.MaxValue);
 
         protected bool m_noObjects = false;
+        protected bool m_boundingBox = false;
+        protected bool m_debug = false;
 
         /// <summary>
         /// Used to cache lookups for valid uuids.
@@ -160,10 +178,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 +189,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 +206,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 +217,45 @@ 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"] 
-                                : new Vector3(scene.RegionInfo.RegionSizeX / 2f, scene.RegionInfo.RegionSizeY / 2f, 0f);
 
-            // Zero can never be a valid user or group id
+            m_boundingOrigin = Vector3.Zero;
+            m_boundingSize = new Vector3(scene.RegionInfo.RegionSizeX, scene.RegionInfo.RegionSizeY, float.MaxValue);
+
+            if (options.ContainsKey("bounding-origin"))
+            {
+                Vector3 boOption = (Vector3)options["bounding-origin"];
+                if (boOption != m_boundingOrigin)
+                {
+                    m_boundingOrigin = boOption;
+                }
+                m_boundingBox = true;
+            }
+
+            if (options.ContainsKey("bounding-size"))
+            {
+                Vector3 bsOption = (Vector3)options["bounding-size"];
+                bool clip = false;
+                if (bsOption.X <= 0 || bsOption.X > m_boundingSize.X)
+                {
+                    bsOption.X = m_boundingSize.X;
+                    clip = true;
+                }
+                if (bsOption.Y <= 0 || bsOption.Y > m_boundingSize.Y)
+                {
+                    bsOption.Y = m_boundingSize.Y;
+                    clip = true;
+                }
+                if (bsOption != m_boundingSize)
+                {
+                    m_boundingSize = bsOption;
+                    m_boundingBox = true;
+                }
+                if (clip) m_log.InfoFormat("[ARCHIVER]: The bounding cube specified is larger than the destination region! Clipping to {0}.", m_boundingSize.ToString());
+            }
+
+            m_debug = options.ContainsKey("debug");
+
+            // Zero can never be a valid user id (or group)
             m_validUserUuids[UUID.Zero] = false;
             m_validGroupUuids[UUID.Zero] = false;
 
@@ -210,7 +263,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 +273,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;
 
@@ -233,6 +286,11 @@ namespace OpenSim.Region.CoreModules.World.Archiver
         /// </summary>
         public void DearchiveRegion()
         {
+            DearchiveRegion(true);
+        }
+
+        public void DearchiveRegion(bool shouldStartScripts)
+        {
             int successfulAssetRestores = 0;
             int failedAssetRestores = 0;
 
@@ -255,7 +313,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                 {
                     //m_log.DebugFormat(
                     //    "[ARCHIVER]: Successfully read {0} ({1} bytes)", filePath, data.Length);
-                    
+
                     if (TarArchiveReader.TarEntryType.TYPE_DIRECTORY == entryType)
                         continue;
 
@@ -301,11 +359,11 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                     else if (!m_merge && filePath.StartsWith(ArchiveConstants.SETTINGS_PATH))
                     {
                         LoadRegionSettings(scene, filePath, data, dearchivedScenes);
-                    } 
+                    }
                     else if (filePath.StartsWith(ArchiveConstants.LANDDATA_PATH) && (!m_merge || m_forceParcels))
                     {
                         sceneContext.SerialisedParcels.Add(Encoding.UTF8.GetString(data));
-                    } 
+                    }
                     else if (filePath == ArchiveConstants.CONTROL_FILE_PATH)
                     {
                         // Ignore, because we already read the control file
@@ -353,7 +411,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                 {
                     LoadParcels(sceneContext.Scene, sceneContext.SerialisedParcels);
                     LoadObjects(sceneContext.Scene, sceneContext.SerialisedSceneObjects, sceneContext.SceneObjects);
-                    
+
                     // Inform any interested parties that the region has changed. We waited until now so that all
                     // of the region's objects will be loaded when we send this notification.
                     IEstateModule estateModule = sceneContext.Scene.RequestModuleInterface<IEstateModule>();
@@ -372,22 +430,25 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             // Start the scripts. We delayed this because we want the OAR to finish loading ASAP, so
             // that users can enter the scene. If we allow the scripts to start in the loop above
             // then they significantly increase the time until the OAR finishes loading.
-            WorkManager.RunInThread(o =>
+            if (shouldStartScripts)
             {
-                Thread.Sleep(15000);
-                m_log.Info("[ARCHIVER]: Starting scripts in scene objects");
-
-                foreach (DearchiveContext sceneContext in sceneContexts.Values)
+                WorkManager.RunInThread(o =>
                 {
-                    foreach (SceneObjectGroup sceneObject in sceneContext.SceneObjects)
+                    Thread.Sleep(15000);
+                    m_log.Info("[ARCHIVER]: Starting scripts in scene objects");
+
+                    foreach (DearchiveContext sceneContext in sceneContexts.Values)
                     {
-                        sceneObject.CreateScriptInstances(0, false, sceneContext.Scene.DefaultScriptEngine, 0); // StateSource.RegionStart
-                        sceneObject.ResumeScripts();
-                    }
+                        foreach (SceneObjectGroup sceneObject in sceneContext.SceneObjects)
+                        {
+                            sceneObject.CreateScriptInstances(0, false, sceneContext.Scene.DefaultScriptEngine, 0); // StateSource.RegionStart
+                            sceneObject.ResumeScripts();
+                        }
 
-                    sceneContext.SceneObjects.Clear();
-                }
-            }, null, string.Format("ReadArchiveStartScripts (request {0})", m_requestId));
+                        sceneContext.SceneObjects.Clear();
+                    }
+                }, null, string.Format("ReadArchiveStartScripts (request {0})", m_requestId));
+            }
 
             m_log.InfoFormat("[ARCHIVER]: Successfully loaded archive");
 
@@ -418,7 +479,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             {
                 if (TarArchiveReader.TarEntryType.TYPE_DIRECTORY == entryType)
                     continue;
-                    
+
                 if (filePath == ArchiveConstants.CONTROL_FILE_PATH)
                 {
                     LoadControlFile(filePath, data, dearchivedScenes);
@@ -435,7 +496,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                     // If the control file wasn't the first file then reset the read pointer
                     if (!firstFile)
                     {
-                        m_log.Warn("Control file wasn't the first file in the archive");
+                        m_log.Warn("[ARCHIVER]: Control file wasn't the first file in the archive");
                         if (m_loadStream.CanSeek)
                         {
                             m_loadStream.Seek(0, SeekOrigin.Begin);
@@ -452,7 +513,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                         else
                         {
                             // There isn't currently a scenario where this happens, but it's best to add a check just in case
-                            throw new Exception("Error reading archive: control file wasn't the first file, and the input stream doesn't allow seeking");
+                            throw new Exception("[ARCHIVER]: Error reading archive: control file wasn't the first file, and the input stream doesn't allow seeking");
                         }
                     }
 
@@ -462,9 +523,9 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                 firstFile = false;
             }
 
-            throw new Exception("Control file not found");
+            throw new Exception("[ARCHIVER]: Control file not found");
         }
-        
+
         /// <summary>
         /// Load serialized scene objects.
         /// </summary>
@@ -473,12 +534,16 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             // Reload serialized prims
             m_log.InfoFormat("[ARCHIVER]: Loading {0} scene objects.  Please wait.", serialisedSceneObjects.Count);
 
-            OpenMetaverse.Quaternion rot = OpenMetaverse.Quaternion.CreateFromAxisAngle(0, 0, 1, m_rotation);
+            // Convert rotation to radians
+            double rotation = Math.PI * m_rotation / 180f;
+
+            OpenMetaverse.Quaternion rot = OpenMetaverse.Quaternion.CreateFromAxisAngle(0, 0, 1, (float)rotation);
 
             UUID oldTelehubUUID = scene.RegionInfo.RegionSettings.TelehubObject;
 
             IRegionSerialiserModule serialiser = scene.RequestModuleInterface<IRegionSerialiserModule>();
             int sceneObjectsLoadedCount = 0;
+            Vector3 boundingExtent = new Vector3(m_boundingOrigin.X + m_boundingSize.X, m_boundingOrigin.Y + m_boundingSize.Y, m_boundingOrigin.Z + m_boundingSize.Z);
 
             foreach (string serialisedSceneObject in serialisedSceneObjects)
             {
@@ -488,7 +553,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                 // Really large xml files (multi megabyte) appear to cause
                 // memory problems
                 // when loading the xml.  But don't enable this check yet
-                
+
                 if (serialisedSceneObject.Length > 5000000)
                 {
                     m_log.Error("[ARCHIVER]: Ignoring xml since size > 5000000);");
@@ -498,31 +563,52 @@ namespace OpenSim.Region.CoreModules.World.Archiver
 
                 SceneObjectGroup sceneObject = serialiser.DeserializeGroupFromXml2(serialisedSceneObject);
 
+                Vector3 pos = sceneObject.AbsolutePosition;
+                if (m_debug)
+                    m_log.DebugFormat("[ARCHIVER]: Loading object from OAR with original scene position {0}.", pos.ToString());
+
                 // Happily this does not do much to the object since it hasn't been added to the scene yet
                 if (!sceneObject.IsAttachment)
                 {
-                    if (m_displacement != Vector3.Zero || m_rotation != 0f)
+                    if (m_rotation != 0f)
                     {
-                        Vector3 pos = sceneObject.AbsolutePosition;
-                        if (m_rotation != 0f)
-                        {
-                            // Rotate the object
-                            sceneObject.RootPart.RotationOffset = rot * sceneObject.GroupRotation;
-                            // Get object position relative to rotation axis
-                            Vector3 offset = pos - m_rotationCenter;
-                            // Rotate the object position
-                            offset *= rot;
-                            // Restore the object position back to relative to the region
-                            pos = m_rotationCenter + offset;
-                        }
-                        if (m_displacement != Vector3.Zero)
+                        //fix the rotation center to the middle of the incoming region now as it's otherwise hopelessly confusing on varRegions
+                        //as it only works with objects and terrain (using old Merge method) and not parcels
+                        m_rotationCenter.X = m_incomingRegionSize.X / 2;
+                        m_rotationCenter.Y = m_incomingRegionSize.Y / 2;
+
+                        // Rotate the object
+                        sceneObject.RootPart.RotationOffset = rot * sceneObject.GroupRotation;
+                        // Get object position relative to rotation axis
+                        Vector3 offset = pos - m_rotationCenter;
+                        // Rotate the object position
+                        offset *= rot;
+                        // Restore the object position back to relative to the region
+                        pos = m_rotationCenter + offset;
+                        if (m_debug) m_log.DebugFormat("[ARCHIVER]: After rotation, object from OAR is at scene position {0}.", pos.ToString());
+                    }
+                    if (m_boundingBox)
+                    {
+                        if (pos.X < m_boundingOrigin.X || pos.X >= boundingExtent.X
+                            || pos.Y < m_boundingOrigin.Y || pos.Y >= boundingExtent.Y
+                            || pos.Z < m_boundingOrigin.Z || pos.Z >= boundingExtent.Z)
                         {
-                            pos += m_displacement;
+                            if (m_debug) m_log.DebugFormat("[ARCHIVER]: Skipping object from OAR in scene because it's position {0} is outside of bounding cube.", pos.ToString());
+                            continue;
                         }
-                        sceneObject.AbsolutePosition = pos;
+                        //adjust object position to be relative to <0,0> so we can apply the displacement
+                        pos.X -= m_boundingOrigin.X;
+                        pos.Y -= m_boundingOrigin.Y;
+                    }
+                    if (m_displacement != Vector3.Zero)
+                    {
+                        pos += m_displacement;
+                        if (m_debug) m_log.DebugFormat("[ARCHIVER]: After displacement, object from OAR is at scene position {0}.", pos.ToString());
                     }
+                    sceneObject.AbsolutePosition = pos;
                 }
-
+                if (m_debug)
+                    m_log.DebugFormat("[ARCHIVER]: Placing object from OAR in scene at position {0}.  ", pos.ToString());
 
                 bool isTelehub = (sceneObject.UUID == oldTelehubUUID) && (oldTelehubUUID != UUID.Zero);
 
@@ -554,11 +640,11 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             int ignoredObjects = serialisedSceneObjects.Count - sceneObjectsLoadedCount;
 
             if (ignoredObjects > 0)
-                m_log.WarnFormat("[ARCHIVER]: Ignored {0} scene objects that already existed in the scene", ignoredObjects);
+                m_log.WarnFormat("[ARCHIVER]: Ignored {0} scene objects that already existed in the scene or were out of bounds", ignoredObjects);
 
             if (oldTelehubUUID != UUID.Zero)
             {
-                m_log.WarnFormat("Telehub object not found: {0}", oldTelehubUUID);
+                m_log.WarnFormat("[ARCHIVER]: Telehub object not found: {0}", oldTelehubUUID);
                 scene.RegionInfo.RegionSettings.TelehubObject = UUID.Zero;
                 scene.RegionInfo.RegionSettings.ClearSpawnPoints();
             }
@@ -600,6 +686,16 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                 // being no copy/no mod for everyone
                 lock (part.TaskInventory)
                 {
+/* avination code disabled for opensim
+                    // 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 +716,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>
@@ -635,17 +732,88 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             // Reload serialized parcels
             m_log.InfoFormat("[ARCHIVER]: Loading {0} parcels.  Please wait.", serialisedParcels.Count);
             List<LandData> landData = new List<LandData>();
+            ILandObject landObject = scene.RequestModuleInterface<ILandObject>();
+            List<ILandObject> parcels;
+            Vector3 parcelDisp = new Vector3(m_displacement.X, m_displacement.Y, 0f);
+            Vector2 displacement = new Vector2(m_displacement.X, m_displacement.Y);
+            Vector2 boundingOrigin = new Vector2(m_boundingOrigin.X, m_boundingOrigin.Y);
+            Vector2 boundingSize = new Vector2(m_boundingSize.X, m_boundingSize.Y);
+            Vector2 regionSize = new Vector2(scene.RegionInfo.RegionSizeX, scene.RegionInfo.RegionSizeY);
+
+            // Gather any existing parcels before we add any more. Later as we add parcels we can check if the new parcel
+            // data overlays any of the old data, and we can modify and remove (if empty) the old parcel so that there's no conflict
+            parcels = scene.LandChannel.AllParcels();
+
             foreach (string serialisedParcel in serialisedParcels)
             {
                 LandData parcel = LandDataSerializer.Deserialize(serialisedParcel);
+                bool overrideRegionSize = true;  //use the src land parcel data size not the dst region size
+                bool isEmptyNow;
+                Vector3 AABBMin;
+                Vector3 AABBMax;
+
+                // create a new LandObject that we can use to manipulate the incoming source parcel data
+                // this is ok, but just beware that some of the LandObject functions (that we haven't used here) still
+                // assume we're always using the destination region size
+                LandData ld = new LandData();
+                landObject = new LandObject(ld, scene);
+                landObject.LandData = parcel;
+
+                bool[,] srcLandBitmap = landObject.ConvertBytesToLandBitmap(overrideRegionSize);
+                if (landObject.IsLandBitmapEmpty(srcLandBitmap))
+                {
+                    m_log.InfoFormat("[ARCHIVER]: Skipping source parcel {0} with GlobalID: {1} LocalID: {2} that has no claimed land.",
+                        parcel.Name, parcel.GlobalID, parcel.LocalID);
+                    continue;
+                }
+                //m_log.DebugFormat("[ARCHIVER]: Showing claimed land for source parcel: {0} with GlobalID: {1} LocalID: {2}.",
+                //   parcel.Name, parcel.GlobalID, parcel.LocalID);
+                //landObject.DebugLandBitmap(srcLandBitmap);
+
+                bool[,] dstLandBitmap = landObject.RemapLandBitmap(srcLandBitmap, displacement, m_rotation, boundingOrigin, boundingSize, regionSize, out isEmptyNow, out AABBMin, out AABBMax);
+                if (isEmptyNow)
+                {
+                    m_log.WarnFormat("[ARCHIVER]: Not adding destination parcel {0} with GlobalID: {1} LocalID: {2} because, after applying rotation, bounding and displacement, it has no claimed land.",
+                        parcel.Name, parcel.GlobalID, parcel.LocalID);
+                    continue;
+                }
+                //m_log.DebugFormat("[ARCHIVER]: Showing claimed land for destination parcel: {0} with GlobalID: {1} LocalID: {2} after applying rotation, bounding and displacement.",
+                //    parcel.Name, parcel.GlobalID, parcel.LocalID);
+                //landObject.DebugLandBitmap(dstLandBitmap);
+
+                landObject.LandBitmap = dstLandBitmap;
+                parcel.Bitmap = landObject.ConvertLandBitmapToBytes();
+                parcel.AABBMin = AABBMin;
+                parcel.AABBMax = AABBMax;
 
-                if (m_displacement != Vector3.Zero)
+                if (m_merge)
                 {
-                    Vector3 parcelDisp = new Vector3(m_displacement.X, m_displacement.Y, 0f);
-                    parcel.AABBMin += parcelDisp;
-                    parcel.AABBMax += parcelDisp;
+                    // give the remapped parcel a new GlobalID, in case we're using the same OAR twice and a bounding cube, displacement and --merge
+                    parcel.GlobalID = UUID.Random();
+
+                    //now check if the area of this new incoming parcel overlays an area in any existing parcels
+                    //and if so modify or lose the existing parcels
+                    for (int i = 0; i < parcels.Count; i++)
+                    {
+                        if (parcels[i] != null)
+                        {
+                            bool[,] modLandBitmap = parcels[i].ConvertBytesToLandBitmap(overrideRegionSize);
+                            modLandBitmap = parcels[i].RemoveFromLandBitmap(modLandBitmap, dstLandBitmap, out isEmptyNow, out AABBMin, out AABBMax);
+                            if (isEmptyNow)
+                            {
+                                parcels[i] = null;
+                            }
+                            else
+                            {
+                                parcels[i].LandBitmap = modLandBitmap;
+                                parcels[i].LandData.Bitmap = parcels[i].ConvertLandBitmapToBytes();
+                                parcels[i].LandData.AABBMin = AABBMin;
+                                parcels[i].LandData.AABBMax = AABBMax;
+                            }
+                        }
+                    }
                 }
-                
+
                 // Validate User and Group UUID's
 
                 if (!ResolveGroupUuid(parcel.GroupID))
@@ -679,19 +847,23 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                 }
                 parcel.ParcelAccessList = accessList;
 
-//                m_log.DebugFormat(
-//                    "[ARCHIVER]: Adding parcel {0}, local id {1}, owner {2}, group {3}, isGroupOwned {4}, area {5}", 
-//                    parcel.Name, parcel.LocalID, parcel.OwnerID, parcel.GroupID, parcel.IsGroupOwned, parcel.Area);
-                
+                if (m_debug) m_log.DebugFormat("[ARCHIVER]: Adding parcel {0}, local id {1}, owner {2}, group {3}, isGroupOwned {4}, area {5}",
+                                                    parcel.Name, parcel.LocalID, parcel.OwnerID, parcel.GroupID, parcel.IsGroupOwned, parcel.Area);
+
                 landData.Add(parcel);
             }
 
-            if (!m_merge)
+            if (m_merge)
             {
-                bool setupDefaultParcel = (landData.Count == 0);
-                scene.LandChannel.Clear(setupDefaultParcel);
+                for (int i = 0; i < parcels.Count; i++) //if merging then we need to also add back in any existing parcels
+                {
+                    if (parcels[i] != null) landData.Add(parcels[i].LandData);
+                }
             }
-            
+
+            m_log.InfoFormat("[ARCHIVER]: Clearing {0} parcels.", parcels.Count);
+            bool setupDefaultParcel = (landData.Count == 0);
+            scene.LandChannel.Clear(setupDefaultParcel);
             scene.EventManager.TriggerIncomingLandDataFromStorage(landData);
             m_log.InfoFormat("[ARCHIVER]: Restored {0} parcels.", landData.Count);
         }
@@ -772,6 +944,12 @@ namespace OpenSim.Region.CoreModules.World.Archiver
 
             if (m_assetService.GetMetadata(uuid) != null)
             {
+                sbyte asype = ArchiveConstants.EXTENSION_TO_ASSET_TYPE[extension];
+                if(asype == -2)
+                {
+
+                }
+
                 // m_log.DebugFormat("[ARCHIVER]: found existing asset {0}",uuid);
                 return true;
             }
@@ -780,6 +958,10 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             {
                 sbyte assetType = ArchiveConstants.EXTENSION_TO_ASSET_TYPE[extension];
 
+                if(assetType == -2)
+                {
+
+                }
                 if (assetType == (sbyte)AssetType.Unknown)
                 {
                     m_log.WarnFormat("[ARCHIVER]: Importing {0} byte asset {1} with unknown type", data.Length, uuid);
@@ -792,7 +974,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                             ModifySceneObject(m_rootScene, sog);
                             return true;
                         });
-                    
+
                     if (data == null)
                         return false;
                 }
@@ -898,7 +1080,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             currentRegionSettings.Save();
 
             scene.TriggerEstateSunUpdate();
-            
+
             IEstateModule estateModule = scene.RequestModuleInterface<IEstateModule>();
             if (estateModule != null)
                 estateModule.sendRegionHandshakeToAll();
@@ -918,13 +1100,13 @@ 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)
+                if (m_displacement != Vector3.Zero || m_rotation != 0f || m_boundingBox)
                 {
-                    Vector2 rotationCenter = new Vector2(m_rotationCenter.X, m_rotationCenter.Y);
-                    terrainModule.LoadFromStream(terrainPath, m_displacement, m_rotation, rotationCenter, ms);
+                    Vector2 boundingOrigin = new Vector2(m_boundingOrigin.X, m_boundingOrigin.Y);
+                    Vector2 boundingSize = new Vector2(m_boundingSize.X, m_boundingSize.Y);
+                    terrainModule.LoadFromStream(terrainPath, m_displacement, m_rotation, boundingOrigin, boundingSize, ms); ;
                 }
                 else
                 {
@@ -948,6 +1130,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             XmlNamespaceManager nsmgr = new XmlNamespaceManager(new NameTable());
             XmlParserContext context = new XmlParserContext(null, nsmgr, null, XmlSpace.None);
             XmlTextReader xtr = new XmlTextReader(Encoding.ASCII.GetString(data), XmlNodeType.Document, context);
+            xtr.ProhibitDtd = true;
 
             // Loaded metadata will be empty if no information exists in the archive
             dearchivedScenes.LoadedCreationDateTime = 0;
@@ -955,16 +1138,16 @@ namespace OpenSim.Region.CoreModules.World.Archiver
 
             bool multiRegion = false;
 
-            while (xtr.Read()) 
+            while (xtr.Read())
             {
-                if (xtr.NodeType == XmlNodeType.Element) 
+                if (xtr.NodeType == XmlNodeType.Element)
                 {
                     if (xtr.Name.ToString() == "archive")
                     {
                         int majorVersion = int.Parse(xtr["major_version"]);
                         int minorVersion = int.Parse(xtr["minor_version"]);
                         string version = string.Format("{0}.{1}", majorVersion, minorVersion);
-                        
+
                         if (majorVersion > MAX_MAJOR_VERSION)
                         {
                             throw new Exception(
@@ -972,15 +1155,15 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                                     "The OAR you are trying to load has major version number of {0} but this version of OpenSim can only load OARs with major version number {1} and below",
                                     majorVersion, MAX_MAJOR_VERSION));
                         }
-                        
+
                         m_log.InfoFormat("[ARCHIVER]: Loading OAR with version {0}", version);
                     }
-                    if (xtr.Name.ToString() == "datetime") 
+                    else if (xtr.Name.ToString() == "datetime")
                     {
                         int value;
                         if (Int32.TryParse(xtr.ReadElementContentAsString(), out value))
                             dearchivedScenes.LoadedCreationDateTime = value;
-                    } 
+                    }
                     else if (xtr.Name.ToString() == "row")
                     {
                         multiRegion = true;
@@ -994,13 +1177,26 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                     {
                         string id = xtr.ReadElementContentAsString();
                         dearchivedScenes.DefaultOriginalID = id;
-                        if (multiRegion)
+                        if(multiRegion)
                             dearchivedScenes.SetRegionOriginalID(id);
                     }
                     else if (xtr.Name.ToString() == "dir")
                     {
                         dearchivedScenes.SetRegionDirectory(xtr.ReadElementContentAsString());
                     }
+                    else if (xtr.Name.ToString() == "size_in_meters")
+                    {
+                        Vector3 value;
+                        string size = "<" + xtr.ReadElementContentAsString() + ",0>";
+                        if (Vector3.TryParse(size, out value))
+                        {
+                            m_incomingRegionSize = value;
+                            if(multiRegion)
+                                dearchivedScenes.SetRegionSize(m_incomingRegionSize);
+                            m_log.DebugFormat("[ARCHIVER]: Found region_size info {0}",
+                                        m_incomingRegionSize.ToString());
+                        }
+                    }
                 }
             }
 
@@ -1012,9 +1208,12 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                 dearchivedScenes.StartRegion();
                 dearchivedScenes.SetRegionOriginalID(dearchivedScenes.DefaultOriginalID);
                 dearchivedScenes.SetRegionDirectory("");
+                dearchivedScenes.SetRegionSize(m_incomingRegionSize);
             }
 
             ControlFileLoaded = true;
+            if(xtr != null)
+                xtr.Close();
 
             return dearchivedScenes;
         }
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveScenesGroup.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveScenesGroup.cs
index d8dace2..2fb4426 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveScenesGroup.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveScenesGroup.cs
@@ -50,7 +50,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
         /// The inner dictionaries contain each row's regions (key: X coordinate).
         /// </summary>
         public SortedDictionary<uint, SortedDictionary<uint, Scene>> Regions { get; set; }
-        
+
         /// <summary>
         /// The subdirectory where each region is stored in the archive.
         /// </summary>
@@ -152,7 +152,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                 }
             }
         }
-        
+
         /// <summary>
         /// Returns the scene at position 'location'.
         /// </summary>
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequest.cs
index cb2c7f1..ec273d6 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequest.cs
@@ -60,8 +60,8 @@ namespace OpenSim.Region.CoreModules.World.Archiver
         /// <summary>
         /// The minimum major version of OAR that we can write.
         /// </summary>
-        public static int MIN_MAJOR_VERSION = 0;       
-                
+        public static int MIN_MAJOR_VERSION = 0;
+
         /// <summary>
         /// The maximum major version of OAR that we can write.
         /// </summary>
@@ -112,7 +112,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                 m_log.ErrorFormat("{0} {1}", e.Message, e.StackTrace);
             }
         }
-        
+
         /// <summary>
         /// Constructor.
         /// </summary>
@@ -181,11 +181,13 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                 // Archive the regions
 
                 Dictionary<UUID, sbyte> assetUuids = new Dictionary<UUID, sbyte>();
+                HashSet<UUID> failedIDs = new HashSet<UUID>();
+                HashSet<UUID> uncertainAssetsUUIDs = new HashSet<UUID>();
 
                 scenesGroup.ForEachScene(delegate(Scene scene)
                 {
                     string regionDir = MultiRegionFormat ? scenesGroup.GetRegionDir(scene.RegionInfo.RegionID) : "";
-                    ArchiveOneRegion(scene, regionDir, assetUuids);
+                    ArchiveOneRegion(scene, regionDir, assetUuids, failedIDs, uncertainAssetsUUIDs);
                 });
 
                 // Archive the assets
@@ -193,23 +195,21 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                 if (SaveAssets)
                 {
                     m_log.DebugFormat("[ARCHIVER]: Saving {0} assets", assetUuids.Count);
-
-                    // Asynchronously request all the assets required to perform this archive operation
-                    AssetsRequest ar
-                        = new AssetsRequest(
+                    
+                    AssetsRequest ar = new AssetsRequest(
                             new AssetsArchiver(m_archiveWriter), assetUuids,
+                            failedIDs.Count,
                             m_rootScene.AssetService, m_rootScene.UserAccountService,
-                            m_rootScene.RegionInfo.ScopeID, options, ReceivedAllAssets);
-
-                    WorkManager.RunInThread(o => ar.Execute(), null, "Archive Assets Request");
-
-                    // CloseArchive() will be called from ReceivedAllAssets()
+                            m_rootScene.RegionInfo.ScopeID, options, null);
+                    ar.Execute();
+                    assetUuids = null;
                 }
                 else
                 {
                     m_log.DebugFormat("[ARCHIVER]: Not saving assets since --noassets was specified");
-                    CloseArchive(string.Empty);
+//                    CloseArchive(string.Empty);
                 }
+                CloseArchive(string.Empty);
             }
             catch (Exception e)
             {
@@ -218,7 +218,8 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             }
         }
 
-        private void ArchiveOneRegion(Scene scene, string regionDir, Dictionary<UUID, sbyte> assetUuids)
+        private void ArchiveOneRegion(Scene scene, string regionDir, Dictionary<UUID, sbyte> assetUuids,
+            HashSet<UUID> failedIDs, HashSet<UUID>  uncertainAssetsUUIDs)
         {
             m_log.InfoFormat("[ARCHIVER]: Writing region {0}", scene.Name);
 
@@ -226,7 +227,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             List<SceneObjectGroup> sceneObjects = new List<SceneObjectGroup>();
 
             int numObjectsSkippedPermissions = 0;
-         
+
             // Filter entities so that we only have scene objects.
             // FIXME: Would be nicer to have this as a proper list in SceneGraph, since lots of methods
             // end up having to do this
@@ -237,7 +238,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                 {
                     SceneObjectGroup sceneObject = (SceneObjectGroup)entity;
 
-                    if (!sceneObject.IsDeleted && !sceneObject.IsAttachment)
+                    if (!sceneObject.IsDeleted && !sceneObject.IsAttachment && !sceneObject.IsTemporary && !sceneObject.inTransit)
                     {
                         if (!CanUserArchiveObject(scene.RegionInfo.EstateSettings.EstateOwner, sceneObject, FilterContent, permissionsModule))
                         {
@@ -254,17 +255,39 @@ namespace OpenSim.Region.CoreModules.World.Archiver
 
             if (SaveAssets)
             {
-                UuidGatherer assetGatherer = new UuidGatherer(scene.AssetService, assetUuids);
+                UuidGatherer assetGatherer = new UuidGatherer(scene.AssetService, assetUuids, failedIDs, uncertainAssetsUUIDs);
                 int prevAssets = assetUuids.Count;
-                    
+
                 foreach (SceneObjectGroup sceneObject in sceneObjects)
+                {
+                    int curErrorCntr = assetGatherer.ErrorCount;
+                    int possible = assetGatherer.possibleNotAssetCount;
                     assetGatherer.AddForInspection(sceneObject);
+                    assetGatherer.GatherAll();
+                    curErrorCntr =  assetGatherer.ErrorCount - curErrorCntr;
+                    possible = assetGatherer.possibleNotAssetCount - possible;
+                    if(curErrorCntr > 0)
+                    {
+                        m_log.ErrorFormat("[ARCHIVER]: object {0} '{1}', at {2}, contains {3} references to missing or damaged assets,  or not a problem.",
+                            sceneObject.UUID, sceneObject.Name ,sceneObject.AbsolutePosition.ToString(), curErrorCntr);
+////                        if(possible > 0)
+////                            m_log.WarnFormat("[ARCHIVER Warning]: object also contains {0} references that may be to missing or damaged assets or not a problem", possible);
+                    }
+////                    else if(possible > 0)
+////                    {
+////                        m_log.WarnFormat("[ARCHIVER Warning]: object {0} '{1}', at {2}, contains {3} references that may be to missing or damaged assets or not a problem",
+////                            sceneObject.UUID, sceneObject.Name ,sceneObject.AbsolutePosition.ToString(), possible);
+////                    }
+                }
 
                 assetGatherer.GatherAll();
 
+                int errors = assetGatherer.FailedUUIDs.Count;
                 m_log.DebugFormat(
-                    "[ARCHIVER]: {0} scene objects to serialize requiring save of {1} assets",
-                    sceneObjects.Count, assetUuids.Count - prevAssets);
+                    "[ARCHIVER]: {0} region scene objects to save reference {1} possible assets",
+                    sceneObjects.Count, assetUuids.Count - prevAssets + errors);
+                if(errors > 0)
+                    m_log.DebugFormat("[ARCHIVER]: {0} of these have problems or are not assets and will be ignored", errors);
             }
 
             if (numObjectsSkippedPermissions > 0)
@@ -276,16 +299,16 @@ namespace OpenSim.Region.CoreModules.World.Archiver
 
             // Make sure that we also request terrain texture assets
             RegionSettings regionSettings = scene.RegionInfo.RegionSettings;
-    
+
             if (regionSettings.TerrainTexture1 != RegionSettings.DEFAULT_TERRAIN_TEXTURE_1)
                 assetUuids[regionSettings.TerrainTexture1] = (sbyte)AssetType.Texture;
-                
+
             if (regionSettings.TerrainTexture2 != RegionSettings.DEFAULT_TERRAIN_TEXTURE_2)
                 assetUuids[regionSettings.TerrainTexture2] = (sbyte)AssetType.Texture;
-                
+
             if (regionSettings.TerrainTexture3 != RegionSettings.DEFAULT_TERRAIN_TEXTURE_3)
                 assetUuids[regionSettings.TerrainTexture3] = (sbyte)AssetType.Texture;
-                
+
             if (regionSettings.TerrainTexture4 != RegionSettings.DEFAULT_TERRAIN_TEXTURE_4)
                 assetUuids[regionSettings.TerrainTexture4] = (sbyte)AssetType.Texture;
 
@@ -398,18 +421,18 @@ namespace OpenSim.Region.CoreModules.World.Archiver
 //                string[] parts = m_options["version"].ToString().Split('.');
 //                if (parts.Length >= 1)
 //                {
-//                    majorVersion = Int32.Parse(parts[0]);                    
-//                                        
+//                    majorVersion = Int32.Parse(parts[0]);
+//
 //                    if (parts.Length >= 2)
 //                        minorVersion = Int32.Parse(parts[1]);
 //                }
 //            }
-//            
+//
 //            if (majorVersion < MIN_MAJOR_VERSION || majorVersion > MAX_MAJOR_VERSION)
 //            {
 //                throw new Exception(
 //                    string.Format(
-//                        "OAR version number for save must be between {0} and {1}", 
+//                        "OAR version number for save must be between {0} and {1}",
 //                        MIN_MAJOR_VERSION, MAX_MAJOR_VERSION));
 //            }
 //            else if (majorVersion == MAX_MAJOR_VERSION)
@@ -420,9 +443,9 @@ namespace OpenSim.Region.CoreModules.World.Archiver
 //            else if (majorVersion == MIN_MAJOR_VERSION)
 //            {
 //                // Force 0.4
-//                minorVersion = 4;                                        
+//                minorVersion = 4;
 //            }
-            
+
             m_log.InfoFormat("[ARCHIVER]: Creating version {0}.{1} OAR", majorVersion, minorVersion);
             if (majorVersion == 1)
             {
@@ -430,7 +453,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             }
 
             String s;
-            
+
             using (StringWriter sw = new StringWriter())
             {
                 using (XmlTextWriter xtw = new XmlTextWriter(sw))
@@ -440,7 +463,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                     xtw.WriteStartElement("archive");
                     xtw.WriteAttributeString("major_version", majorVersion.ToString());
                     xtw.WriteAttributeString("minor_version", minorVersion.ToString());
-        
+
                     xtw.WriteStartElement("creation_info");
                     DateTime now = DateTime.UtcNow;
                     TimeSpan t = now - new DateTime(1970, 1, 1);
@@ -448,7 +471,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                     if (!MultiRegionFormat)
                         xtw.WriteElementString("id", m_rootScene.RegionInfo.RegionID.ToString());
                     xtw.WriteEndElement();
-        
+
                     xtw.WriteElementString("assets_included", SaveAssets.ToString());
 
                     if (MultiRegionFormat)
@@ -463,7 +486,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                     }
 
                     xtw.WriteEndElement();
-        
+
                     xtw.Flush();
                 }
 
@@ -522,22 +545,10 @@ namespace OpenSim.Region.CoreModules.World.Archiver
 
         protected static void WriteRegionInfo(Scene scene, XmlTextWriter xtw)
         {
-            bool isMegaregion;
             Vector2 size;
 
-            IRegionCombinerModule rcMod = scene.RequestModuleInterface<IRegionCombinerModule>();
+            size = new Vector2((float)scene.RegionInfo.RegionSizeX, (float)scene.RegionInfo.RegionSizeY);
 
-            if (rcMod != null)
-                isMegaregion = rcMod.IsRootForMegaregion(scene.RegionInfo.RegionID);
-            else
-                isMegaregion = false;
-    
-            if (isMegaregion)
-                size = rcMod.GetSizeOfMegaregion(scene.RegionInfo.RegionID);
-            else
-                size = new Vector2((float)scene.RegionInfo.RegionSizeX, (float)scene.RegionInfo.RegionSizeY);
-    
-            xtw.WriteElementString("is_megaregion", isMegaregion.ToString());
             xtw.WriteElementString("size_in_meters", string.Format("{0},{1}", size.X, size.Y));
         }
 
@@ -560,7 +571,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             foreach (ILandObject lo in landObjects)
             {
                 LandData landData = lo.LandData;
-                string landDataPath 
+                string landDataPath
                     = String.Format("{0}{1}", regionDir, ArchiveConstants.CreateOarLandDataPath(landData));
                 m_archiveWriter.WriteFile(landDataPath, LandDataSerializer.Serialize(landData, m_options));
             }
@@ -584,17 +595,18 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             foreach (SceneObjectGroup sceneObject in sceneObjects)
             {
                 //m_log.DebugFormat("[ARCHIVER]: Saving {0} {1}, {2}", entity.Name, entity.UUID, entity.GetType());
-
+                if(sceneObject.IsDeleted || sceneObject.inTransit)
+                    continue;
                 string serializedObject = serializer.SerializeGroupToXml2(sceneObject, m_options);
                 string objectPath = string.Format("{0}{1}", regionDir, ArchiveHelpers.CreateObjectPath(sceneObject));
                 m_archiveWriter.WriteFile(objectPath, serializedObject);
             }
         }
-        
+
         protected void ReceivedAllAssets(ICollection<UUID> assetsFoundUuids, ICollection<UUID> assetsNotFoundUuids, bool timedOut)
         {
             string errorMessage;
-            
+
             if (timedOut)
             {
                 errorMessage = "Loading assets timed out";
@@ -612,10 +624,10 @@ namespace OpenSim.Region.CoreModules.World.Archiver
 
                 errorMessage = String.Empty;
             }
-            
+
             CloseArchive(errorMessage);
         }
-        
+
         /// <summary>
         /// Closes the archive and notifies that we're done.
         /// </summary>
@@ -634,7 +646,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                 if (errorMessage == string.Empty)
                     errorMessage = e.Message;
             }
-            
+
             m_log.InfoFormat("[ARCHIVER]: Finished writing out OAR for {0}", m_rootScene.RegionInfo.RegionName);
 
             m_rootScene.EventManager.TriggerOarFileSaved(m_requestId, errorMessage);
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs
index 6a09caf..1305545 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs
@@ -49,24 +49,23 @@ namespace OpenSim.Region.CoreModules.World.Archiver
     [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "ArchiverModule")]
     public class ArchiverModule : INonSharedRegionModule, IRegionArchiverModule
     {
-        private static readonly ILog m_log = 
+        private static readonly ILog m_log =
             LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         public Scene Scene { get; private set; }
-        public IRegionCombinerModule RegionCombinerModule { get; private set; }
 
         /// <value>
         /// The file used to load and save an opensimulator archive if no filename has been specified
         /// </value>
         protected const string DEFAULT_OAR_BACKUP_FILENAME = "region.oar";
 
-        public string Name 
-        { 
-            get { return "RegionArchiverModule"; } 
+        public string Name
+        {
+            get { return "RegionArchiverModule"; }
         }
 
-        public Type ReplaceableInterface 
-        { 
+        public Type ReplaceableInterface
+        {
             get { return null; }
         }
 
@@ -85,7 +84,6 @@ namespace OpenSim.Region.CoreModules.World.Archiver
 
         public void RegionLoaded(Scene scene)
         {
-            RegionCombinerModule = scene.RequestModuleInterface<IRegionCombinerModule>();
         }
 
         public void RemoveRegion(Scene scene)
@@ -110,18 +108,22 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             Vector3 displacement = new Vector3(0f, 0f, 0f);
             String defaultUser = "";
             float rotation = 0f;
-            Vector3 rotationCenter = new Vector3(Constants.RegionSize / 2f, Constants.RegionSize / 2f, 0);
-            
+            Vector3 rotationCenter = new Vector3(Scene.RegionInfo.RegionSizeX / 2f, Scene.RegionInfo.RegionSizeY / 2f, 0);
+            Vector3 boundingOrigin = new Vector3(0f, 0f, 0f);
+            Vector3 boundingSize = new Vector3(Scene.RegionInfo.RegionSizeX, Scene.RegionInfo.RegionSizeY, float.MaxValue);
+            bool debug = false;
+
             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);
@@ -145,12 +147,14 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                     m_log.ErrorFormat("[ARCHIVER MODULE]    Must be an angle in degrees between -360 and +360: --rotation 45");
                     return;
                 }
-                // Convert to radians for internals
-                rotation = Util.Clamp<float>(rotation, -359f, 359f) / 180f * (float)Math.PI;
+                //pass this in as degrees now, convert to radians later during actual work phase
+                rotation = Util.Clamp<float>(rotation, -359f, 359f);
             });
-            options.Add("rotation-center=", delegate (string v) {
+            options.Add("rotation-center=", delegate(string v)
+            {
                 try
                 {
+                    m_log.Info("[ARCHIVER MODULE] Warning: --rotation-center no longer does anything and will be removed soon!");
                     rotationCenter = v == null ? Vector3.Zero : Vector3.Parse(v);
                 }
                 catch
@@ -160,6 +164,33 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                     return;
                 }
             });
+            options.Add("bounding-origin=", delegate(string v)
+            {
+                try
+                {
+                    boundingOrigin = v == null ? Vector3.Zero : Vector3.Parse(v);
+                }
+                catch
+                {
+                    m_log.ErrorFormat("[ARCHIVER MODULE] failure parsing bounding cube origin");
+                    m_log.ErrorFormat("[ARCHIVER MODULE]    Must be represented as vector3: --bounding-origin \"<128,128,0>\"");
+                    return;
+                }
+            });
+            options.Add("bounding-size=", delegate(string v)
+            {
+                try
+                {
+                    boundingSize = v == null ? new Vector3(Scene.RegionInfo.RegionSizeX, Scene.RegionInfo.RegionSizeY, float.MaxValue) : Vector3.Parse(v);
+                }
+                catch
+                {
+                    m_log.ErrorFormat("[ARCHIVER MODULE] failure parsing bounding cube size");
+                    m_log.ErrorFormat("[ARCHIVER MODULE]    Must be represented as a positive vector3: --bounding-size \"<256,256,4096>\"");
+                    return;
+                }
+            });
+            options.Add("d|debug", delegate(string v) { debug = (v != null); });
 
             // Send a message to the region ready module
             /* bluewall* Disable this for the time being
@@ -170,9 +201,9 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                 rready.OarLoadingAlert("load");
             }
             */
-            
+
             List<string> mainParams = options.Parse(cmdparams);
-          
+
 //            m_log.DebugFormat("MERGE OAR IS [{0}]", mergeOar);
 //
 //            foreach (string param in mainParams)
@@ -208,6 +239,9 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             archiveOptions.Add("displacement", displacement);
             archiveOptions.Add("rotation", rotation);
             archiveOptions.Add("rotation-center", rotationCenter);
+            archiveOptions.Add("bounding-origin", boundingOrigin);
+            archiveOptions.Add("bounding-size", boundingSize);
+            if (debug) archiveOptions.Add("debug", null);
 
             if (mainParams.Count > 2)
             {
@@ -254,7 +288,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
 
             ArchiveRegion(path, options);
         }
-        
+
         public void ArchiveRegion(string savePath, Dictionary<string, object> options)
         {
             ArchiveRegion(savePath, Guid.Empty, options);
@@ -264,7 +298,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
         {
             m_log.InfoFormat(
                 "[ARCHIVER]: Writing archive for region {0} to {1}", Scene.RegionInfo.RegionName, savePath);
-            
+
             new ArchiveWriteRequest(Scene, savePath, requestId).ArchiveRegion(options);
         }
 
@@ -288,21 +322,20 @@ 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();
         }
-        
+
         public void DearchiveRegion(Stream loadStream)
         {
             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/AssetsArchiver.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs
index bc6a97d..0a955c5 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs
@@ -46,13 +46,13 @@ namespace OpenSim.Region.CoreModules.World.Archiver
         /// <value>
         /// Post a message to the log every x assets as a progress bar
         /// </value>
-        protected static int LOG_ASSET_LOAD_NOTIFICATION_INTERVAL = 50;
+        protected static int LOG_ASSET_LOAD_NOTIFICATION_INTERVAL = 100;
 
         /// <value>
         /// Keep a count of the number of assets written so that we can provide status updates
         /// </value>
-        protected int m_assetsWritten; 
-        
+        protected int m_assetsWritten;
+
         protected TarArchiveWriter m_archiveWriter;
 
         public AssetsArchiver(TarArchiveWriter archiveWriter)
diff --git a/OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs
index 8c0ef88..5d3be62 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs
@@ -93,6 +93,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
 
             StringReader sr = new StringReader(xml);
             XmlTextReader reader = new XmlTextReader(sr);
+            reader.ProhibitDtd = true;
 
             reader.ReadStartElement("assets");
             reader.Read();
diff --git a/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs
index db66c83..91f4dc3 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs
@@ -60,29 +60,12 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             Completed,
             Aborted
         };
-        
-        /// <value>
-        /// Timeout threshold if we still need assets or missing asset notifications but have stopped receiving them
-        /// from the asset service
-        /// </value>
-        protected const int TIMEOUT = 60 * 1000;
-
-        /// <value>
-        /// If a timeout does occur, limit the amount of UUID information put to the console.
-        /// </value>
-        protected const int MAX_UUID_DISPLAY_ON_TIMEOUT = 3;
-       
-        protected System.Timers.Timer m_requestCallbackTimer;
 
         /// <value>
-        /// State of this request
-        /// </value>
-        private RequestState m_requestState = RequestState.Initial;
-        
-        /// <value>
         /// uuids to request
         /// </value>
         protected IDictionary<UUID, sbyte> m_uuids;
+        private int m_previousErrorsCount;
 
         /// <value>
         /// Callback used when all the assets requested have been received.
@@ -93,7 +76,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
         /// List of assets that were found.  This will be passed back to the requester.
         /// </value>
         protected List<UUID> m_foundAssetUuids = new List<UUID>();
-        
+
         /// <value>
         /// Maintain a list of assets that could not be found.  This will be passed back to the requester.
         /// </value>
@@ -104,217 +87,114 @@ namespace OpenSim.Region.CoreModules.World.Archiver
         /// </value>
         private int m_repliesRequired;
 
+        private System.Timers.Timer m_timeOutTimer;
+        private bool m_timeout;
+
         /// <value>
         /// Asset service used to request the assets
         /// </value>
         protected IAssetService m_assetService;
         protected IUserAccountService m_userAccountService;
-        protected UUID m_scopeID; // the grid ID 
+        protected UUID m_scopeID; // the grid ID
 
         protected AssetsArchiver m_assetsArchiver;
 
         protected Dictionary<string, object> m_options;
 
         protected internal AssetsRequest(
-            AssetsArchiver assetsArchiver, IDictionary<UUID, sbyte> uuids, 
-            IAssetService assetService, IUserAccountService userService, 
-            UUID scope, Dictionary<string, object> options, 
+            AssetsArchiver assetsArchiver, IDictionary<UUID, sbyte> uuids,
+            int previousErrorsCount,
+            IAssetService assetService, IUserAccountService userService,
+            UUID scope, Dictionary<string, object> options,
             AssetsRequestCallback assetsRequestCallback)
         {
             m_assetsArchiver = assetsArchiver;
             m_uuids = uuids;
+            m_previousErrorsCount = previousErrorsCount;
             m_assetsRequestCallback = assetsRequestCallback;
             m_assetService = assetService;
             m_userAccountService = userService;
             m_scopeID = scope;
             m_options = options;
             m_repliesRequired = uuids.Count;
-
-            // FIXME: This is a really poor way of handling the timeout since it will always leave the original requesting thread
-            // hanging.  Need to restructure so an original request thread waits for a ManualResetEvent on asset received
-            // so we can properly abort that thread.  Or request all assets synchronously, though that would be a more
-            // radical change
-            m_requestCallbackTimer = new System.Timers.Timer(TIMEOUT);
-            m_requestCallbackTimer.AutoReset = false;
-            m_requestCallbackTimer.Elapsed += new ElapsedEventHandler(OnRequestCallbackTimeout);
         }
 
         protected internal void Execute()
         {
-            m_requestState = RequestState.Running;
-            
-            m_log.DebugFormat("[ARCHIVER]: AssetsRequest executed looking for {0} possible assets", m_repliesRequired);
-
+            Culture.SetCurrentCulture();
             // We can stop here if there are no assets to fetch
             if (m_repliesRequired == 0)
             {
-                m_requestState = RequestState.Completed;
                 PerformAssetsRequestCallback(false);
                 return;
             }
 
-            m_requestCallbackTimer.Enabled = true;
+            m_timeOutTimer = new System.Timers.Timer(60000);
+            m_timeOutTimer .AutoReset = false;
+            m_timeOutTimer.Elapsed += OnTimeout;
+            m_timeout = false;
 
             foreach (KeyValuePair<UUID, sbyte> kvp in m_uuids)
             {
-//                m_log.DebugFormat("[ARCHIVER]: Requesting asset {0}", kvp.Key);
-
-//                m_assetService.Get(kvp.Key.ToString(), kvp.Value, PreAssetRequestCallback);
-                AssetBase asset = m_assetService.Get(kvp.Key.ToString());
-                PreAssetRequestCallback(kvp.Key.ToString(), kvp.Value, asset);
-            }
-        }
+                string thiskey = kvp.Key.ToString();
+                try
+                {
+                    m_timeOutTimer.Enabled = true;
+                    AssetBase asset = m_assetService.Get(thiskey);
+                    if(m_timeout)
+                        break;
+                        
+                    m_timeOutTimer.Enabled = false;
 
-        protected void OnRequestCallbackTimeout(object source, ElapsedEventArgs args)
-        {
-            bool timedOut = true;
+                    if(asset == null)
+                    {
+                        m_notFoundAssetUuids.Add(new UUID(thiskey));
+                        continue;
+                    }
 
-            try
-            {
-                lock (this)
-                {
-                    // Take care of the possibilty that this thread started but was paused just outside the lock before
-                    // the final request came in (assuming that such a thing is possible)
-                    if (m_requestState == RequestState.Completed)
+                    sbyte assetType = kvp.Value;
+                    if (asset != null && assetType == (sbyte)AssetType.Unknown)
                     {
-                        timedOut = false;
-                        return;
+                        m_log.InfoFormat("[ARCHIVER]: Rewriting broken asset type for {0} to {1}", thiskey, SLUtil.AssetTypeFromCode(assetType));
+                        asset.Type = assetType;
                     }
-                    
-                    m_requestState = RequestState.Aborted;
-                }
 
-                // Calculate which uuids were not found.  This is an expensive way of doing it, but this is a failure
-                // case anyway.
-                List<UUID> uuids = new List<UUID>();
-                foreach (UUID uuid in m_uuids.Keys)
-                {
-                    uuids.Add(uuid);
+                    m_foundAssetUuids.Add(asset.FullID);
+                    m_assetsArchiver.WriteAsset(PostProcess(asset));
                 }
 
-                foreach (UUID uuid in m_foundAssetUuids)
-                {
-                    uuids.Remove(uuid);
-                }
-    
-                foreach (UUID uuid in m_notFoundAssetUuids)
+                catch (Exception e)
                 {
-                    uuids.Remove(uuid);
-                }
-    
-                m_log.ErrorFormat(
-                    "[ARCHIVER]: Asset service failed to return information about {0} requested assets", uuids.Count);
-    
-                int i = 0;
-                foreach (UUID uuid in uuids)
-                {
-                    m_log.ErrorFormat("[ARCHIVER]: No information about asset {0} received", uuid);
-    
-                    if (++i >= MAX_UUID_DISPLAY_ON_TIMEOUT)
-                        break;
+                    m_log.ErrorFormat("[ARCHIVER]: Execute failed with {0}", e);
                 }
-    
-                if (uuids.Count > MAX_UUID_DISPLAY_ON_TIMEOUT)
-                    m_log.ErrorFormat(
-                        "[ARCHIVER]: (... {0} more not shown)", uuids.Count - MAX_UUID_DISPLAY_ON_TIMEOUT);
-
-                m_log.Error("[ARCHIVER]: Archive save aborted.  PLEASE DO NOT USE THIS ARCHIVE, IT WILL BE INCOMPLETE.");
-            }
-            catch (Exception e)
-            {
-                m_log.ErrorFormat("[ARCHIVER]: Timeout handler exception {0}{1}", e.Message, e.StackTrace);
             }
-            finally
-            {
-                if (timedOut)
-                    WorkManager.RunInThread(PerformAssetsRequestCallback, true, "Archive Assets Request Callback");
-            }
-        }
 
-        protected void PreAssetRequestCallback(string fetchedAssetID, object assetType, AssetBase fetchedAsset)
-        {
-            // Check for broken asset types and fix them with the AssetType gleaned by UuidGatherer
-            if (fetchedAsset != null && fetchedAsset.Type == (sbyte)AssetType.Unknown)
-            {
-                m_log.InfoFormat("[ARCHIVER]: Rewriting broken asset type for {0} to {1}", fetchedAsset.ID,  SLUtil.AssetTypeFromCode((sbyte)assetType));
-                fetchedAsset.Type = (sbyte)assetType;
-            }
+            m_timeOutTimer.Dispose();
+            int totalerrors = m_notFoundAssetUuids.Count + m_previousErrorsCount;
 
-            AssetRequestCallback(fetchedAssetID, this, fetchedAsset);
-        }
+            if(m_timeout)
+                m_log.DebugFormat("[ARCHIVER]: Aborted because AssetService request timeout. Successfully added {0} assets", m_foundAssetUuids.Count);
+            else if(totalerrors == 0)
+                m_log.DebugFormat("[ARCHIVER]: Successfully added all {0} assets", m_foundAssetUuids.Count);
+            else
+                m_log.DebugFormat("[ARCHIVER]: Successfully added {0} assets ({1} of total possible assets requested were not found, were damaged or were not assets)",
+                            m_foundAssetUuids.Count, totalerrors);
 
-        /// <summary>
-        /// Called back by the asset cache when it has the asset
-        /// </summary>
-        /// <param name="assetID"></param>
-        /// <param name="asset"></param>
-        public void AssetRequestCallback(string id, object sender, AssetBase asset)
+            PerformAssetsRequestCallback(m_timeout);
+        }
+  
+        private void OnTimeout(object source, ElapsedEventArgs args)
         {
-            Culture.SetCurrentCulture();
-            
-            try
-            {
-                lock (this)
-                {
-                    //m_log.DebugFormat("[ARCHIVER]: Received callback for asset {0}", id);
-                    
-                    m_requestCallbackTimer.Stop();
-                    
-                    if ((m_requestState == RequestState.Aborted) || (m_requestState == RequestState.Completed))
-                    {
-                        m_log.WarnFormat(
-                            "[ARCHIVER]: Received information about asset {0} while in state {1}.  Ignoring.", 
-                            id, m_requestState);
-
-                        return;
-                    }
-                                                           
-                    if (asset != null)
-                    {
-                        if (m_options.ContainsKey("verbose"))
-                            m_log.InfoFormat("[ARCHIVER]: Writing asset {0}", id);
-
-                        m_foundAssetUuids.Add(asset.FullID);
-
-                        m_assetsArchiver.WriteAsset(PostProcess(asset));
-                    }
-                    else
-                    {
-                        if (m_options.ContainsKey("verbose"))
-                            m_log.InfoFormat("[ARCHIVER]: Recording asset {0} as not found", id);
-
-                        m_notFoundAssetUuids.Add(new UUID(id));
-                    }
-        
-                    if (m_foundAssetUuids.Count + m_notFoundAssetUuids.Count >= m_repliesRequired)
-                    {
-                        m_requestState = RequestState.Completed;
-                        
-                        m_log.DebugFormat(
-                            "[ARCHIVER]: Successfully added {0} assets ({1} assets not found but these may be expected invalid references)",
-                            m_foundAssetUuids.Count, m_notFoundAssetUuids.Count);
-                        
-                        // We want to stop using the asset cache thread asap 
-                        // as we now need to do the work of producing the rest of the archive
-                        WorkManager.RunInThread(PerformAssetsRequestCallback, false, "Archive Assets Request Callback");
-                    }
-                    else
-                    {
-                        m_requestCallbackTimer.Start();
-                    }
-                }
-            }
-            catch (Exception e)
-            {
-                m_log.ErrorFormat("[ARCHIVER]: AssetRequestCallback failed with {0}", e);
-            }
+            m_timeout = true;
         }
 
         /// <summary>
         /// Perform the callback on the original requester of the assets
         /// </summary>
-        protected void PerformAssetsRequestCallback(object o)
+        private void PerformAssetsRequestCallback(object o)
         {
+            if(m_assetsRequestCallback == null)
+                return;
             Culture.SetCurrentCulture();
 
             Boolean timedOut = (Boolean)o;
@@ -330,7 +210,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             }
         }
 
-        protected AssetBase PostProcess(AssetBase asset)
+        private AssetBase PostProcess(AssetBase asset)
         {
             if (asset.Type == (sbyte)AssetType.Object && asset.Data != null && m_options.ContainsKey("home"))
             {
diff --git a/OpenSim/Region/CoreModules/World/Archiver/DearchiveScenesGroup.cs b/OpenSim/Region/CoreModules/World/Archiver/DearchiveScenesGroup.cs
index 3dcc020..809d863 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/DearchiveScenesGroup.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/DearchiveScenesGroup.cs
@@ -70,6 +70,16 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             /// If null then the region doesn't have a corresponding scene, and it won't be loaded.
             /// </summary>
             public Scene Scene { get; set; }
+
+            /// <summary>
+            /// The size of the region being loaded.
+            /// </summary>
+            public Vector3 RegionSize { get; set; }
+
+            public RegionInfo()
+            {
+                RegionSize = new Vector3(256f,256f,float.MaxValue);
+            }
         }
 
         /// <summary>
@@ -113,23 +123,34 @@ namespace OpenSim.Region.CoreModules.World.Archiver
         public void StartRegion()
         {
             m_curX = (m_curX == null) ? 0 : m_curX + 1;
-            // Note: this doesn't mean we have a real region in this location; this could just be a "hole"
+           // Note: this doesn't mean we have a real region in this location; this could just be a "hole"
         }
 
         public void SetRegionOriginalID(string id)
         {
             m_curRegion = new RegionInfo();
-            m_curRegion.Location = new Point((int)m_curX, (int)m_curY);
+            int x = (int)((m_curX == null) ? 0 : m_curX);
+            int y = (int)((m_curY == null) ? 0 : m_curY);
+
+            m_curRegion.Location = new Point(x, y);
             m_curRegion.OriginalID = id;
             // 'curRegion' will be saved in 'm_directory2region' when SetRegionDir() is called
         }
 
         public void SetRegionDirectory(string directory)
         {
-            m_curRegion.Directory = directory;
-            m_directory2region[directory] = m_curRegion;
+            if(m_curRegion != null)
+            {
+                m_curRegion.Directory = directory;
+                m_directory2region[directory] = m_curRegion;
+            }
         }
 
+        public void SetRegionSize(Vector3 size)
+        {
+            if(m_curRegion != null)
+                m_curRegion.RegionSize = size;
+        }
 
         /// <summary>
         /// Sets all the scenes present in the simulator.
@@ -145,7 +166,9 @@ namespace OpenSim.Region.CoreModules.World.Archiver
         {
             foreach (RegionInfo archivedRegion in m_directory2region.Values)
             {
-                Point location = new Point((int)rootScene.RegionInfo.RegionLocX, (int)rootScene.RegionInfo.RegionLocY);
+                Point location = new Point((int)rootScene.RegionInfo.RegionLocX,
+                            (int)rootScene.RegionInfo.RegionLocY);
+
                 location.Offset(archivedRegion.Location);
 
                 Scene scene;
@@ -191,7 +214,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                 return false;
             string regionDirectory = parts[1];
             relativePath = parts[2];
-            
+
             RegionInfo region;
             if (m_directory2region.TryGetValue(regionDirectory, out region))
             {
@@ -228,5 +251,9 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             return m_newId2region.Keys.ToList();
         }
 
+        public int GetScenesCount()
+        {
+            return m_directory2region.Count;
+        }
     }
 }
diff --git a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
index 9f197f5..6885299 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
@@ -65,7 +65,9 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
         protected SerialiserModule m_serialiserModule;
 
         protected TaskInventoryItem m_soundItem;
-        
+
+        private  AutoResetEvent m_oarEvent = new AutoResetEvent(false);
+
         [SetUp]
         public override void SetUp()
         {
@@ -87,11 +89,10 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
                 m_lastRequestId = requestId;
                 m_lastErrorMessage = errorMessage;
                 Console.WriteLine("About to pulse ArchiverTests on LoadCompleted");
-                                
-                Monitor.PulseAll(this);
+                m_oarEvent.Set();
             }
         }
-        
+
         private void SaveCompleted(Guid requestId, string errorMessage)
         {
             lock (this)
@@ -99,7 +100,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
                 m_lastRequestId = requestId;
                 m_lastErrorMessage = errorMessage;
                 Console.WriteLine("About to pulse ArchiverTests on SaveCompleted");
-                Monitor.PulseAll(this);
+                 m_oarEvent.Set();
             }
         }
 
@@ -110,6 +111,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
             PrimitiveBaseShape shape = PrimitiveBaseShape.CreateSphere();
             Vector3 groupPosition = new Vector3(10, 20, 30);
             Quaternion rotationOffset = new Quaternion(20, 30, 40, 50);
+            rotationOffset.Normalize();
 //            Vector3 offsetPosition = new Vector3(5, 10, 15);
 
             return new SceneObjectPart(ownerId, shape, groupPosition, rotationOffset, Vector3.Zero) { Name = partName };
@@ -122,11 +124,12 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
             PrimitiveBaseShape shape = PrimitiveBaseShape.CreateCylinder();
             Vector3 groupPosition = new Vector3(90, 80, 70);
             Quaternion rotationOffset = new Quaternion(60, 70, 80, 90);
+            rotationOffset.Normalize();
             Vector3 offsetPosition = new Vector3(20, 25, 30);
 
             return new SceneObjectPart(ownerId, shape, groupPosition, rotationOffset, offsetPosition) { Name = partName };
         }
-       
+
         private void CreateTestObjects(Scene scene, out SceneObjectGroup sog1, out SceneObjectGroup sog2, out UUID ncAssetUuid)
         {
             SceneObjectPart part1 = CreateSceneObjectPart1();
@@ -192,17 +195,15 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
             m_scene.EventManager.OnOarFileSaved += SaveCompleted;
 
             Guid requestId = new Guid("00000000-0000-0000-0000-808080808080");
-            
-            lock (this)
-            {
-                m_archiverModule.ArchiveRegion(archiveWriteStream, requestId);
-                //AssetServerBase assetServer = (AssetServerBase)scene.CommsManager.AssetCache.AssetServer;
-                //while (assetServer.HasWaitingRequests())
-                //    assetServer.ProcessNextRequest();
-                
-                Monitor.Wait(this, 60000);
-            }
-            
+
+            m_oarEvent.Reset();
+            m_archiverModule.ArchiveRegion(archiveWriteStream, requestId);
+            //AssetServerBase assetServer = (AssetServerBase)scene.CommsManager.AssetCache.AssetServer;
+            //while (assetServer.HasWaitingRequests())
+            //    assetServer.ProcessNextRequest();
+
+            m_oarEvent.WaitOne(60000);
+
             Assert.That(m_lastRequestId, Is.EqualTo(requestId));
 
             byte[] archive = archiveWriteStream.ToArray();
@@ -210,7 +211,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
             TarArchiveReader tar = new TarArchiveReader(archiveReadStream);
 
             bool gotNcAssetFile = false;
-            
+
             string expectedNcAssetFileName = string.Format("{0}_{1}", ncAssetUuid, "notecard.txt");
 
             List<string> foundPaths = new List<string>();
@@ -219,7 +220,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
             expectedPaths.Add(ArchiveHelpers.CreateObjectPath(sog2));
 
             string filePath;
-            TarArchiveReader.TarEntryType tarEntryType;         
+            TarArchiveReader.TarEntryType tarEntryType;
 
             byte[] data = tar.ReadEntry(out filePath, out tarEntryType);
             Assert.That(filePath, Is.EqualTo(ArchiveConstants.CONTROL_FILE_PATH));
@@ -227,9 +228,9 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
             Dictionary<string, object> archiveOptions = new Dictionary<string, object>();
             ArchiveReadRequest arr = new ArchiveReadRequest(m_scene, (Stream)null, Guid.Empty, archiveOptions);
             arr.LoadControlFile(filePath, data, new DearchiveScenesInfo());
-            
-            Assert.That(arr.ControlFileLoaded, Is.True);        
-            
+
+            Assert.That(arr.ControlFileLoaded, Is.True);
+
             while (tar.ReadEntry(out filePath, out tarEntryType) != null)
             {
                 if (filePath.StartsWith(ArchiveConstants.ASSETS_PATH))
@@ -265,7 +266,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
             m_scene.AddNewSceneObject(sog1, false);
 
             SceneObjectPart part2 = CreateSceneObjectPart2();
-            
+
             AssetNotecard nc = new AssetNotecard();
             nc.BodyText = "Hello World!";
             nc.Encode();
@@ -275,10 +276,10 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
                 = AssetHelpers.CreateAsset(ncAssetUuid, AssetType.Notecard, nc.AssetData, UUID.Zero);
             m_scene.AssetService.Store(ncAsset);
             SceneObjectGroup sog2 = new SceneObjectGroup(part2);
-            TaskInventoryItem ncItem 
+            TaskInventoryItem ncItem
                 = new TaskInventoryItem { Name = "ncItem", AssetID = ncAssetUuid, ItemID = ncItemUuid };
             part2.Inventory.AddInventoryItem(ncItem, true);
-            
+
             m_scene.AddNewSceneObject(sog2, false);
 
             MemoryStream archiveWriteStream = new MemoryStream();
@@ -287,6 +288,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
 
             Dictionary<string, Object> options = new Dictionary<string, Object>();
             options.Add("noassets", true);
+
             m_archiverModule.ArchiveRegion(archiveWriteStream, requestId, options);
 
             // Don't wait for completion - with --noassets save oar happens synchronously
@@ -304,7 +306,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
             expectedPaths.Add(ArchiveHelpers.CreateObjectPath(sog2));
 
             string filePath;
-            TarArchiveReader.TarEntryType tarEntryType;         
+            TarArchiveReader.TarEntryType tarEntryType;
 
             byte[] data = tar.ReadEntry(out filePath, out tarEntryType);
             Assert.That(filePath, Is.EqualTo(ArchiveConstants.CONTROL_FILE_PATH));
@@ -312,9 +314,9 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
             Dictionary<string, object> archiveOptions = new Dictionary<string, object>();
             ArchiveReadRequest arr = new ArchiveReadRequest(m_scene, (Stream)null, Guid.Empty, archiveOptions);
             arr.LoadControlFile(filePath, data, new DearchiveScenesInfo());
-            
-            Assert.That(arr.ControlFileLoaded, Is.True);        
-            
+
+            Assert.That(arr.ControlFileLoaded, Is.True);
+
             while (tar.ReadEntry(out filePath, out tarEntryType) != null)
             {
                 if (filePath.StartsWith(ArchiveConstants.ASSETS_PATH))
@@ -343,11 +345,11 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
 
             MemoryStream archiveWriteStream = new MemoryStream();
             TarArchiveWriter tar = new TarArchiveWriter(archiveWriteStream);
-            
+
             // Put in a random blank directory to check that this doesn't upset the load process
             tar.WriteDir("ignoreme");
-            
-            // Also check that direct entries which will also have a file entry containing that directory doesn't 
+
+            // Also check that direct entries which will also have a file entry containing that directory doesn't
             // upset load
             tar.WriteDir(ArchiveConstants.TERRAINS_PATH);
 
@@ -390,17 +392,17 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
                 Math.Round(part1.GroupPosition.X), Math.Round(part1.GroupPosition.Y), Math.Round(part1.GroupPosition.Z),
                 part1.UUID);
             tar.WriteFile(ArchiveConstants.OBJECTS_PATH + object1FileName, SceneObjectSerializer.ToXml2Format(object1));
-            
+
             tar.Close();
 
             MemoryStream archiveReadStream = new MemoryStream(archiveWriteStream.ToArray());
 
-            lock (this)
-            {
-                m_scene.EventManager.OnOarFileLoaded += LoadCompleted;
-                m_archiverModule.DearchiveRegion(archiveReadStream);
-            }
-            
+            m_scene.EventManager.OnOarFileLoaded += LoadCompleted;
+            m_oarEvent.Reset();
+            m_archiverModule.DearchiveRegion(archiveReadStream);
+
+             m_oarEvent.WaitOne(60000);
+
             Assert.That(m_lastErrorMessage, Is.Null);
 
             TestLoadedRegion(part1, soundItemName, soundData);
@@ -444,11 +446,11 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
 
             MemoryStream archiveReadStream = new MemoryStream(archiveWriteStream.ToArray());
 
-            lock (this)
-            {
-                m_scene.EventManager.OnOarFileLoaded += LoadCompleted;
-                m_archiverModule.DearchiveRegion(archiveReadStream);
-            }
+            m_scene.EventManager.OnOarFileLoaded += LoadCompleted;
+            m_oarEvent.Reset();
+            m_archiverModule.DearchiveRegion(archiveReadStream);
+
+             m_oarEvent.WaitOne(60000);
 
             Assert.That(m_lastErrorMessage, Is.Null);
 
@@ -473,35 +475,33 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
             m_scene.AddNewSceneObject(sog1, false);
 
             SceneObjectPart part2 = CreateSceneObjectPart2();
-            
+
             AssetNotecard nc = new AssetNotecard();
             nc.BodyText = "Hello World!";
             nc.Encode();
             UUID ncAssetUuid = new UUID("00000000-0000-0000-1000-000000000000");
             UUID ncItemUuid = new UUID("00000000-0000-0000-1100-000000000000");
-            AssetBase ncAsset 
+            AssetBase ncAsset
                 = AssetHelpers.CreateAsset(ncAssetUuid, AssetType.Notecard, nc.AssetData, UUID.Zero);
             m_scene.AssetService.Store(ncAsset);
             SceneObjectGroup sog2 = new SceneObjectGroup(part2);
-            TaskInventoryItem ncItem 
+            TaskInventoryItem ncItem
                 = new TaskInventoryItem { Name = "ncItem", AssetID = ncAssetUuid, ItemID = ncItemUuid };
             part2.Inventory.AddInventoryItem(ncItem, true);
-            
+
             m_scene.AddNewSceneObject(sog2, false);
 
             MemoryStream archiveWriteStream = new MemoryStream();
             m_scene.EventManager.OnOarFileSaved += SaveCompleted;
 
             Guid requestId = new Guid("00000000-0000-0000-0000-808080808080");
-            
-            lock (this)
-            {
-                m_archiverModule.ArchiveRegion(
+
+            m_oarEvent.Reset();
+            m_archiverModule.ArchiveRegion(
                     archiveWriteStream, requestId, new Dictionary<string, Object>() { { "wipe-owners", Boolean.TrueString } });
-                
-                Monitor.Wait(this, 60000);
-            }
-            
+
+             m_oarEvent.WaitOne(60000);
+
             Assert.That(m_lastRequestId, Is.EqualTo(requestId));
 
             byte[] archive = archiveWriteStream.ToArray();
@@ -526,11 +526,11 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
 
                 scene2.RegionInfo.EstateSettings.EstateOwner = estateOwner;
 
-                lock (this)
-                {
-                    scene2.EventManager.OnOarFileLoaded += LoadCompleted;
-                    archiverModule.DearchiveRegion(archiveReadStream);
-                }
+                scene2.EventManager.OnOarFileLoaded += LoadCompleted;
+                m_oarEvent.Reset();
+                archiverModule.DearchiveRegion(archiveReadStream);
+
+                 m_oarEvent.WaitOne(60000);
 
                 Assert.That(m_lastErrorMessage, Is.Null);
 
@@ -557,16 +557,16 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
             MockGroupsServicesConnector groupsService = new MockGroupsServicesConnector();
 
             IConfigSource configSource = new IniConfigSource();
-            IConfig config = configSource.AddConfig("Groups");            
+            IConfig config = configSource.AddConfig("Groups");
             config.Set("Enabled", true);
-            config.Set("Module", "GroupsModule");            
+            config.Set("Module", "GroupsModule");
             config.Set("DebugEnabled", true);
             SceneHelpers.SetupSceneModules(
                 m_scene, configSource, new object[] { new GroupsModule(), groupsService, new LandManagementModule() });
 
             // Create group in scene for loading
             // FIXME: For now we'll put up with the issue that we'll get a group ID that varies across tests.
-            UUID groupID 
+            UUID groupID
                 = groupsService.CreateGroup(UUID.Zero, "group1", "", true, UUID.Zero, 3, true, true, true, UUID.Zero);
 
             // Construct OAR
@@ -591,11 +591,11 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
             oarStream = new MemoryStream(oarStream.ToArray());
 
             // Load OAR
-            lock (this)
-            {
-                m_scene.EventManager.OnOarFileLoaded += LoadCompleted;
-                m_archiverModule.DearchiveRegion(oarStream);
-            }
+            m_scene.EventManager.OnOarFileLoaded += LoadCompleted;
+            m_oarEvent.Reset();
+            m_archiverModule.DearchiveRegion(oarStream);
+
+             m_oarEvent.WaitOne(60000);
 
             ILandObject rLo = m_scene.LandChannel.GetLandObject(16, 16);
             LandData rLd = rLo.LandData;
@@ -617,7 +617,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
 
             MemoryStream archiveWriteStream = new MemoryStream();
             TarArchiveWriter tar = new TarArchiveWriter(archiveWriteStream);
-            
+
             tar.WriteDir(ArchiveConstants.TERRAINS_PATH);
             tar.WriteFile(
                 ArchiveConstants.CONTROL_FILE_PATH,
@@ -658,17 +658,17 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
             rs.AddSpawnPoint(SpawnPoint.Parse("1,-2,0.33"));
 
             tar.WriteFile(ArchiveConstants.SETTINGS_PATH + "region1.xml", RegionSettingsSerializer.Serialize(rs));
-            
+
             tar.Close();
 
             MemoryStream archiveReadStream = new MemoryStream(archiveWriteStream.ToArray());
 
-            lock (this)
-            {
-                m_scene.EventManager.OnOarFileLoaded += LoadCompleted;
-                m_archiverModule.DearchiveRegion(archiveReadStream);
-            }
-            
+            m_scene.EventManager.OnOarFileLoaded += LoadCompleted;
+            m_oarEvent.Reset();
+            m_archiverModule.DearchiveRegion(archiveReadStream);
+
+             m_oarEvent.WaitOne(60000);
+
             Assert.That(m_lastErrorMessage, Is.Null);
             RegionSettings loadedRs = m_scene.RegionInfo.RegionSettings;
 
@@ -705,7 +705,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
             Assert.AreEqual(UUID.Zero, loadedRs.TelehubObject); // because no object was found with the original UUID
             Assert.AreEqual(0, loadedRs.SpawnPoints().Count);
         }
-        
+
         /// <summary>
         /// Test merging an OpenSim Region Archive into an existing scene
         /// </summary>
@@ -737,13 +737,12 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
                 m_scene.AddNewSceneObject(new SceneObjectGroup(part2), false);
 
                 // Write out this scene
+
                 scene.EventManager.OnOarFileSaved += SaveCompleted;
+                m_oarEvent.Reset();
+                m_archiverModule.ArchiveRegion(archiveWriteStream);
 
-                lock (this)
-                {
-                    m_archiverModule.ArchiveRegion(archiveWriteStream);
-                    Monitor.Wait(this, 60000);
-                }
+                 m_oarEvent.WaitOne(60000);
             }
 
             {
@@ -754,10 +753,14 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
                 byte[] archive = archiveWriteStream.ToArray();
                 MemoryStream archiveReadStream = new MemoryStream(archive);
 
+                m_scene.EventManager.OnOarFileLoaded += LoadCompleted;
                 Dictionary<string, object> archiveOptions = new Dictionary<string, object>();
                 archiveOptions.Add("merge", null);
+                m_oarEvent.Reset();
                 m_archiverModule.DearchiveRegion(archiveReadStream, Guid.Empty, archiveOptions);
 
+                m_oarEvent.WaitOne(60000);
+
                 SceneObjectPart object1Existing = m_scene.GetSceneObjectPart(part1.Name);
                 Assert.That(object1Existing, Is.Not.Null, "object1 was not present after merge");
                 Assert.That(object1Existing.Name, Is.EqualTo(part1.Name), "object1 names not identical after merge");
@@ -816,7 +819,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
                     SceneObjectGroup sog1;
                     SceneObjectGroup sog2;
                     UUID ncAssetUuid;
-                    
+
                     CreateTestObjects(scene, out sog1, out sog2, out ncAssetUuid);
 
                     expectedPaths[scene.RegionInfo.RegionID] = new List<string>();
@@ -829,18 +832,17 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
 
             // Save OAR
             MemoryStream archiveWriteStream = new MemoryStream();
-            m_scene.EventManager.OnOarFileSaved += SaveCompleted;
 
             Guid requestId = new Guid("00000000-0000-0000-0000-808080808080");
 
             Dictionary<string, Object> options = new Dictionary<string, Object>();
             options.Add("all", true);
 
-            lock (this)
-            {
-                m_archiverModule.ArchiveRegion(archiveWriteStream, requestId, options);
-                Monitor.Wait(this, 60000);
-            }
+            m_scene.EventManager.OnOarFileSaved += SaveCompleted;
+            m_oarEvent.Reset();
+            m_archiverModule.ArchiveRegion(archiveWriteStream, requestId, options);
+
+             m_oarEvent.WaitOne(60000);
 
 
             // Check that the OAR contains the expected data
@@ -991,7 +993,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
 
             tar.Close();
 
-            
+
             // Delete the current objects, to test that they're loaded from the OAR and didn't
             // just remain in the scene.
             m_sceneHelpers.SceneManager.ForEachScene(delegate(Scene scene)
@@ -1007,11 +1009,11 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
 
             MemoryStream archiveReadStream = new MemoryStream(archiveWriteStream.ToArray());
 
-            lock (this)
-            {
-                m_scene.EventManager.OnOarFileLoaded += LoadCompleted;
-                m_archiverModule.DearchiveRegion(archiveReadStream);
-            }
+            m_scene.EventManager.OnOarFileLoaded += LoadCompleted;
+            m_oarEvent.Reset();
+            m_archiverModule.DearchiveRegion(archiveReadStream);
+
+             m_oarEvent.WaitOne(60000);
 
             Assert.That(m_lastErrorMessage, Is.Null);
 
@@ -1027,8 +1029,19 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
             Assert.That(object1PartLoaded, Is.Not.Null, "object1 was not loaded");
             Assert.That(object1PartLoaded.Name, Is.EqualTo(part1.Name), "object1 names not identical");
             Assert.That(object1PartLoaded.GroupPosition, Is.EqualTo(part1.GroupPosition), "object1 group position not equal");
-            Assert.That(
-                object1PartLoaded.RotationOffset, Is.EqualTo(part1.RotationOffset), "object1 rotation offset not equal");
+
+            Quaternion qtmp1 = new Quaternion (
+                (float)Math.Round(object1PartLoaded.RotationOffset.X,5),
+                (float)Math.Round(object1PartLoaded.RotationOffset.Y,5),
+                (float)Math.Round(object1PartLoaded.RotationOffset.Z,5),
+                (float)Math.Round(object1PartLoaded.RotationOffset.W,5));
+            Quaternion qtmp2 = new Quaternion (
+                (float)Math.Round(part1.RotationOffset.X,5),
+                (float)Math.Round(part1.RotationOffset.Y,5),
+                (float)Math.Round(part1.RotationOffset.Z,5),
+                (float)Math.Round(part1.RotationOffset.W,5));
+
+            Assert.That(qtmp1, Is.EqualTo(qtmp2), "object1 rotation offset not equal");
             Assert.That(
                 object1PartLoaded.OffsetPosition, Is.EqualTo(part1.OffsetPosition), "object1 offset position not equal");
             Assert.That(object1PartLoaded.SitTargetOrientation, Is.EqualTo(part1.SitTargetOrientation));
diff --git a/OpenSim/Region/CoreModules/World/Cloud/CloudModule.cs b/OpenSim/Region/CoreModules/World/Cloud/CloudModule.cs
index d217f36..a450dd6 100644
--- a/OpenSim/Region/CoreModules/World/Cloud/CloudModule.cs
+++ b/OpenSim/Region/CoreModules/World/Cloud/CloudModule.cs
@@ -27,6 +27,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Threading;
 using Mono.Addins;
 using Nini.Config;
 using OpenMetaverse;
@@ -39,16 +40,20 @@ namespace OpenSim.Region.CoreModules.World
     [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "CloudModule")]
     public class CloudModule : ICloudModule, INonSharedRegionModule
     {
-//        private static readonly log4net.ILog m_log 
+//        private static readonly log4net.ILog m_log
 //            = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
         private uint m_frame = 0;
         private int m_frameUpdateRate = 1000;
-        private Random m_rndnums = new Random(Environment.TickCount);
+        private Random m_rndnums;
         private Scene m_scene = null;
         private bool m_ready = false;
         private bool m_enabled = false;
         private float m_cloudDensity = 1.0F;
         private float[] cloudCover = new float[16 * 16];
+        private int m_dataVersion;
+        private bool m_busy;
+        private object cloudlock = new object();
+
 
         public void Initialise(IConfigSource config)
         {
@@ -70,11 +75,17 @@ namespace OpenSim.Region.CoreModules.World
 
             m_scene = scene;
 
-            scene.EventManager.OnNewClient += CloudsToClient;
             scene.RegisterModuleInterface<ICloudModule>(this);
-            scene.EventManager.OnFrame += CloudUpdate;
+            int seed = Environment.TickCount;
+            seed += (int)(scene.RegionInfo.RegionLocX << 16);
+            seed += (int)(scene.RegionInfo.RegionLocY);
+            m_rndnums = new Random(seed);
 
             GenerateCloudCover();
+            m_dataVersion = (int)m_scene.AllocateLocalId();
+
+            scene.EventManager.OnNewClient += CloudsToClient;
+            scene.EventManager.OnFrame += CloudUpdate;
 
             m_ready = true;
         }
@@ -89,7 +100,6 @@ namespace OpenSim.Region.CoreModules.World
             m_scene.EventManager.OnNewClient -= CloudsToClient;
             m_scene.EventManager.OnFrame -= CloudUpdate;
             m_scene.UnregisterModuleInterface<ICloudModule>(this);
-
             m_scene = null;
         }
 
@@ -127,7 +137,8 @@ namespace OpenSim.Region.CoreModules.World
 
             if (cloudCover != null)
             {
-                cover = cloudCover[y * 16 + x];
+                lock(cloudlock)
+                    cover = cloudCover[y * 16 + x];
             }
 
             return cover;
@@ -152,7 +163,7 @@ namespace OpenSim.Region.CoreModules.World
                     columnRight = 0;
                     columnLeft = x - 1;
                 }
-                else 
+                else
                 {
                     columnRight = x + 1;
                     columnLeft = x - 1;
@@ -174,40 +185,65 @@ namespace OpenSim.Region.CoreModules.World
                         rowAbove = y + 1;
                         rowBelow = y - 1;
                     }
-                    float neighborAverage = (cloudCover[rowBelow * 16 + columnLeft] + 
-                                             cloudCover[y * 16 + columnLeft] + 
-                                             cloudCover[rowAbove * 16 + columnLeft] + 
-                                             cloudCover[rowBelow * 16 + x] + 
-                                             cloudCover[rowAbove * 16 + x] + 
-                                             cloudCover[rowBelow * 16 + columnRight] + 
-                                             cloudCover[y * 16 + columnRight] + 
-                                             cloudCover[rowAbove * 16 + columnRight] + 
+                    float neighborAverage = (cloudCover[rowBelow * 16 + columnLeft] +
+                                             cloudCover[y * 16 + columnLeft] +
+                                             cloudCover[rowAbove * 16 + columnLeft] +
+                                             cloudCover[rowBelow * 16 + x] +
+                                             cloudCover[rowAbove * 16 + x] +
+                                             cloudCover[rowBelow * 16 + columnRight] +
+                                             cloudCover[y * 16 + columnRight] +
+                                             cloudCover[rowAbove * 16 + columnRight] +
                                              cloudCover[y * 16 + x]) / 9;
                     newCover[y * 16 + x] = ((neighborAverage / m_cloudDensity) + 0.175f) % 1.0f;
                     newCover[y * 16 + x] *= m_cloudDensity;
                 }
             }
             Array.Copy(newCover, cloudCover, 16 * 16);
+            m_dataVersion++;
         }
-  
-       private void CloudUpdate()
-       {
-           if (((m_frame++ % m_frameUpdateRate) != 0) || !m_ready || (m_cloudDensity == 0))
-           {
-               return;
-           }
-           UpdateCloudCover();
+
+        private void CloudUpdate()
+        {
+            if ((!m_ready ||  m_busy || m_cloudDensity == 0 ||
+                    (m_frame++ % m_frameUpdateRate) != 0))
+                return;
+
+            if(Monitor.TryEnter(cloudlock))
+            {
+                m_busy = true;
+                Util.FireAndForget(delegate
+                    {
+                        try
+                        {
+                            lock(cloudlock)
+                            {
+                                UpdateCloudCover();
+                                m_scene.ForEachClient(delegate(IClientAPI client)
+                                {
+                                    client.SendCloudData(m_dataVersion, cloudCover);
+                                });
+                            }
+                        }
+                        finally
+                        {
+                            m_busy = false;
+                        }
+                    },
+                    null, "CloudModuleUpdate");
+                Monitor.Exit(cloudlock);
+            }
         }
 
         public void CloudsToClient(IClientAPI client)
         {
             if (m_ready)
             {
-                client.SendCloudData(cloudCover);
+                lock(cloudlock)
+                       client.SendCloudData(m_dataVersion, cloudCover);
             }
         }
 
-       
+
         /// <summary>
         /// Calculate the cloud cover over the region.
         /// </summary>
diff --git a/OpenSim/Region/CoreModules/World/Estate/XEstateConnector.cs b/OpenSim/Region/CoreModules/World/Estate/EstateConnector.cs
index 73e706c..8001c3c 100644
--- a/OpenSim/Region/CoreModules/World/Estate/XEstateConnector.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateConnector.cs
@@ -45,17 +45,22 @@ namespace OpenSim.Region.CoreModules.World.Estate
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        protected XEstateModule m_EstateModule;
+        protected EstateModule m_EstateModule;
+        private string token;
+        uint port = 0;
 
-        public EstateConnector(XEstateModule module)
+        public EstateConnector(EstateModule module, string _token, uint _port)
         {
             m_EstateModule = module;
+            token = _token;
+            port = _port;
         }
 
         public void SendTeleportHomeOneUser(uint EstateID, UUID PreyID)
         {
             Dictionary<string, object> sendData = new Dictionary<string, object>();
             sendData["METHOD"] = "teleport_home_one_user";
+            sendData["TOKEN"] = token;
 
             sendData["EstateID"] = EstateID.ToString();
             sendData["PreyID"] = PreyID.ToString();
@@ -67,6 +72,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
         {
             Dictionary<string, object> sendData = new Dictionary<string, object>();
             sendData["METHOD"] = "teleport_home_all_users";
+            sendData["TOKEN"] = token;
 
             sendData["EstateID"] = EstateID.ToString();
 
@@ -77,6 +83,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
         {
             Dictionary<string, object> sendData = new Dictionary<string, object>();
             sendData["METHOD"] = "update_covenant";
+            sendData["TOKEN"] = token;
 
             sendData["CovenantID"] = CovenantID.ToString();
             sendData["EstateID"] = EstateID.ToString();
@@ -99,6 +106,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
         {
             Dictionary<string, object> sendData = new Dictionary<string, object>();
             sendData["METHOD"] = "update_estate";
+            sendData["TOKEN"] = token;
 
             sendData["EstateID"] = EstateID.ToString();
 
@@ -119,6 +127,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
         {
             Dictionary<string, object> sendData = new Dictionary<string, object>();
             sendData["METHOD"] = "estate_message";
+            sendData["TOKEN"] = token;
 
             sendData["EstateID"] = EstateID.ToString();
             sendData["FromID"] = FromID.ToString();
@@ -132,47 +141,43 @@ namespace OpenSim.Region.CoreModules.World.Estate
         {
             List<UUID> regions = m_EstateModule.Scenes[0].GetEstateRegions((int)EstateID);
 
-            UUID ScopeID = UUID.Zero;
+            // Don't send to the same instance twice
+            List<string> done = new List<string>();
 
             // Handle local regions locally
-            //
             lock (m_EstateModule.Scenes)
             {
                 foreach (Scene s in m_EstateModule.Scenes)
                 {
-                    if (regions.Contains(s.RegionInfo.RegionID))
+                    RegionInfo sreg = s.RegionInfo;
+                    if (regions.Contains(sreg.RegionID))
                     {
-                        // All regions in one estate are in the same scope.
-                        // Use that scope.
-                        //
-                        ScopeID = s.RegionInfo.ScopeID;
-                        regions.Remove(s.RegionInfo.RegionID);
+                        string url = sreg.ExternalHostName + ":" + sreg.HttpPort;
+                        regions.Remove(sreg.RegionID);
+                        if(!done.Contains(url)) // we may have older regs with same url lost in dbs
+                            done.Add(url);
                     }
                 }
             }
 
-            // Our own region should always be in the above list.
-            // In a standalone this would not be true. But then,
-            // Scope ID is not relevat there. Use first scope.
-            //
-            if (ScopeID == UUID.Zero)
-                ScopeID = m_EstateModule.Scenes[0].RegionInfo.ScopeID;
+            if(regions.Count == 0)
+                return;
 
-            // Don't send to the same instance twice
-            //
-            List<string> done = new List<string>();
+            Scene baseScene = m_EstateModule.Scenes[0];
+            UUID ScopeID = baseScene.RegionInfo.ScopeID;
+            IGridService gridService = baseScene.GridService;
+            if(gridService == null)
+                return;
 
             // Send to remote regions
-            //
             foreach (UUID regionID in regions)
             {
-                GridRegion region = m_EstateModule.Scenes[0].GridService.GetRegionByUUID(ScopeID, regionID);
+                GridRegion region = gridService.GetRegionByUUID(ScopeID, regionID);
                 if (region != null)
                 {
-                    string url = "http://" + region.ExternalHostName + ":" + region.HttpPort;
-                    if (done.Contains(url))
+                    string url = region.ExternalHostName + ":" + region.HttpPort;
+                    if(done.Contains(url))
                         continue;
-
                     Call(region, sendData);
                     done.Add(url);
                 }
@@ -185,9 +190,14 @@ namespace OpenSim.Region.CoreModules.World.Estate
             // m_log.DebugFormat("[XESTATE CONNECTOR]: queryString = {0}", reqString);
             try
             {
-                string url = "http://" + region.ExternalHostName + ":" + region.HttpPort;
+                string url = "";
+                if(port != 0)
+                    url = "http://" + region.ExternalHostName + ":" + port + "/";
+                else
+                    url = region.ServerURI;
+
                 string reply = SynchronousRestFormsRequester.MakeRequest("POST",
-                        url + "/estate",
+                        url + "estate",
                         reqString);
                 if (reply != string.Empty)
                 {
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementCommands.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementCommands.cs
index 702b503..7879f83 100644
--- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementCommands.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementCommands.cs
@@ -49,18 +49,18 @@ namespace OpenSim.Region.CoreModules.World.Estate
     public class EstateManagementCommands
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
+
         protected EstateManagementModule m_module;
 
         public EstateManagementCommands(EstateManagementModule module)
         {
             m_module = module;
         }
-        
+
         public void Initialise()
-        {            
+        {
 //            m_log.DebugFormat("[ESTATE MODULE]: Setting up estate commands for region {0}", m_module.Scene.RegionInfo.RegionName);
-            
+
             m_module.Scene.AddCommand("Regions", m_module, "set terrain texture",
                                "set terrain texture <number> <uuid> [<x>] [<y>]",
                                "Sets the terrain <number> to <uuid>, if <x> or <y> are specified, it will only " +
@@ -77,14 +77,14 @@ namespace OpenSim.Region.CoreModules.World.Estate
 
             m_module.Scene.AddCommand("Regions", m_module, "set water height",
                                "set water height <height> [<x>] [<y>]",
-                               "Sets the water height in meters.  If <x> and <y> are specified, it will only set it on regions with a matching coordinate. " + 
+                               "Sets the water height in meters.  If <x> and <y> are specified, it will only set it on regions with a matching coordinate. " +
                                "Specify -1 in <x> or <y> to wildcard that coordinate.",
                                consoleSetWaterHeight);
 
             m_module.Scene.AddCommand(
                 "Estates", m_module, "estate show", "estate show", "Shows all estates on the simulator.", ShowEstatesCommand);
         }
-        
+
         public void Close() {}
 
         #region CommandHandlers
@@ -120,7 +120,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
                             m_module.Scene.RegionInfo.RegionSettings.TerrainTexture4 = texture;
                             break;
                     }
-                    
+
                     m_module.Scene.RegionInfo.RegionSettings.Save();
                     m_module.TriggerRegionInfoChange();
                     m_module.sendRegionHandshakeToAll();
@@ -130,7 +130,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
         protected void consoleSetWaterHeight(string module, string[] args)
         {
             string heightstring = args[3];
-           
+
             int x = (args.Length > 4 ? int.Parse(args[4]) : -1);
             int y = (args.Length > 5 ? int.Parse(args[5]) : -1);
 
@@ -143,13 +143,13 @@ namespace OpenSim.Region.CoreModules.World.Estate
                     m_log.Debug("[ESTATEMODULE]: Setting water height in " + m_module.Scene.RegionInfo.RegionName + " to " +
                                 string.Format(" {0}", selectedheight));
                     m_module.Scene.RegionInfo.RegionSettings.WaterHeight = selectedheight;
-                    
+
                     m_module.Scene.RegionInfo.RegionSettings.Save();
                     m_module.TriggerRegionInfoChange();
                     m_module.sendRegionHandshakeToAll();
                 }
             }
-        }     
+        }
         protected void consoleSetTerrainHeights(string module, string[] args)
         {
             string num = args[3];
@@ -198,31 +198,31 @@ namespace OpenSim.Region.CoreModules.World.Estate
                             m_module.Scene.RegionInfo.RegionSettings.Elevation2NE = highValue;
                             break;
                     }
-                    
+
                     m_module.Scene.RegionInfo.RegionSettings.Save();
                     m_module.TriggerRegionInfoChange();
                     m_module.sendRegionHandshakeToAll();
                 }
             }
-        }     
-        
+        }
+
         protected void ShowEstatesCommand(string module, string[] cmd)
         {
-            StringBuilder report = new StringBuilder();  
+            StringBuilder report = new StringBuilder();
             RegionInfo ri = m_module.Scene.RegionInfo;
             EstateSettings es = ri.EstateSettings;
-            
-            report.AppendFormat("Estate information for region {0}\n", ri.RegionName);            
+
+            report.AppendFormat("Estate information for region {0}\n", ri.RegionName);
             report.AppendFormat(
                 "{0,-20} {1,-7} {2,-20}\n",
                 "Estate Name",
                 "ID",
                 "Owner");
-            
+
             report.AppendFormat(
-                "{0,-20} {1,-7} {2,-20}\n", 
+                "{0,-20} {1,-7} {2,-20}\n",
                 es.EstateName, es.EstateID, m_module.UserManager.GetUserName(es.EstateOwner));
-            
+
             MainConsole.Instance.Output(report.ToString());
         }
         #endregion
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
index 80fa08a..924f448 100644
--- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
@@ -33,15 +33,19 @@ using System.Linq;
 using System.Reflection;
 using System.Security;
 using System.Timers;
+using System.Threading;
 using log4net;
 using Mono.Addins;
 using Nini.Config;
 using OpenMetaverse;
 using OpenSim.Framework;
+using OpenSim.Framework.Monitoring;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Services.Interfaces;
 using RegionFlags = OpenMetaverse.RegionFlags;
+using Timer = System.Timers.Timer;
+
 
 namespace OpenSim.Region.CoreModules.World.Estate
 {
@@ -53,8 +57,8 @@ namespace OpenSim.Region.CoreModules.World.Estate
         private Timer m_regionChangeTimer = new Timer();
         public Scene Scene { get; private set; }
         public IUserManagement UserManager { get; private set; }
-        
-        protected EstateManagementCommands m_commands;                
+
+        protected EstateManagementCommands m_commands;
 
         /// <summary>
         /// If false, region restart requests from the client are blocked even if they are otherwise legitimate.
@@ -67,14 +71,18 @@ namespace OpenSim.Region.CoreModules.World.Estate
         public event ChangeDelegate OnRegionInfoChange;
         public event ChangeDelegate OnEstateInfoChange;
         public event MessageDelegate OnEstateMessage;
+        public event EstateTeleportOneUserHomeRequest OnEstateTeleportOneUserHomeRequest;
+        public event EstateTeleportAllUsersHomeRequest OnEstateTeleportAllUsersHomeRequest;
+
+        private int m_delayCount = 0;
 
         #region Region Module interface
-        
+
         public string Name { get { return "EstateManagementModule"; } }
-        
-        public Type ReplaceableInterface { get { return null; } }        
 
-        public void Initialise(IConfigSource source) 
+        public Type ReplaceableInterface { get { return null; } }
+
+        public void Initialise(IConfigSource source)
         {
             AllowRegionRestartFromClient = true;
 
@@ -83,7 +91,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
             if (config != null)
                 AllowRegionRestartFromClient = config.GetBoolean("AllowRegionRestartFromClient", true);
         }
-        
+
         public void AddRegion(Scene scene)
         {
             Scene = scene;
@@ -95,20 +103,24 @@ 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) {}            
-        
+
+        public void RemoveRegion(Scene scene) {}
+
         public void RegionLoaded(Scene scene)
         {
             // Sets up the sun module based no the saved Estate and Region Settings
             // DO NOT REMOVE or the sun will stop working
             scene.TriggerEstateSunUpdate();
-            
-            UserManager = scene.RequestModuleInterface<IUserManagement>();            
+
+            UserManager = scene.RequestModuleInterface<IUserManagement>();
         }
 
-        public void Close() 
+        public void Close()
         {
             m_commands.Close();
         }
@@ -142,6 +154,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 +210,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();
@@ -423,7 +447,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
                     Scene.RegionInfo.EstateSettings.EstateID);
 
             remote_client.SendEstateList(invoice,
-                    (int)Constants.EstateAccessCodex.AccessOptions,
+                    (int)Constants.EstateAccessCodex.AllowedAccess,
                     Scene.RegionInfo.EstateSettings.EstateAccess,
                     Scene.RegionInfo.EstateSettings.EstateID);
 
@@ -462,7 +486,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
 
             if((byte)maxAgents <= Scene.RegionInfo.AgentCapacity)
                 Scene.RegionInfo.RegionSettings.AgentLimit = (byte) maxAgents;
-                        else
+            else
                 Scene.RegionInfo.RegionSettings.AgentLimit = Scene.RegionInfo.AgentCapacity;
 
             Scene.RegionInfo.RegionSettings.ObjectBonus = objectBonusFactor;
@@ -554,6 +578,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
                 bool UseEstateSun, bool UseFixedSun, float SunHour,
                 bool UseGlobal, bool EstateFixedSun, float EstateSunHour)
         {
+            double lastwaterlevel = Scene.RegionInfo.RegionSettings.WaterHeight;
             // Water Height
             Scene.RegionInfo.RegionSettings.WaterHeight = WaterHeight;
 
@@ -566,6 +591,9 @@ namespace OpenSim.Region.CoreModules.World.Estate
             Scene.RegionInfo.RegionSettings.FixedSun = UseFixedSun;
             Scene.RegionInfo.RegionSettings.SunPosition = SunHour;
 
+            if(Scene.PhysicsEnabled && Scene.PhysicsScene != null && lastwaterlevel != WaterHeight)
+                Scene.PhysicsScene.SetWaterLevel(WaterHeight);
+
             Scene.TriggerEstateSunUpdate();
 
             //m_log.Debug("[ESTATE]: UFS: " + UseFixedSun.ToString());
@@ -587,6 +615,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)
                 {
@@ -602,7 +640,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
                 restartModule.ScheduleRestart(UUID.Zero, "Region will restart in {0}", times.ToArray(), false);
 
                 m_log.InfoFormat(
-                    "User {0} requested restart of region {1} in {2} seconds", 
+                    "User {0} requested restart of region {1} in {2} seconds",
                     remoteClient.Name, Scene.Name, times.Count != 0 ? times[0] : 0);
             }
         }
@@ -610,236 +648,363 @@ namespace OpenSim.Region.CoreModules.World.Estate
         private void handleChangeEstateCovenantRequest(IClientAPI remoteClient, UUID estateCovenantID)
         {
 //            m_log.DebugFormat(
-//                "[ESTATE MANAGEMENT MODULE]: Handling request from {0} to change estate covenant to {1}", 
+//                "[ESTATE MANAGEMENT MODULE]: Handling request from {0} to change estate covenant to {1}",
 //                remoteClient.Name, estateCovenantID);
-            
+
             Scene.RegionInfo.RegionSettings.Covenant = estateCovenantID;
             Scene.RegionInfo.RegionSettings.CovenantChangedDateTime = Util.UnixTimeSinceEpoch();
             Scene.RegionInfo.RegionSettings.Save();
             TriggerRegionInfoChange();
         }
 
-        private void handleEstateAccessDeltaRequest(IClientAPI remote_client, UUID invoice, int estateAccessType, UUID user)
+        private object deltareqLock = new object();
+        private bool runnigDeltaExec = false;
+
+        private class EstateAccessDeltaRequest
+        {
+            public IClientAPI remote_client;
+            public UUID invoice;
+            public int estateAccessType;
+            public UUID user;
+        }
+
+        private OpenSim.Framework.BlockingQueue<EstateAccessDeltaRequest> deltaRequests = new OpenSim.Framework.BlockingQueue<EstateAccessDeltaRequest>();
+
+        private void handleEstateAccessDeltaRequest(IClientAPI _remote_client, UUID _invoice, int _estateAccessType, UUID _user)
         {
             // EstateAccessDelta handles Estate Managers, Sim Access, Sim Banlist, allowed Groups..  etc.
 
-            if (user == Scene.RegionInfo.EstateSettings.EstateOwner)
+            if (_user == Scene.RegionInfo.EstateSettings.EstateOwner)
                 return; // never process EO
 
-            if ((estateAccessType & 4) != 0) // User add
+            EstateAccessDeltaRequest newreq = new EstateAccessDeltaRequest();
+            newreq.remote_client = _remote_client;
+            newreq.invoice = _invoice;
+            newreq.estateAccessType = _estateAccessType;
+            newreq.user = _user;
+
+            deltaRequests.Enqueue(newreq);
+
+            lock(deltareqLock)
             {
-                if (Scene.Permissions.CanIssueEstateCommand(remote_client.AgentId, true))
+                if(!runnigDeltaExec)
                 {
-                    if ((estateAccessType & 1) != 0) // All estates
+                    runnigDeltaExec = true;
+                    WorkManager.RunInThreadPool(execDeltaRequests,null,"execDeltaRequests");
+                }
+            }
+        }
+
+        private void execDeltaRequests(object o)
+        {
+            IClientAPI remote_client;
+            UUID invoice;
+            int estateAccessType;
+            UUID user;
+            Dictionary<int,EstateSettings> changed = new Dictionary<int,EstateSettings>();
+            Dictionary<IClientAPI,UUID> sendAllowedOrBanList = new Dictionary<IClientAPI,UUID>();
+            Dictionary<IClientAPI,UUID> sendManagers  = new Dictionary<IClientAPI,UUID>();
+            Dictionary<IClientAPI,UUID> sendGroups  = new Dictionary<IClientAPI,UUID>();
+
+            List<EstateSettings> otherEstates = new List<EstateSettings>();
+
+            bool sentAllowedFull = false;
+            bool sentBansFull = false;
+            bool sentGroupsFull = false;
+            bool sentManagersFull = false;
+
+            while(Scene.IsRunning)
+            {
+                EstateAccessDeltaRequest req = deltaRequests.Dequeue(500);
+
+                if(!Scene.IsRunning)
+                    break;
+
+                if(req == null)
+                {
+                    if(changed.Count > 0)
                     {
-                        List<int> estateIDs = Scene.EstateDataService.GetEstatesByOwner(Scene.RegionInfo.EstateSettings.EstateOwner);
-                        EstateSettings estateSettings;
+                        foreach(EstateSettings est in changed.Values)
+                            Scene.EstateDataService.StoreEstateSettings(est);
 
-                        foreach (int estateID in estateIDs)
-                        {
-                            if (estateID != Scene.RegionInfo.EstateSettings.EstateID)
-                            {
-                                estateSettings = Scene.EstateDataService.LoadEstateSettings(estateID);
-                                estateSettings.AddEstateUser(user);
-                                Scene.EstateDataService.StoreEstateSettings(estateSettings);
-                            }
-                        }
+                        TriggerEstateInfoChange();
                     }
 
-                    Scene.RegionInfo.EstateSettings.AddEstateUser(user);
-                    Scene.EstateDataService.StoreEstateSettings(Scene.RegionInfo.EstateSettings);
+                    EstateSettings es = Scene.RegionInfo.EstateSettings;
+                    foreach(KeyValuePair<IClientAPI,UUID> kvp in sendAllowedOrBanList)
+                    {
+                        IClientAPI cli = kvp.Key;
+                        UUID invoive = kvp.Value;
+                        cli.SendEstateList(invoive, (int)Constants.EstateAccessCodex.AllowedAccess, es.EstateAccess, es.EstateID);
+                        cli.SendBannedUserList(invoive, es.EstateBans, es.EstateID);
+                    }
+                    sendAllowedOrBanList.Clear();
 
-                    TriggerEstateInfoChange();
-                    remote_client.SendEstateList(invoice, (int)Constants.EstateAccessCodex.AccessOptions, Scene.RegionInfo.EstateSettings.EstateAccess, Scene.RegionInfo.EstateSettings.EstateID);
+                    foreach(KeyValuePair<IClientAPI,UUID> kvp in sendManagers)
+                    {
+                        IClientAPI cli = kvp.Key;
+                        cli.SendEstateList(kvp.Value, (int)Constants.EstateAccessCodex.EstateManagers, es.EstateManagers, es.EstateID);
+                    }
+                    foreach(KeyValuePair<IClientAPI,UUID> kvp in sendGroups)
+                    {
+                        IClientAPI cli = kvp.Key;
+                        cli.SendEstateList(kvp.Value, (int)Constants.EstateAccessCodex.AllowedGroups, es.EstateGroups, es.EstateID);
+                    }
+                    otherEstates.Clear();
+                    sendAllowedOrBanList.Clear();
+                    sendManagers.Clear();
+                    sendGroups.Clear();
+                    changed.Clear();
+                    lock(deltareqLock)
+                    {
+                        if(deltaRequests.Count() != 0)
+                            continue;
+                        runnigDeltaExec = false;
+                        return;
+                    }
                 }
-                else
+
+                remote_client = req.remote_client;
+                if(!remote_client.IsActive)
+                    continue;
+
+                invoice = req.invoice;
+                user = req.user;
+
+                estateAccessType = req.estateAccessType;
+
+                bool needReply = ((estateAccessType & 1024) == 0);
+                bool doOtherEstates = ((estateAccessType & 3) != 0);
+
+                EstateSettings thisSettings = Scene.RegionInfo.EstateSettings;
+                int thisEstateID =(int)thisSettings.EstateID;
+
+                UUID agentID = remote_client.AgentId;
+
+                bool isadmin = Scene.Permissions.IsAdministrator(agentID);
+                // just i case recheck rights
+                if (!isadmin && !Scene.Permissions.IsEstateManager(agentID))
                 {
-                    remote_client.SendAlertMessage("Method EstateAccessDelta Failed, you don't have permissions");
+                    remote_client.SendAlertMessage("Method EstateAccess Failed, you don't have permissions");
+                    continue;
                 }
 
-            }
-
-            if ((estateAccessType & 8) != 0) // User remove
-            {
-                if (Scene.Permissions.CanIssueEstateCommand(remote_client.AgentId, true))
+                otherEstates.Clear();
+                if(doOtherEstates)
                 {
-                    if ((estateAccessType & 1) != 0) // All estates
+                    UUID thisOwner = Scene.RegionInfo.EstateSettings.EstateOwner;
+                    List<int> estateIDs = Scene.EstateDataService.GetEstatesByOwner(thisOwner);
+                    foreach (int estateID in estateIDs)
                     {
-                        List<int> estateIDs = Scene.EstateDataService.GetEstatesByOwner(Scene.RegionInfo.EstateSettings.EstateOwner);
+                        if (estateID == thisEstateID)
+                            continue;
+
                         EstateSettings estateSettings;
+                        if(changed.ContainsKey(estateID))
+                            estateSettings = changed[estateID];
+                        else
+                            estateSettings = Scene.EstateDataService.LoadEstateSettings(estateID);
+
+                        if(!isadmin && !estateSettings.IsEstateManagerOrOwner(agentID))
+                            continue;
+                        otherEstates.Add(estateSettings);
+                    }
+                    estateIDs.Clear();
+                }
 
-                        foreach (int estateID in estateIDs)
+                // the commands
+                // first the ones allowed for estate managers on this region
+                if ((estateAccessType & 4) != 0) // User add
+                {
+                    if(thisSettings.EstateUsersCount() >= (int)Constants.EstateAccessLimits.AllowedAccess)
+                    {
+                        if(!sentAllowedFull)
                         {
-                            if (estateID != Scene.RegionInfo.EstateSettings.EstateID)
+                            sentAllowedFull = true;
+                            remote_client.SendAlertMessage("Estate Allowed users list is full");
+                         }
+                    }
+                    else
+                    {
+                        if (doOtherEstates)
+                        {
+                            foreach (EstateSettings estateSettings in otherEstates)
                             {
-                                estateSettings = Scene.EstateDataService.LoadEstateSettings(estateID);
-                                estateSettings.RemoveEstateUser(user);
-                                Scene.EstateDataService.StoreEstateSettings(estateSettings);
+                                if(!isadmin && !estateSettings.IsEstateManagerOrOwner(agentID))
+                                    continue;
+                                if(estateSettings.EstateUsersCount() >= (int)Constants.EstateAccessLimits.AllowedAccess)
+                                    continue;
+                                estateSettings.AddEstateUser(user);
+                                estateSettings.RemoveBan(user);
+                                changed[(int)estateSettings.EstateID] = estateSettings;
                             }
                         }
-                    }
 
-                    Scene.RegionInfo.EstateSettings.RemoveEstateUser(user);
-                    Scene.EstateDataService.StoreEstateSettings(Scene.RegionInfo.EstateSettings);
+                        thisSettings.AddEstateUser(user);
+                        thisSettings.RemoveBan(user);
+                        changed[thisEstateID] = thisSettings;;
 
-                    TriggerEstateInfoChange();
-                    remote_client.SendEstateList(invoice, (int)Constants.EstateAccessCodex.AccessOptions, Scene.RegionInfo.EstateSettings.EstateAccess, Scene.RegionInfo.EstateSettings.EstateID);
+                        if(needReply)
+                            sendAllowedOrBanList[remote_client] = invoice;
+                    }
                 }
-                else
+
+                if ((estateAccessType & 8) != 0) // User remove
                 {
-                    remote_client.SendAlertMessage("Method EstateAccessDelta Failed, you don't have permissions");
+                    if (doOtherEstates) // All estates
+                    {
+                        foreach (EstateSettings estateSettings in otherEstates)
+                        {
+                            if(!isadmin && !estateSettings.IsEstateManagerOrOwner(agentID))
+                                continue;
+                            estateSettings.RemoveEstateUser(user);
+                            changed[(int)estateSettings.EstateID] = estateSettings;
+                        }
+                    }
+
+                    thisSettings.RemoveEstateUser(user);
+                    changed[thisEstateID] = thisSettings;;
+
+                    if(needReply)
+                        sendAllowedOrBanList[remote_client] = invoice;
                 }
-            }
 
-            if ((estateAccessType & 16) != 0) // Group add
-            {
-                if (Scene.Permissions.CanIssueEstateCommand(remote_client.AgentId, true))
+                if ((estateAccessType & 16) != 0) // Group add
                 {
-                    if ((estateAccessType & 1) != 0) // All estates
+                    if(thisSettings.EstateGroupsCount() >= (int)Constants.EstateAccessLimits.AllowedGroups)
                     {
-                        List<int> estateIDs = Scene.EstateDataService.GetEstatesByOwner(Scene.RegionInfo.EstateSettings.EstateOwner);
-                        EstateSettings estateSettings;
-
-                        foreach (int estateID in estateIDs)
+                        if(!sentGroupsFull)
+                        {
+                            sentGroupsFull = true;
+                            remote_client.SendAlertMessage("Estate Allowed groups list is full");
+                         }
+                    }
+                    else
+                    {
+                        if (doOtherEstates) // All estates
                         {
-                            if (estateID != Scene.RegionInfo.EstateSettings.EstateID)
+                            foreach (EstateSettings estateSettings in otherEstates)
                             {
-                                estateSettings = Scene.EstateDataService.LoadEstateSettings(estateID);
+                                if(!isadmin && !estateSettings.IsEstateManagerOrOwner(agentID))
+                                    continue;
+                                if(estateSettings.EstateGroupsCount() >= (int)Constants.EstateAccessLimits.AllowedGroups)
+                                    continue;
                                 estateSettings.AddEstateGroup(user);
-                                Scene.EstateDataService.StoreEstateSettings(estateSettings);
+                                changed[(int)estateSettings.EstateID] = estateSettings;
                             }
                         }
-                    }
 
-                    Scene.RegionInfo.EstateSettings.AddEstateGroup(user);
-                    Scene.EstateDataService.StoreEstateSettings(Scene.RegionInfo.EstateSettings);
+                        thisSettings.AddEstateGroup(user);
+                        changed[thisEstateID] = thisSettings;
 
-                    TriggerEstateInfoChange();
-                    remote_client.SendEstateList(invoice, (int)Constants.EstateAccessCodex.AllowedGroups, Scene.RegionInfo.EstateSettings.EstateGroups, Scene.RegionInfo.EstateSettings.EstateID);
-                }
-                else
-                {
-                    remote_client.SendAlertMessage("Method EstateAccessDelta Failed, you don't have permissions");
+                        sendGroups[remote_client] = invoice;
+                    }
                 }
-            }
 
-            if ((estateAccessType & 32) != 0) // Group remove
-            {
-                if (Scene.Permissions.CanIssueEstateCommand(remote_client.AgentId, true))
+                if ((estateAccessType & 32) != 0) // Group remove
                 {
-                    if ((estateAccessType & 1) != 0) // All estates
+                    if (doOtherEstates) // All estates
                     {
-                        List<int> estateIDs = Scene.EstateDataService.GetEstatesByOwner(Scene.RegionInfo.EstateSettings.EstateOwner);
-                        EstateSettings estateSettings;
-
-                        foreach (int estateID in estateIDs)
+                        foreach (EstateSettings estateSettings in otherEstates)
                         {
-                            if (estateID != Scene.RegionInfo.EstateSettings.EstateID)
-                            {
-                                estateSettings = Scene.EstateDataService.LoadEstateSettings(estateID);
-                                estateSettings.RemoveEstateGroup(user);
-                                Scene.EstateDataService.StoreEstateSettings(estateSettings);
-                            }
+                            if(!isadmin && !estateSettings.IsEstateManagerOrOwner(agentID))
+                                continue;
+                            estateSettings.RemoveEstateGroup(user);
+                            changed[(int)estateSettings.EstateID] = estateSettings;
                         }
                     }
 
-                    Scene.RegionInfo.EstateSettings.RemoveEstateGroup(user);
-                    Scene.EstateDataService.StoreEstateSettings(Scene.RegionInfo.EstateSettings);
+                    thisSettings.RemoveEstateGroup(user);
+                    changed[thisEstateID] = thisSettings;
 
-                    TriggerEstateInfoChange();
-                    remote_client.SendEstateList(invoice, (int)Constants.EstateAccessCodex.AllowedGroups, Scene.RegionInfo.EstateSettings.EstateGroups, Scene.RegionInfo.EstateSettings.EstateID);
+                    sendGroups[remote_client] = invoice;
                 }
-                else
-                {
-                    remote_client.SendAlertMessage("Method EstateAccessDelta Failed, you don't have permissions");
-                }
-            }
 
-            if ((estateAccessType & 64) != 0) // Ban add
-            {
-                if (Scene.Permissions.CanIssueEstateCommand(remote_client.AgentId, false))
+                if ((estateAccessType & 64) != 0) // Ban add
                 {
-                    EstateBan[] banlistcheck = Scene.RegionInfo.EstateSettings.EstateBans;
 
-                    bool alreadyInList = false;
-
-                    for (int i = 0; i < banlistcheck.Length; i++)
+                    if(thisSettings.EstateBansCount() >= (int)Constants.EstateAccessLimits.EstateBans)
                     {
-                        if (user == banlistcheck[i].BannedUserID)
+                        if(!sentBansFull)
                         {
-                            alreadyInList = true;
-                            break;
+                            sentBansFull = true;
+                            remote_client.SendAlertMessage("Estate Ban list is full");
                         }
-
                     }
-                    if (!alreadyInList)
+                    else
                     {
+                        EstateBan[] banlistcheck = Scene.RegionInfo.EstateSettings.EstateBans;
 
-                        if ((estateAccessType & 1) != 0) // All estates
-                        {
-                            List<int> estateIDs = Scene.EstateDataService.GetEstatesByOwner(Scene.RegionInfo.EstateSettings.EstateOwner);
-                            EstateSettings estateSettings;
+                        bool alreadyInList = false;
 
-                            foreach (int estateID in estateIDs)
+                        for (int i = 0; i < banlistcheck.Length; i++)
+                        {
+                            if (user == banlistcheck[i].BannedUserID)
+                            {
+                                alreadyInList = true;
+                                break;
+                            }
+                        }
+                        if (!alreadyInList)
+                        {
+                            if (doOtherEstates) // All estates
                             {
-                                if (estateID != Scene.RegionInfo.EstateSettings.EstateID)
+                                foreach (EstateSettings estateSettings in otherEstates)
                                 {
+                                    if(!isadmin && !estateSettings.IsEstateManagerOrOwner(agentID))
+                                        continue;
+
+                                    if(estateSettings.EstateBansCount() >= (int)Constants.EstateAccessLimits.EstateBans)
+                                        continue;
+
                                     EstateBan bitem = new EstateBan();
 
                                     bitem.BannedUserID = user;
-                                    bitem.EstateID = (uint)estateID;
+                                    bitem.EstateID = estateSettings.EstateID;
                                     bitem.BannedHostAddress = "0.0.0.0";
                                     bitem.BannedHostIPMask = "0.0.0.0";
 
-                                    estateSettings = Scene.EstateDataService.LoadEstateSettings(estateID);
                                     estateSettings.AddBan(bitem);
-                                    Scene.EstateDataService.StoreEstateSettings(estateSettings);
+                                    estateSettings.RemoveEstateUser(user);
+                                    changed[(int)estateSettings.EstateID] = estateSettings;
                                 }
                             }
-                        }
 
-                        EstateBan item = new EstateBan();
+                            EstateBan item = new EstateBan();
 
-                        item.BannedUserID = user;
-                        item.EstateID = Scene.RegionInfo.EstateSettings.EstateID;
-                        item.BannedHostAddress = "0.0.0.0";
-                        item.BannedHostIPMask = "0.0.0.0";
+                            item.BannedUserID = user;
+                            item.EstateID = Scene.RegionInfo.EstateSettings.EstateID;
+                            item.BannedHostAddress = "0.0.0.0";
+                            item.BannedHostIPMask = "0.0.0.0";
 
-                        Scene.RegionInfo.EstateSettings.AddBan(item);
-                        Scene.EstateDataService.StoreEstateSettings(Scene.RegionInfo.EstateSettings);
+                            thisSettings.AddBan(item);
+                            thisSettings.RemoveEstateUser(user);
+                            changed[thisEstateID] = thisSettings;
 
-                        TriggerEstateInfoChange();
-
-                        ScenePresence s = Scene.GetScenePresence(user);
-                        if (s != null)
-                        {
-                            if (!s.IsChildAgent)
+                            ScenePresence s = Scene.GetScenePresence(user);
+                            if (s != null)
                             {
-                                if (!Scene.TeleportClientHome(user, s.ControllingClient))
+                                if (!s.IsChildAgent)
                                 {
-                                    s.ControllingClient.Kick("Your access to the region was revoked and TP home failed - you have been logged out.");
-                                    Scene.CloseAgent(s.UUID, false);
+                                    if (!Scene.TeleportClientHome(user, s.ControllingClient))
+                                    {
+                                        s.ControllingClient.Kick("Your access to the region was revoked and TP home failed - you have been logged out.");
+                                        Scene.CloseAgent(s.UUID, false);
+                                    }
                                 }
                             }
                         }
-
-                    }
-                    else
-                    {
-                        remote_client.SendAlertMessage("User is already on the region ban list");
+                        else
+                        {
+                            remote_client.SendAlertMessage("User is already on the region ban list");
+                        }
+                        //Scene.RegionInfo.regionBanlist.Add(Manager(user);
+                        if(needReply)
+                            sendAllowedOrBanList[remote_client] = invoice;
                     }
-                    //Scene.RegionInfo.regionBanlist.Add(Manager(user);
-                    remote_client.SendBannedUserList(invoice, Scene.RegionInfo.EstateSettings.EstateBans, Scene.RegionInfo.EstateSettings.EstateID);
-                }
-                else
-                {
-                    remote_client.SendAlertMessage("Method EstateAccessDelta Failed, you don't have permissions");
                 }
-            }
 
-            if ((estateAccessType & 128) != 0) // Ban remove
-            {
-                if (Scene.Permissions.CanIssueEstateCommand(remote_client.AgentId, false))
+                if ((estateAccessType & 128) != 0) // Ban remove
                 {
                     EstateBan[] banlistcheck = Scene.RegionInfo.EstateSettings.EstateBans;
 
@@ -855,107 +1020,93 @@ namespace OpenSim.Region.CoreModules.World.Estate
                             break;
                         }
                     }
-                    
+
                     if (alreadyInList && listitem != null)
                     {
-                        if ((estateAccessType & 1) != 0) // All estates
+                        if (doOtherEstates) // All estates
                         {
-                            List<int> estateIDs = Scene.EstateDataService.GetEstatesByOwner(Scene.RegionInfo.EstateSettings.EstateOwner);
-                            EstateSettings estateSettings;
-
-                            foreach (int estateID in estateIDs)
+                            foreach (EstateSettings estateSettings in otherEstates)
                             {
-                                if (estateID != Scene.RegionInfo.EstateSettings.EstateID)
-                                {
-                                    estateSettings = Scene.EstateDataService.LoadEstateSettings(estateID);
-                                    estateSettings.RemoveBan(user);
-                                    Scene.EstateDataService.StoreEstateSettings(estateSettings);
-                                }
+                                if(!isadmin && !estateSettings.IsEstateManagerOrOwner(agentID))
+                                    continue;
+                                estateSettings.RemoveBan(user);
+                                changed[(int)estateSettings.EstateID] = estateSettings;
                             }
                         }
 
-                        Scene.RegionInfo.EstateSettings.RemoveBan(listitem.BannedUserID);
-                        Scene.EstateDataService.StoreEstateSettings(Scene.RegionInfo.EstateSettings);
-
-                        TriggerEstateInfoChange();
+                        thisSettings.RemoveBan(listitem.BannedUserID);
+                        changed[thisEstateID] = thisSettings;
                     }
                     else
                     {
                         remote_client.SendAlertMessage("User is not on the region ban list");
                     }
-                    
-                    //Scene.RegionInfo.regionBanlist.Add(Manager(user);
-                    remote_client.SendBannedUserList(invoice, Scene.RegionInfo.EstateSettings.EstateBans, Scene.RegionInfo.EstateSettings.EstateID);
+
+                    if(needReply)
+                        sendAllowedOrBanList[remote_client] = invoice;
                 }
-                else
+
+                // last the ones only for owners of this region
+                if (!Scene.Permissions.CanIssueEstateCommand(agentID, true))
                 {
-                    remote_client.SendAlertMessage("Method EstateAccessDelta Failed, you don't have permissions");
+                        remote_client.SendAlertMessage("Method EstateAccess Failed, you don't have permissions");
+                        continue;
                 }
-            }
 
-            if ((estateAccessType & 256) != 0) // Manager add
-            {
-                if (Scene.Permissions.CanIssueEstateCommand(remote_client.AgentId, true))
+                if ((estateAccessType & 256) != 0) // Manager add
                 {
-                    if ((estateAccessType & 1) != 0) // All estates
+                    if(thisSettings.EstateManagersCount() >= (int)Constants.EstateAccessLimits.EstateManagers)
                     {
-                        List<int> estateIDs = Scene.EstateDataService.GetEstatesByOwner(Scene.RegionInfo.EstateSettings.EstateOwner);
-                        EstateSettings estateSettings;
-
-                        foreach (int estateID in estateIDs)
+                        if(!sentManagersFull)
+                        {
+                            sentManagersFull = true;
+                            remote_client.SendAlertMessage("Estate Managers list is full");
+                         }
+                    }
+                    else
+                    {
+                        if (doOtherEstates) // All estates
                         {
-                            if (estateID != Scene.RegionInfo.EstateSettings.EstateID)
+                            foreach (EstateSettings estateSettings in otherEstates)
                             {
-                                estateSettings = Scene.EstateDataService.LoadEstateSettings(estateID);
+                                if(!isadmin && !estateSettings.IsEstateOwner(agentID)) // redundante check?
+                                    continue;
+                                if(estateSettings.EstateManagersCount() >= (int)Constants.EstateAccessLimits.EstateManagers)
+                                    continue;
                                 estateSettings.AddEstateManager(user);
-                                Scene.EstateDataService.StoreEstateSettings(estateSettings);
+                                changed[(int)estateSettings.EstateID] = estateSettings;
                             }
                         }
-                    }
 
-                    Scene.RegionInfo.EstateSettings.AddEstateManager(user);
-                    Scene.EstateDataService.StoreEstateSettings(Scene.RegionInfo.EstateSettings);
+                        thisSettings.AddEstateManager(user);
+                        changed[thisEstateID] = thisSettings;
 
-                    TriggerEstateInfoChange();
-                    remote_client.SendEstateList(invoice, (int)Constants.EstateAccessCodex.EstateManagers, Scene.RegionInfo.EstateSettings.EstateManagers, Scene.RegionInfo.EstateSettings.EstateID);
-                }
-                else
-                {
-                    remote_client.SendAlertMessage("Method EstateAccessDelta Failed, you don't have permissions");
+                        sendManagers[remote_client] = invoice;
+                    }
                 }
-            }
 
-            if ((estateAccessType & 512) != 0) // Manager remove
-            {
-                if (Scene.Permissions.CanIssueEstateCommand(remote_client.AgentId, true))
+                if ((estateAccessType & 512) != 0) // Manager remove
                 {
-                    if ((estateAccessType & 1) != 0) // All estates
+                    if (doOtherEstates) // All estates
                     {
-                        List<int> estateIDs = Scene.EstateDataService.GetEstatesByOwner(Scene.RegionInfo.EstateSettings.EstateOwner);
-                        EstateSettings estateSettings;
-
-                        foreach (int estateID in estateIDs)
+                        foreach (EstateSettings estateSettings in otherEstates)
                         {
-                            if (estateID != Scene.RegionInfo.EstateSettings.EstateID)
-                            {
-                                estateSettings = Scene.EstateDataService.LoadEstateSettings(estateID);
-                                estateSettings.RemoveEstateManager(user);
-                                Scene.EstateDataService.StoreEstateSettings(estateSettings);
-                            }
+                            if(!isadmin && !estateSettings.IsEstateOwner(agentID))
+                                continue;
+
+                            estateSettings.RemoveEstateManager(user);
+                            changed[(int)estateSettings.EstateID] = estateSettings;
                         }
                     }
 
-                    Scene.RegionInfo.EstateSettings.RemoveEstateManager(user);
-                    Scene.EstateDataService.StoreEstateSettings(Scene.RegionInfo.EstateSettings);
+                    thisSettings.RemoveEstateManager(user);
+                    changed[thisEstateID] = thisSettings;
 
-                    TriggerEstateInfoChange();
-                    remote_client.SendEstateList(invoice, (int)Constants.EstateAccessCodex.EstateManagers, Scene.RegionInfo.EstateSettings.EstateManagers, Scene.RegionInfo.EstateSettings.EstateID);
-                }
-                else
-                {
-                    remote_client.SendAlertMessage("Method EstateAccessDelta Failed, you don't have permissions");
+                    sendManagers[remote_client] = invoice;
                 }
             }
+            lock(deltareqLock)
+                runnigDeltaExec = false;
         }
 
         public void HandleOnEstateManageTelehub(IClientAPI client, UUID invoice, UUID senderID, string cmd, uint param1)
@@ -1007,7 +1158,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
             IClientAPI remote_client, UUID invoice, UUID senderID, UUID sessionID, string senderName, string message)
         {
             IDialogModule dm = Scene.RequestModuleInterface<IDialogModule>();
-            
+
             if (dm != null)
                 dm.SendNotificationToUsersInRegion(senderID, senderName, message);
         }
@@ -1044,13 +1195,20 @@ namespace OpenSim.Region.CoreModules.World.Estate
 
         private void handleEstateTeleportOneUserHomeRequest(IClientAPI remover_client, UUID invoice, UUID senderID, UUID prey)
         {
+             EstateTeleportOneUserHomeRequest evOverride = OnEstateTeleportOneUserHomeRequest;
+             if(evOverride != null)
+             {
+                evOverride(remover_client, invoice, senderID, prey);
+                return;
+             }
+
             if (!Scene.Permissions.CanIssueEstateCommand(remover_client.AgentId, false))
                 return;
 
             if (prey != UUID.Zero)
             {
                 ScenePresence s = Scene.GetScenePresence(prey);
-                if (s != null)
+                if (s != null && !s.IsDeleted && !s.IsInTransit)
                 {
                     if (!Scene.TeleportClientHome(prey, s.ControllingClient))
                     {
@@ -1063,6 +1221,13 @@ namespace OpenSim.Region.CoreModules.World.Estate
 
         private void handleEstateTeleportAllUsersHomeRequest(IClientAPI remover_client, UUID invoice, UUID senderID)
         {
+             EstateTeleportAllUsersHomeRequest evOverride = OnEstateTeleportAllUsersHomeRequest;
+             if(evOverride != null)
+             {
+                evOverride(remover_client, invoice, senderID);
+                return;
+             }
+
             if (!Scene.Permissions.CanIssueEstateCommand(remover_client.AgentId, false))
                 return;
 
@@ -1084,7 +1249,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
                 }
             });
         }
-        
+
         private void AbortTerrainXferHandler(IClientAPI remoteClient, ulong XferID)
         {
             lock (this)
@@ -1167,7 +1332,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
                 if (TerrainUploader == null)
                 {
                     m_log.DebugFormat(
-                        "[TERRAIN]: Started receiving terrain upload for region {0} from {1}", 
+                        "[TERRAIN]: Started receiving terrain upload for region {0} from {1}",
                         Scene.Name, remote_client.Name);
 
                     TerrainUploader = new EstateTerrainXferHandler(remote_client, clientFileName);
@@ -1187,25 +1352,43 @@ namespace OpenSim.Region.CoreModules.World.Estate
         {
             // Save terrain here
             ITerrainModule terr = Scene.RequestModuleInterface<ITerrainModule>();
-            
+
             if (terr != null)
             {
+                string file = Util.cacheDir() + "/terrain_";
+                try
+                {
+                    file = file + Uri.EscapeDataString(Scene.Name) + ".raw";
+                }
+                catch (Exception)
+                {
+                    file = file + ".raw";
+                }
 //                m_log.Warn("[CLIENT]: Got Request to Send Terrain in region " + Scene.RegionInfo.RegionName);
-                if (File.Exists(Util.dataDir() + "/terrain.raw"))
+                if (File.Exists(file))
+                {
+                    File.Delete(file);
+                }
+                terr.SaveToFile(file);
+
+                byte[] bdata;
+                using(FileStream input = new FileStream(file, FileMode.Open))
+                {
+                    bdata = new byte[input.Length];
+                    input.Read(bdata, 0, (int)input.Length);
+                }
+                if(bdata == null || bdata.Length == 0)
                 {
-                    File.Delete(Util.dataDir() + "/terrain.raw");
+                    remote_client.SendAlertMessage("Terrain error");
+                    return;
                 }
-                terr.SaveToFile(Util.dataDir() + "/terrain.raw");
 
-                FileStream input = new FileStream(Util.dataDir() + "/terrain.raw", FileMode.Open);
-                byte[] bdata = new byte[input.Length];
-                input.Read(bdata, 0, (int)input.Length);
                 remote_client.SendAlertMessage("Terrain file written, starting download...");
-                Scene.XferManager.AddNewFile("terrain.raw", bdata);
+                string xfername = (UUID.Random()).ToString();
+                Scene.XferManager.AddNewFile(xfername, bdata);
 
                 m_log.DebugFormat("[CLIENT]: Sending terrain for region {0} to {1}", Scene.Name, remote_client.Name);
-
-                remote_client.SendInitiateDownload("terrain.raw", clientFileName);
+                remote_client.SendInitiateDownload(xfername, clientFileName);
             }
         }
 
@@ -1319,7 +1502,8 @@ namespace OpenSim.Region.CoreModules.World.Estate
 
         public void sendRegionInfoPacketToAll()
         {
-            Scene.ForEachRootClient(delegate(IClientAPI client)
+//            Scene.ForEachRootClient(delegate(IClientAPI client)
+            Scene.ForEachClient(delegate(IClientAPI client)
             {
                 HandleRegionInfoRequest(client);
             });
@@ -1443,7 +1627,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
                     Scene.RegionInfo.EstateSettings.FixedSun,
                     (float)Scene.RegionInfo.EstateSettings.SunPosition);
 
-            sendRegionInfoPacketToAll();
+//            sendRegionInfoPacketToAll(); already done by setRegionTerrainSettings
         }
 
 
@@ -1477,7 +1661,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/Estate/XEstateModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateModule.cs
index 4bb3799..f3c8aa8 100644
--- a/OpenSim/Region/CoreModules/World/Estate/XEstateModule.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateModule.cs
@@ -45,12 +45,14 @@ using Mono.Addins;
 namespace OpenSim.Region.CoreModules.World.Estate
 {
     [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "XEstate")]
-    public class XEstateModule : ISharedRegionModule
+    public class EstateModule : ISharedRegionModule
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         protected List<Scene> m_Scenes = new List<Scene>();
         protected bool m_InInfoUpdate = false;
+        private string token = "7db8eh2gvgg45jj";
+        protected bool m_enabled = false;
 
         public bool InInfoUpdate
         {
@@ -67,19 +69,33 @@ namespace OpenSim.Region.CoreModules.World.Estate
 
         public void Initialise(IConfigSource config)
         {
-            int port = 0;
+            uint port = MainServer.Instance.Port;
 
-            IConfig estateConfig = config.Configs["Estate"];
+            IConfig estateConfig = config.Configs["Estates"];
             if (estateConfig != null)
             {
-                port = estateConfig.GetInt("Port", 0);
+                if (estateConfig.GetString("EstateCommunicationsHandler", Name) == Name)
+                    m_enabled = true;
+                else
+                    return;
+
+                port = (uint)estateConfig.GetInt("Port", 0);
+                // this will need to came from somewhere else
+                token = estateConfig.GetString("Token", token);
+            }
+            else
+            {
+                m_enabled = true;
             }
 
-            m_EstateConnector = new EstateConnector(this);
+            m_EstateConnector = new EstateConnector(this, token, port);
+
+            if(port == 0)
+                 port = MainServer.Instance.Port;
 
             // Instantiate the request handler
-            IHttpServer server = MainServer.GetHttpServer((uint)port);
-            server.AddStreamHandler(new EstateRequestHandler(this));
+            IHttpServer server = MainServer.GetHttpServer(port);
+            server.AddStreamHandler(new EstateRequestHandler(this, token));
         }
 
         public void PostInitialise()
@@ -92,24 +108,31 @@ namespace OpenSim.Region.CoreModules.World.Estate
 
         public void AddRegion(Scene scene)
         {
+            if (!m_enabled)
+                return;
+
             lock (m_Scenes)
                 m_Scenes.Add(scene);
-
-            scene.EventManager.OnNewClient += OnNewClient;
         }
 
         public void RegionLoaded(Scene scene)
         {
+            if (!m_enabled)
+                return;
+
             IEstateModule em = scene.RequestModuleInterface<IEstateModule>();
 
             em.OnRegionInfoChange += OnRegionInfoChange;
             em.OnEstateInfoChange += OnEstateInfoChange;
             em.OnEstateMessage += OnEstateMessage;
+            em.OnEstateTeleportOneUserHomeRequest += OnEstateTeleportOneUserHomeRequest;
+            em.OnEstateTeleportAllUsersHomeRequest += OnEstateTeleportAllUsersHomeRequest;
         }
 
         public void RemoveRegion(Scene scene)
         {
-            scene.EventManager.OnNewClient -= OnNewClient;
+            if (!m_enabled)
+                return;
 
             lock (m_Scenes)
                 m_Scenes.Remove(scene);
@@ -181,13 +204,6 @@ namespace OpenSim.Region.CoreModules.World.Estate
                 m_EstateConnector.SendEstateMessage(estateID, FromID, FromName, Message);
         }
 
-        private void OnNewClient(IClientAPI client)
-        {
-            client.OnEstateTeleportOneUserHomeRequest += OnEstateTeleportOneUserHomeRequest;
-            client.OnEstateTeleportAllUsersHomeRequest += OnEstateTeleportAllUsersHomeRequest;
-
-        }
-
         private void OnEstateTeleportOneUserHomeRequest(IClientAPI client, UUID invoice, UUID senderID, UUID prey)
         {
             if (prey == UUID.Zero)
@@ -205,16 +221,18 @@ namespace OpenSim.Region.CoreModules.World.Estate
 
             foreach (Scene s in Scenes)
             {
-                if (s == scene)
-                    continue; // Already handles by estate module
                 if (s.RegionInfo.EstateSettings.EstateID != estateID)
                     continue;
 
                 ScenePresence p = scene.GetScenePresence(prey);
-                if (p != null && !p.IsChildAgent)
+                if (p != null && !p.IsChildAgent )
                 {
-                    p.ControllingClient.SendTeleportStart(16);
-                    scene.TeleportClientHome(prey, p.ControllingClient);
+                    if(!p.IsDeleted && !p.IsInTransit)
+                    {
+                        p.ControllingClient.SendTeleportStart(16);
+                        scene.TeleportClientHome(prey, p.ControllingClient);
+                    }
+                    return;
                 }
             }
 
@@ -235,8 +253,6 @@ namespace OpenSim.Region.CoreModules.World.Estate
 
             foreach (Scene s in Scenes)
             {
-                if (s == scene)
-                    continue; // Already handles by estate module
                 if (s.RegionInfo.EstateSettings.EstateID != estateID)
                     continue;
 
diff --git a/OpenSim/Region/CoreModules/World/Estate/XEstateRequestHandler.cs b/OpenSim/Region/CoreModules/World/Estate/EstateRequestHandler.cs
index ec5af2b..5eda8ab 100644
--- a/OpenSim/Region/CoreModules/World/Estate/XEstateRequestHandler.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateRequestHandler.cs
@@ -46,24 +46,27 @@ namespace OpenSim.Region.CoreModules.World.Estate
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        protected XEstateModule m_EstateModule;
+        protected EstateModule m_EstateModule;
         protected Object m_RequestLock = new Object();
+        private string token;
 
-        public EstateRequestHandler(XEstateModule fmodule)
+        public EstateRequestHandler(EstateModule fmodule, string _token)
                 : base("POST", "/estate")
         {
             m_EstateModule = fmodule;
+            token = _token;
         }
 
         protected override byte[] ProcessRequest(string path, Stream requestData,
                 IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
         {
-            StreamReader sr = new StreamReader(requestData);
-            string body = sr.ReadToEnd();
-            sr.Close();
+            string body;
+            using(StreamReader sr = new StreamReader(requestData))
+                body = sr.ReadToEnd();
+
             body = body.Trim();
 
-            m_log.DebugFormat("[XESTATE HANDLER]: query String: {0}", body);
+            // m_log.DebugFormat("[XESTATE HANDLER]: query String: {0}", body);
 
             try
             {
@@ -75,6 +78,15 @@ namespace OpenSim.Region.CoreModules.World.Estate
                     if (!request.ContainsKey("METHOD"))
                         return FailureResult();
 
+                    if (!request.ContainsKey("TOKEN"))
+                        return FailureResult();
+
+                    string reqToken = request["TOKEN"].ToString();
+                    request.Remove("TOKEN");
+
+                    if(token != reqToken)
+                        return FailureResult();
+
                     string method = request["METHOD"].ToString();
                     request.Remove("METHOD");
 
diff --git a/OpenSim/Region/CoreModules/World/Land/DwellModule.cs b/OpenSim/Region/CoreModules/World/Land/DwellModule.cs
index 70c6028..22480e6 100644
--- a/OpenSim/Region/CoreModules/World/Land/DwellModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/DwellModule.cs
@@ -53,7 +53,7 @@ using GridRegion = OpenSim.Services.Interfaces.GridRegion;
 namespace OpenSim.Region.CoreModules.World.Land
 {
     [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "DefaultDwellModule")]
-    public class DefaultDwellModule : IDwellModule, INonSharedRegionModule
+    public class DefaultDwellModule : INonSharedRegionModule, IDwellModule
     {
         private Scene m_scene;
         private IConfigSource m_Config;
@@ -88,16 +88,21 @@ namespace OpenSim.Region.CoreModules.World.Land
                 return;
 
             m_scene = scene;
-
-            m_scene.EventManager.OnNewClient += OnNewClient;
+            m_scene.RegisterModuleInterface<IDwellModule>(this);
         }
 
         public void RegionLoaded(Scene scene)
         {
+            if (!m_Enabled)
+                return;
+            m_scene.EventManager.OnNewClient += OnNewClient;
         }
 
         public void RemoveRegion(Scene scene)
         {
+            if (!m_Enabled)
+                return;
+            m_scene.EventManager.OnNewClient -= OnNewClient;
         }
 
         public void Close()
@@ -115,12 +120,26 @@ namespace OpenSim.Region.CoreModules.World.Land
             if (parcel == null)
                 return;
 
-            client.SendParcelDwellReply(localID, parcel.LandData.GlobalID, parcel.LandData.Dwell);
+            LandData land = parcel.LandData;
+            if(land!= null)
+                client.SendParcelDwellReply(localID, land.GlobalID, land.Dwell);
         }
 
+
         public int GetDwell(UUID parcelID)
         {
+            ILandObject parcel = m_scene.LandChannel.GetLandObject(parcelID);
+            if (parcel != null && parcel.LandData != null)
+               return (int)(parcel.LandData.Dwell);
+            return 0;
+        }
+
+        public int GetDwell(LandData land)
+        {
+            if (land != null)
+               return (int)(land.Dwell);
             return 0;
         }
+
     }
 }
diff --git a/OpenSim/Region/CoreModules/World/Land/LandChannel.cs b/OpenSim/Region/CoreModules/World/Land/LandChannel.cs
index 73c592d..5ff063b 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandChannel.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandChannel.cs
@@ -37,26 +37,37 @@ namespace OpenSim.Region.CoreModules.World.Land
     {
         #region Constants
 
+        public const float BAN_LINE_SAFETY_HEIGHT = 100;
         //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;
@@ -64,7 +75,7 @@ namespace OpenSim.Region.CoreModules.World.Land
         #endregion
 
         private readonly Scene m_scene;
-        private readonly LandManagementModule m_landManagementModule;        
+        private readonly LandManagementModule m_landManagementModule;
 
         public LandChannel(Scene scene, LandManagementModule landManagementMod)
         {
@@ -80,7 +91,7 @@ namespace OpenSim.Region.CoreModules.World.Land
             {
                 return m_landManagementModule.GetLandObject(x_float, y_float);
             }
-            
+
             ILandObject obj = new LandObject(UUID.Zero, false, m_scene);
             obj.LandData.Name = "NO LAND";
             return obj;
@@ -95,6 +106,15 @@ namespace OpenSim.Region.CoreModules.World.Land
             return null;
         }
 
+        public ILandObject GetLandObject(UUID GlobalID)
+        {
+            if (m_landManagementModule != null)
+            {
+                return m_landManagementModule.GetLandObject(GlobalID);
+            }
+            return null;
+        }
+
         public ILandObject GetLandObject(Vector3 position)
         {
             return GetLandObject(position.X, position.Y);
@@ -106,7 +126,7 @@ namespace OpenSim.Region.CoreModules.World.Land
             {
                 return m_landManagementModule.GetLandObject(x, y);
             }
-            
+
             ILandObject obj = new LandObject(UUID.Zero, false, m_scene);
             obj.LandData.Name = "NO LAND";
             return obj;
@@ -121,7 +141,7 @@ namespace OpenSim.Region.CoreModules.World.Land
 
             return new List<ILandObject>();
         }
-        
+
         public void Clear(bool setupDefaultParcel)
         {
             if (m_landManagementModule != null)
@@ -156,6 +176,14 @@ namespace OpenSim.Region.CoreModules.World.Land
             }
         }
 
+        public void SendParcelsOverlay(IClientAPI client)
+        {
+            if (m_landManagementModule != null)
+            {
+                m_landManagementModule.SendParcelOverlay(client);
+            }
+        }
+
         public void Join(int start_x, int start_y, int end_x, int end_y, UUID attempting_user_id)
         {
             if (m_landManagementModule != null)
@@ -171,7 +199,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                 m_landManagementModule.Subdivide(start_x, start_y, end_x, end_y, attempting_user_id);
             }
         }
-        
+
         public void ReturnObjectsInParcel(int localID, uint returnType, UUID[] agentIDs, UUID[] taskIDs, IClientAPI remoteClient)
         {
             if (m_landManagementModule != null)
@@ -203,7 +231,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..b1f5122 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
@@ -41,6 +41,7 @@ using OpenSim.Framework;
 using OpenSim.Framework.Capabilities;
 using OpenSim.Framework.Console;
 using OpenSim.Framework.Servers;
+using OpenSim.Framework.Monitoring;
 using OpenSim.Framework.Servers.HttpServer;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
@@ -52,7 +53,7 @@ using GridRegion = OpenSim.Services.Interfaces.GridRegion;
 namespace OpenSim.Region.CoreModules.World.Land
 {
     // used for caching
-    internal class ExtendedLandData 
+    internal class ExtendedLandData
     {
         public LandData LandData;
         public ulong RegionHandle;
@@ -69,9 +70,8 @@ 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/";
+        public const int LandUnit = 4;
 
         private LandChannel landChannel;
         private Scene m_scene;
@@ -89,20 +89,27 @@ 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 Dictionary<UUID, int> m_landUUIDList = new Dictionary<UUID, int>();
 
         private int m_lastLandLocalID = LandChannel.START_LAND_LOCAL_ID - 1;
 
         private bool m_allowedForcefulBans = true;
+        private bool m_showBansLines = 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>();
+        private HashSet<UUID> forcedPosition = new HashSet<UUID>();
+
 
         // Enables limiting parcel layer info transmission when doing simple updates
         private bool shouldLimitParcelLayerInfoToViewDistance { get; set; }
@@ -125,6 +132,11 @@ 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");
+                bool disablebans = landManagementConfig.GetBoolean("DisableParcelBans", !m_allowedForcefulBans);
+                m_allowedForcefulBans = !disablebans;
+                m_showBansLines = landManagementConfig.GetBoolean("ShowParcelBansLines", m_showBansLines);
             }
         }
 
@@ -132,17 +144,20 @@ 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();
             parcelInfoCache.Size = 30; // the number of different parcel requests in this region to cache
             parcelInfoCache.DefaultTTL = new TimeSpan(0, 5, 0);
 
+            m_scene.EventManager.OnObjectAddedToScene += EventManagerOnParcelPrimCountAdd;
             m_scene.EventManager.OnParcelPrimCountAdd += EventManagerOnParcelPrimCountAdd;
+
+            m_scene.EventManager.OnObjectBeingRemovedFromScene += EventManagerOnObjectBeingRemovedFromScene;
             m_scene.EventManager.OnParcelPrimCountUpdate += EventManagerOnParcelPrimCountUpdate;
-            m_scene.EventManager.OnObjectBeingRemovedFromScene += EventManagerOnObjectBeingRemovedFromScene;            
             m_scene.EventManager.OnRequestParcelPrimCountUpdate += EventManagerOnRequestParcelPrimCountUpdate;
-            
+
             m_scene.EventManager.OnAvatarEnteringNewParcel += EventManagerOnAvatarEnteringNewParcel;
             m_scene.EventManager.OnClientMovement += EventManagerOnClientMovement;
             m_scene.EventManager.OnValidateLandBuy += EventManagerOnValidateLandBuy;
@@ -152,14 +167,14 @@ namespace OpenSim.Region.CoreModules.World.Land
             m_scene.EventManager.OnSignificantClientMovement += EventManagerOnSignificantClientMovement;
             m_scene.EventManager.OnNoticeNoLandDataFromStorage += EventManagerOnNoLandDataFromStorage;
             m_scene.EventManager.OnIncomingLandDataFromStorage += EventManagerOnIncomingLandDataFromStorage;
-            m_scene.EventManager.OnSetAllowForcefulBan += EventManagerOnSetAllowedForcefulBan;            
+            m_scene.EventManager.OnSetAllowForcefulBan += EventManagerOnSetAllowedForcefulBan;
             m_scene.EventManager.OnRegisterCaps += EventManagerOnRegisterCaps;
 
             lock (m_scene)
             {
                 m_scene.LandChannel = (ILandChannel)landChannel;
             }
-            
+
             RegisterCommands();
         }
 
@@ -172,8 +187,8 @@ namespace OpenSim.Region.CoreModules.World.Land
         }
 
         public void RemoveRegion(Scene scene)
-        {            
-            // TODO: Release event manager listeners here      
+        {
+            // TODO: Release event manager listeners here
         }
 
 //        private bool OnVerifyUserConnection(ScenePresence scenePresence, out string reason)
@@ -181,7 +196,7 @@ namespace OpenSim.Region.CoreModules.World.Land
 //            ILandObject nearestParcel = m_scene.GetNearestAllowedParcel(scenePresence.UUID, scenePresence.AbsolutePosition.X, scenePresence.AbsolutePosition.Y);
 //            reason = "You are not allowed to enter this sim.";
 //            return nearestParcel != null;
-//        }     
+//        }
 
         void EventManagerOnNewClient(IClientAPI client)
         {
@@ -199,18 +214,10 @@ namespace OpenSim.Region.CoreModules.World.Land
             client.OnParcelReclaim += ClientOnParcelReclaim;
             client.OnParcelInfoRequest += ClientOnParcelInfoRequest;
             client.OnParcelDeedToGroup += ClientOnParcelDeedToGroup;
-            client.OnPreAgentUpdate += ClientOnPreAgentUpdate;
             client.OnParcelEjectUser += ClientOnParcelEjectUser;
             client.OnParcelFreezeUser += ClientOnParcelFreezeUser;
             client.OnSetStartLocationRequest += ClientOnSetHome;
-
-
-            EntityBase presenceEntity;
-            if (m_scene.Entities.TryGetValue(client.AgentId, out presenceEntity) && presenceEntity is ScenePresence)
-            {
-                SendLandUpdate((ScenePresence)presenceEntity, true);
-                SendParcelOverlay(client);
-            }
+            client.OnParcelBuyPass += ClientParcelBuyPass;
         }
 
         public void EventMakeChildAgent(ScenePresence avatar)
@@ -218,52 +225,6 @@ namespace OpenSim.Region.CoreModules.World.Land
             avatar.currentParcelUUID = UUID.Zero;
         }
 
-        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()
         {
         }
@@ -291,7 +252,10 @@ namespace OpenSim.Region.CoreModules.World.Land
             lock (m_landList)
             {
                 if (m_landList.TryGetValue(local_id, out land))
+                {
                     land.LandData = newData;
+                    m_landUUIDList[newData.GlobalID] = local_id;
+                }
             }
 
             if (land != null)
@@ -312,28 +276,35 @@ namespace OpenSim.Region.CoreModules.World.Land
             //Remove all the land objects in the sim and add a blank, full sim land object set to public
             lock (m_landList)
             {
+                foreach(ILandObject parcel in m_landList.Values)
+                    parcel.Clear();
+
                 m_landList.Clear();
+                m_landUUIDList.Clear();
                 m_lastLandLocalID = LandChannel.START_LAND_LOCAL_ID - 1;
+
                 m_landIDList = new int[m_scene.RegionInfo.RegionSizeX / LandUnit, m_scene.RegionInfo.RegionSizeY / LandUnit];
             }
         }
-        
+
         /// <summary>
         /// Create a default parcel that spans the entire region and is owned by the estate owner.
         /// </summary>
         /// <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);            
+            LandData ldata = fullSimParcel.LandData;
+            ldata.SimwideArea = ldata.Area;
+            ldata.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner;
+            ldata.ClaimDate = Util.UnixTimeSinceEpoch();
+
+            return AddLandObject(fullSimParcel);
         }
 
         public List<ILandObject> AllParcels()
@@ -347,9 +318,9 @@ namespace OpenSim.Region.CoreModules.World.Land
         public List<ILandObject> ParcelsNearPoint(Vector3 position)
         {
             List<ILandObject> parcelsNear = new List<ILandObject>();
-            for (int x = -4; x <= 4; x += 4)
+            for (int x = -8; x <= 8; x += 4)
             {
-                for (int y = -4; y <= 4; y += 4)
+                for (int y = -8; y <= 8; y += 4)
                 {
                     ILandObject check = GetLandObject(position.X + x, position.Y + y);
                     if (check != null)
@@ -365,33 +336,99 @@ namespace OpenSim.Region.CoreModules.World.Land
             return parcelsNear;
         }
 
-        public void SendYouAreBannedNotice(ScenePresence avatar)
+        // checks and enforces bans or restrictions
+        // returns true if enforced
+        public bool EnforceBans(ILandObject land, ScenePresence avatar)
         {
-            if (AllowedForcefulBans)
+            Vector3 agentpos = avatar.AbsolutePosition;
+            float h = m_scene.GetGroundHeight(agentpos.X, agentpos.Y) + LandChannel.BAN_LINE_SAFETY_HEIGHT;
+            float zdif = avatar.AbsolutePosition.Z - h;
+            if (zdif > 0 )
+            {
+                forcedPosition.Remove(avatar.UUID);
+                avatar.lastKnownAllowedPosition = agentpos;
+                return false;
+            }
+
+            bool ban = false;
+            string reason = "";
+            if (land.IsRestrictedFromLand(avatar.UUID))
             {
-                avatar.ControllingClient.SendAlertMessage(
-                    "You are not allowed on this parcel because you are banned. Please go away.");
+                reason = "You do not have access to the parcel";
+                ban = true;
+            }
+
+            if (land.IsBannedFromLand(avatar.UUID))
+            {
+                if ( m_allowedForcefulBans)
+                {
+                   reason ="You are banned from parcel";
+                   ban = true;
+                }
+                else if(!ban)
+                {
+                    if (forcedPosition.Contains(avatar.UUID))
+                        avatar.ControllingClient.SendAlertMessage("You are banned from parcel, please leave by your own will");
+                    forcedPosition.Remove(avatar.UUID);
+                    avatar.lastKnownAllowedPosition = agentpos;
+                    return false;
+                }
+            }
+
+            if(ban)
+            {
+                if (!forcedPosition.Contains(avatar.UUID))
+                    avatar.ControllingClient.SendAlertMessage(reason);
+
+                if(zdif > -4f)
+                {
+
+                    agentpos.Z = h + 4.0f;
+                    ForceAvatarToPosition(avatar, agentpos);
+                    return true;
+                }
+
+                if (land.ContainsPoint((int)avatar.lastKnownAllowedPosition.X,
+                            (int) avatar.lastKnownAllowedPosition.Y))
+                {
+                    Vector3? pos = m_scene.GetNearestAllowedPosition(avatar);
+                    if (pos == null)
+                    {
+                         forcedPosition.Remove(avatar.UUID);
+                         m_scene.TeleportClientHome(avatar.UUID, avatar.ControllingClient);
+                    }
+                    else
+                        ForceAvatarToPosition(avatar, (Vector3)pos);
+                }
+                else
+                {
+                    ForceAvatarToPosition(avatar, avatar.lastKnownAllowedPosition);
+                }
+                return true;
             }
             else
             {
-                avatar.ControllingClient.SendAlertMessage(
-                    "You are not allowed on this parcel because you are banned; however, the grid administrator has disabled ban lines globally. Please obey the land owner's requests or you can be banned from the entire sim!");
+                forcedPosition.Remove(avatar.UUID);
+                avatar.lastKnownAllowedPosition = agentpos;
+                return false;
             }
         }
 
         private void ForceAvatarToPosition(ScenePresence avatar, Vector3? position)
         {
             if (m_scene.Permissions.IsGod(avatar.UUID)) return;
-            if (position.HasValue)
-            {
-                forcedPosition[avatar.ControllingClient.AgentId] = (Vector3)position;
-            }
-        }
 
-        public void SendYouAreRestrictedNotice(ScenePresence avatar)
-        {
-            avatar.ControllingClient.SendAlertMessage(
-                "You are not allowed on this parcel because the land owner has restricted access.");
+            if (!position.HasValue)
+                return;
+
+            if(avatar.MovingToTarget)
+                avatar.ResetMoveToTarget();
+            avatar.AbsolutePosition = position.Value;
+            avatar.lastKnownAllowedPosition = position.Value;
+            avatar.Velocity = Vector3.Zero;
+            if(avatar.IsSatOnObject)
+                avatar.StandUp();
+            forcedPosition.Add(avatar.UUID);
         }
 
         public void EventManagerOnAvatarEnteringNewParcel(ScenePresence avatar, int localLandID, UUID regionID)
@@ -404,29 +441,12 @@ namespace OpenSim.Region.CoreModules.World.Land
                     parcelAvatarIsEntering = m_landList[localLandID];
                 }
 
-                if (parcelAvatarIsEntering != null)
+                if (parcelAvatarIsEntering != null &&
+                    avatar.currentParcelUUID != parcelAvatarIsEntering.LandData.GlobalID)
                 {
-                    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;
-                    }
+                    SendLandUpdate(avatar, parcelAvatarIsEntering);
+                    avatar.currentParcelUUID = parcelAvatarIsEntering.LandData.GlobalID;
+                    EnforceBans(parcelAvatarIsEntering, avatar);
                 }
             }
         }
@@ -434,7 +454,7 @@ namespace OpenSim.Region.CoreModules.World.Land
         public void SendOutNearestBanLine(IClientAPI client)
         {
             ScenePresence sp = m_scene.GetScenePresence(client.AgentId);
-            if (sp == null || sp.IsChildAgent)
+            if (sp == null || sp.IsDeleted)
                 return;
 
             List<ILandObject> checkLandParcels = ParcelsNearPoint(sp.AbsolutePosition);
@@ -454,98 +474,180 @@ namespace OpenSim.Region.CoreModules.World.Land
             return;
         }
 
-        public void SendLandUpdate(ScenePresence avatar, bool force)
+        public void sendClientInitialLandInfo(IClientAPI remoteClient)
         {
-            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))));
+            ScenePresence avatar;
 
-            if (over != null)
+            if (!m_scene.TryGetScenePresence(remoteClient.AgentId, out avatar))
+                return;
+
+            if (!avatar.IsChildAgent)
             {
-                if (force)
-                {
-                    if (!avatar.IsChildAgent)
-                    {
-                        over.SendLandUpdateToClient(avatar.ControllingClient);
-                        m_scene.EventManager.TriggerAvatarEnteringNewParcel(avatar, over.LandData.LocalID,
-                                                                            m_scene.RegionInfo.RegionID);
-                    }
-                }
+                ILandObject over = GetLandObject(avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y);
+                if (over == null)
+                    return;
 
-                if (avatar.currentParcelUUID != over.LandData.GlobalID)
-                {
-                    if (!avatar.IsChildAgent)
-                    {
-                        over.SendLandUpdateToClient(avatar.ControllingClient);
-                        avatar.currentParcelUUID = over.LandData.GlobalID;
-                        m_scene.EventManager.TriggerAvatarEnteringNewParcel(avatar, over.LandData.LocalID,
-                                                                            m_scene.RegionInfo.RegionID);
-                    }
-                }
+                avatar.currentParcelUUID = over.LandData.GlobalID;
+                over.SendLandUpdateToClient(avatar.ControllingClient);
             }
+            SendParcelOverlay(remoteClient);
         }
 
-        public void SendLandUpdate(ScenePresence avatar)
+        public void SendLandUpdate(ScenePresence avatar, ILandObject over)
         {
-            SendLandUpdate(avatar, false);
-        }
+            if (avatar.IsChildAgent)
+                return;
 
-        public void EventManagerOnSignificantClientMovement(ScenePresence clientAvatar)
-        {
-            SendLandUpdate(clientAvatar);
-            SendOutNearestBanLine(clientAvatar.ControllingClient);
-            ILandObject parcel = GetLandObject(clientAvatar.AbsolutePosition.X, clientAvatar.AbsolutePosition.Y);
-            if (parcel != null)
+            if (over != null)
             {
-                if (clientAvatar.AbsolutePosition.Z < LandChannel.BAN_LINE_SAFETY_HIEGHT &&
-                    clientAvatar.sentMessageAboutRestrictedParcelFlyingDown)
-                {
-                    EventManagerOnAvatarEnteringNewParcel(clientAvatar, parcel.LandData.LocalID,
-                                                          m_scene.RegionInfo.RegionID);
-                    //They are going under the safety line!
-                    if (!parcel.IsBannedFromLand(clientAvatar.UUID))
-                    {
-                        clientAvatar.sentMessageAboutRestrictedParcelFlyingDown = false;
-                    }
-                }
-                else if (clientAvatar.AbsolutePosition.Z < LandChannel.BAN_LINE_SAFETY_HIEGHT &&
-                         parcel.IsBannedFromLand(clientAvatar.UUID))
-                {
-                    //once we've sent the message once, keep going toward the target until we are done
-                    if (forcedPosition.ContainsKey(clientAvatar.ControllingClient.AgentId))
-                    {
-                        SendYouAreBannedNotice(clientAvatar);
-                        ForceAvatarToPosition(clientAvatar, m_scene.GetNearestAllowedPosition(clientAvatar));
-                    }
-                }
-                else if (parcel.IsRestrictedFromLand(clientAvatar.UUID))
-                {
-                    //once we've sent the message once, keep going toward the target until we are done
-                    if (forcedPosition.ContainsKey(clientAvatar.ControllingClient.AgentId))
-                    {
-                        SendYouAreRestrictedNotice(clientAvatar);
-                        ForceAvatarToPosition(clientAvatar, m_scene.GetNearestAllowedPosition(clientAvatar));
-                    }
-                }
-                else
-                {
-                    //when we are finally in a safe place, lets release the forced position lock
-                    forcedPosition.Remove(clientAvatar.ControllingClient.AgentId);
-                }
+                   over.SendLandUpdateToClient(avatar.ControllingClient);
+// sl doesnt seem to send this now, as it used 2
+//                    SendParcelOverlay(avatar.ControllingClient);
             }
         }
 
+        public void EventManagerOnSignificantClientMovement(ScenePresence avatar)
+        {
+            if (avatar.IsChildAgent)
+                return;
+
+            if ( m_allowedForcefulBans && m_showBansLines)
+                SendOutNearestBanLine(avatar.ControllingClient);
+        }
+
         /// <summary>
         /// Like handleEventManagerOnSignificantClientMovement, but called with an AgentUpdate regardless of distance.
         /// </summary>
         /// <param name="avatar"></param>
         public void EventManagerOnClientMovement(ScenePresence avatar)
         {
+            if (avatar.IsChildAgent)
+                return;
+
             Vector3 pos = avatar.AbsolutePosition;
             ILandObject over = GetLandObject(pos.X, pos.Y);
             if (over != null)
             {
-                if (!over.IsRestrictedFromLand(avatar.UUID) && (!over.IsBannedFromLand(avatar.UUID) || pos.Z >= LandChannel.BAN_LINE_SAFETY_HIEGHT))
-                    avatar.lastKnownAllowedPosition = pos;
+                EnforceBans(over, avatar);
+                pos = avatar.AbsolutePosition;
+                ILandObject newover = GetLandObject(pos.X, pos.Y);
+                if(over != newover || avatar.currentParcelUUID != newover.LandData.GlobalID)
+                {
+                    m_scene.EventManager.TriggerAvatarEnteringNewParcel(avatar,
+                            newover.LandData.LocalID, m_scene.RegionInfo.RegionID);
+                }
+            }
+        }
+
+        public void ClientParcelBuyPass(IClientAPI remote_client, UUID targetID, int landLocalID)
+        {
+            ILandObject land;
+            lock (m_landList)
+            {
+                m_landList.TryGetValue(landLocalID, out land);
+            }
+            // trivial checks
+            if(land == null)
+                return;
+
+            LandData ldata = land.LandData;
+
+            if(ldata == null)
+                return;
+
+            if(ldata.OwnerID == targetID)
+                return;
+
+            if(ldata.PassHours == 0)
+                return;
+
+            // don't allow passes on group owned until we can give money to groups
+            if(ldata.IsGroupOwned)
+            {
+                remote_client.SendAgentAlertMessage("pass to group owned parcel not suported", false);
+                return;
+            }
+
+            if((ldata.Flags & (uint)ParcelFlags.UsePassList) == 0)
+                return;
+
+            int cost = ldata.PassPrice;
+
+            int idx = land.LandData.ParcelAccessList.FindIndex(
+                delegate(LandAccessEntry e)
+                {
+                    if (e.AgentID == targetID && e.Flags == AccessList.Access)
+                        return true;
+                    return false;
+                });
+            int now = Util.UnixTimeSinceEpoch();
+            int expires = (int)(3600.0 * ldata.PassHours + 0.5f);
+            int currenttime = -1;
+            if (idx != -1)
+            {
+                if(ldata.ParcelAccessList[idx].Expires == 0)
+                {
+                    remote_client.SendAgentAlertMessage("You already have access to parcel", false);
+                    return;
+                }
+
+                currenttime = ldata.ParcelAccessList[idx].Expires - now;
+                if(currenttime > (int)(0.25f * expires + 0.5f))
+                {
+                    if(currenttime > 3600)
+                        remote_client.SendAgentAlertMessage(string.Format("You already have a pass valid for {0:0.###} hours",
+                                    currenttime/3600f), false);
+                   else if(currenttime > 60)
+                        remote_client.SendAgentAlertMessage(string.Format("You already have a pass valid for {0:0.##} minutes",
+                                    currenttime/60f), false);
+                   else
+                        remote_client.SendAgentAlertMessage(string.Format("You already have a pass valid for {0:0.#} seconds",
+                                    currenttime), false);
+                    return;
+                }
+            }
+            
+            LandAccessEntry entry = new LandAccessEntry();
+            entry.AgentID = targetID;
+            entry.Flags = AccessList.Access;
+            entry.Expires = now + expires;
+            if(currenttime > 0)
+                entry.Expires += currenttime;
+            IMoneyModule mm = m_scene.RequestModuleInterface<IMoneyModule>();
+            if(cost != 0 && mm != null)
+            {
+                WorkManager.RunInThreadPool(
+                delegate
+                {
+                    string regionName = m_scene.RegionInfo.RegionName;
+
+                    if (!mm.AmountCovered(remote_client.AgentId, cost))
+                    {
+                        remote_client.SendAgentAlertMessage(String.Format("Insufficient funds in region '{0}' money system", regionName), true); 
+                        return;
+                    }
+
+                    string payDescription = String.Format("Parcel '{0}' at region '{1} {2:0.###} hours access pass", ldata.Name, regionName, ldata.PassHours);
+
+                    if(!mm.MoveMoney(remote_client.AgentId, ldata.OwnerID, cost,MoneyTransactionType.LandPassSale, payDescription))
+                    {
+                        remote_client.SendAgentAlertMessage("Sorry pass payment processing failed, please try again later", true); 
+                        return;
+                    }
+
+                    if (idx != -1)
+                        ldata.ParcelAccessList.RemoveAt(idx);
+                    ldata.ParcelAccessList.Add(entry);
+                    m_scene.EventManager.TriggerLandObjectUpdated((uint)land.LandData.LocalID, land);
+                    return;
+                }, null, "ParcelBuyPass");
+            }
+            else
+            {
+                if (idx != -1)
+                    ldata.ParcelAccessList.RemoveAt(idx);
+                ldata.ParcelAccessList.Add(entry);
+                m_scene.EventManager.TriggerLandObjectUpdated((uint)land.LandData.LocalID, land);
             }
         }
 
@@ -589,7 +691,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);
@@ -605,13 +707,11 @@ namespace OpenSim.Region.CoreModules.World.Land
         /// Adds a land object to the stored list and adds them to the landIDList to what they own
         /// </summary>
         /// <param name="new_land">
-        /// The land object being added.  
+        /// The land object being added.
         /// Will return null if this overlaps with an existing parcel that has not had its bitmap adjusted.
         /// </param>
-        public ILandObject AddLandObject(ILandObject land)
+        public ILandObject AddLandObject(ILandObject new_land)
         {
-            ILandObject new_land = land.Copy();
-            
             // Only now can we add the prim counts to the land object - we rely on the global ID which is generated
             // as a random UUID inside LandData initialization
             if (m_primCountModule != null)
@@ -623,18 +723,15 @@ 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
                 {
-                    // If other land objects still believe that they occupy any parts of the same space, 
+                    // If other land objects still believe that they occupy any parts of the same space,
                     // then do not allow the add to proceed.
                     for (int x = 0; x < landBitmap.GetLength(0); x++)
                     {
@@ -652,7 +749,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 +765,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;
                             }
                         }
@@ -679,6 +776,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                 }
 
                 m_landList.Add(newLandLocalID, new_land);
+                m_landUUIDList[new_land.LandData.GlobalID] = newLandLocalID;
                 m_lastLandLocalID++;
             }
 
@@ -695,6 +793,7 @@ namespace OpenSim.Region.CoreModules.World.Land
         public void removeLandObject(int local_id)
         {
             ILandObject land;
+            UUID landGlobalID = UUID.Zero;
             lock (m_landList)
             {
                 for (int x = 0; x < m_landIDList.GetLength(0); x++)
@@ -713,37 +812,47 @@ namespace OpenSim.Region.CoreModules.World.Land
 
                 land = m_landList[local_id];
                 m_landList.Remove(local_id);
+                if(land != null && land.LandData != null)
+                {
+                    landGlobalID = land.LandData.GlobalID;
+                    m_landUUIDList.Remove(landGlobalID);
+                }
             }
 
-            m_scene.EventManager.TriggerLandObjectRemoved(land.LandData.GlobalID);
+            if(landGlobalID != UUID.Zero)
+            {
+                m_scene.EventManager.TriggerLandObjectRemoved(landGlobalID);
+                land.Clear();
+            }
         }
-        
+
         /// <summary>
         /// Clear the scene of all parcels
-        /// </summary>        
+        /// </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)
@@ -762,11 +871,29 @@ namespace OpenSim.Region.CoreModules.World.Land
                     }
                 }
             }
-
+            master.LandData.Dwell += slave.LandData.Dwell;
             removeLandObject(slave.LandData.LocalID);
             UpdateLandObject(master.LandData.LocalID, master.LandData);
         }
 
+        public ILandObject GetLandObject(UUID globalID)
+        {
+            lock (m_landList)
+            {
+                int lid = -1;
+                if(m_landUUIDList.TryGetValue(globalID, out lid) && lid >= 0)
+                {
+                    if (m_landList.ContainsKey(lid))
+                    {
+                        return m_landList[lid];
+                    }
+                    else
+                        m_landUUIDList.Remove(globalID); // auto heal
+                }
+            }
+            return null;
+        }
+
         public ILandObject GetLandObject(int parcelLocalID)
         {
             lock (m_landList)
@@ -787,58 +914,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,33 +954,32 @@ 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);
             }
 
-            return m_landList[m_landIDList[x / 4, y / 4]];
+            if(m_landList.Count == 0  || m_landIDList == null)
+                return null;
+
+            lock (m_landIDList)
+            {
+                try
+                {
+                        return m_landList[m_landIDList[x / 4, y / 4]];
+                }
+                catch (IndexOutOfRangeException)
+                {
+                        return null;
+                }
+            }
         }
 
         // Create a 'parcel is here' bitmap for the parcel identified by the passed landID
@@ -926,7 +1031,7 @@ namespace OpenSim.Region.CoreModules.World.Land
             }
         }
 
-        public void FinalizeLandPrimCountUpdate()
+        private void FinalizeLandPrimCountUpdate()
         {
             //Get Simwide prim count for owner
             Dictionary<UUID, List<LandObject>> landOwnersAndParcels = new Dictionary<UUID, List<LandObject>>();
@@ -967,10 +1072,10 @@ namespace OpenSim.Region.CoreModules.World.Land
 
         public void EventManagerOnParcelPrimCountUpdate()
         {
-//            m_log.DebugFormat(
-//                "[LAND MANAGEMENT MODULE]: Triggered EventManagerOnParcelPrimCountUpdate() for {0}", 
-//                m_scene.RegionInfo.RegionName);
-            
+            //m_log.DebugFormat(
+            //    "[land management module]: triggered eventmanageronparcelprimcountupdate() for {0}",
+            //    m_scene.RegionInfo.RegionName);
+
             ResetOverMeRecords();
             EntityBase[] entities = m_scene.Entities.GetEntities();
             foreach (EntityBase obj in entities)
@@ -1002,27 +1107,33 @@ namespace OpenSim.Region.CoreModules.World.Land
         /// <param name="end_y">North Point</param>
         /// <param name="attempting_user_id">UUID of user who is trying to subdivide</param>
         /// <returns>Returns true if successful</returns>
-        private void subdivide(int start_x, int start_y, int end_x, int end_y, UUID attempting_user_id)
+        public void Subdivide(int start_x, int start_y, int end_x, int end_y, UUID attempting_user_id)
         {
             //First, lets loop through the points and make sure they are all in the same peice of land
             //Get the land object at start
 
             ILandObject startLandObject = GetLandObject(start_x, start_y);
 
-            if (startLandObject == null) return;
+            if (startLandObject == null)
+                return;
+
+            if (!m_scene.Permissions.CanEditParcelProperties(attempting_user_id, startLandObject, GroupPowers.LandDivideJoin, true))
+            {
+                return;
+            }
 
             //Loop through the points
             try
             {
-                int totalX = end_x - start_x;
-                int totalY = end_y - start_y;
-                for (int y = 0; y < totalY; y++)
+                for (int y = start_y; y < end_y; y++)
                 {
-                    for (int x = 0; x < totalX; x++)
+                    for (int x = start_x; x < end_x; x++)
                     {
-                        ILandObject tempLandObject = GetLandObject(start_x + x, start_y + y);
-                        if (tempLandObject == null) return;
-                        if (tempLandObject != startLandObject) return;
+                        ILandObject tempLandObject = GetLandObject(x, y);
+                        if (tempLandObject == null)
+                            return;
+                        if (tempLandObject != startLandObject)
+                            return;
                     }
                 }
             }
@@ -1031,22 +1142,22 @@ namespace OpenSim.Region.CoreModules.World.Land
                 return;
             }
 
-            //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))
-            {
-                return;
-            }
-
-            //Lets create a new land object with bitmap activated at that point (keeping the old land objects info)
+             //Lets create a new land object with bitmap activated at that point (keeping the old land objects info)
             ILandObject newLand = startLandObject.Copy();
+
             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;
+            // invalidate landing point
+            newLand.LandData.LandingType = (byte)LandingType.Direct;
+            newLand.LandData.UserLocation = Vector3.Zero;
+            newLand.LandData.UserLookAt = Vector3.Zero;
 
             newLand.SetLandBitmap(newLand.GetSquareLandBitmap(start_x, start_y, end_x, end_y));
 
-            //Now, lets set the subdivision area of the original to false
+            //lets set the subdivision area of the original to false
             int startLandObjectIndex = startLandObject.LandData.LocalID;
             lock (m_landList)
             {
@@ -1055,65 +1166,85 @@ namespace OpenSim.Region.CoreModules.World.Land
                 m_landList[startLandObjectIndex].ForceUpdateLandInfo();
             }
 
-            //Now add the new land object
+            //add the new land object
             ILandObject result = AddLandObject(newLand);
 
-            if (result != null)
+            UpdateLandObject(startLandObject.LandData.LocalID, startLandObject.LandData);
+
+            if(startLandObject.LandData.LandingType == (byte)LandingType.LandingPoint)
             {
-                UpdateLandObject(startLandObject.LandData.LocalID, startLandObject.LandData);
-                result.SendLandUpdateToAvatarsOverMe();
-            }
+                int x = (int)startLandObject.LandData.UserLocation.X;
+                int y = (int)startLandObject.LandData.UserLocation.Y;
+                if(!startLandObject.ContainsPoint(x, y))
+                {
+                    startLandObject.LandData.LandingType = (byte)LandingType.Direct;
+                    startLandObject.LandData.UserLocation = Vector3.Zero;
+                    startLandObject.LandData.UserLookAt = Vector3.Zero;
+                }
+             }
+
+            m_scene.EventManager.TriggerParcelPrimCountTainted();
+
+            result.SendLandUpdateToAvatarsOverMe();
+            startLandObject.SendLandUpdateToAvatarsOverMe();
+            m_scene.ForEachClient(SendParcelOverlay);
+
         }
 
         /// <summary>
         /// Join 2 land objects together
         /// </summary>
-        /// <param name="start_x">x value in first piece of land</param>
-        /// <param name="start_y">y value in first piece of land</param>
-        /// <param name="end_x">x value in second peice of land</param>
-        /// <param name="end_y">y value in second peice of land</param>
+        /// <param name="start_x">start x of selection area</param>
+        /// <param name="start_y">start y of selection area</param>
+        /// <param name="end_x">end x of selection area</param>
+        /// <param name="end_y">end y of selection area</param>
         /// <param name="attempting_user_id">UUID of the avatar trying to join the land objects</param>
         /// <returns>Returns true if successful</returns>
-        private void join(int start_x, int start_y, int end_x, int end_y, UUID attempting_user_id)
+        public void Join(int start_x, int start_y, int end_x, int end_y, UUID attempting_user_id)
         {
-            end_x -= 4;
-            end_y -= 4;
+            int index = 0;
+            int maxindex = -1;
+            int maxArea = 0;
 
             List<ILandObject> selectedLandObjects = new List<ILandObject>();
-            int stepYSelected;
-            for (stepYSelected = start_y; stepYSelected <= end_y; stepYSelected += 4)
+            for (int x = start_x; x < end_x; x += 4)
             {
-                int stepXSelected;
-                for (stepXSelected = start_x; stepXSelected <= end_x; stepXSelected += 4)
+                for (int y = start_y; y < end_y; y += 4)
                 {
-                    ILandObject p = GetLandObject(stepXSelected, stepYSelected);
+                    ILandObject p = GetLandObject(x, y);
 
                     if (p != null)
                     {
                         if (!selectedLandObjects.Contains(p))
                         {
                             selectedLandObjects.Add(p);
+                            if(p.LandData.Area > maxArea)
+                            {
+                                maxArea = p.LandData.Area;
+                                maxindex = index;
+                            }
+                            index++;
                         }
                     }
                 }
             }
-            ILandObject masterLandObject = selectedLandObjects[0];
-            selectedLandObjects.RemoveAt(0);
 
-            if (selectedLandObjects.Count < 1)
-            {
+            if(maxindex < 0 || selectedLandObjects.Count < 2)
                 return;
-            }
-            if (!m_scene.Permissions.CanEditParcelProperties(attempting_user_id, masterLandObject, GroupPowers.LandDivideJoin))
+
+            ILandObject masterLandObject = selectedLandObjects[maxindex];
+            selectedLandObjects.RemoveAt(maxindex);
+
+            if (!m_scene.Permissions.CanEditParcelProperties(attempting_user_id, masterLandObject, GroupPowers.LandDivideJoin, true))
             {
                 return;
             }
+
+            UUID masterOwner = masterLandObject.LandData.OwnerID;
             foreach (ILandObject p in selectedLandObjects)
             {
-                if (p.LandData.OwnerID != masterLandObject.LandData.OwnerID)
-                {
+                if (p.LandData.OwnerID != masterOwner)
                     return;
-                }
             }
 
             lock (m_landList)
@@ -1126,29 +1257,14 @@ namespace OpenSim.Region.CoreModules.World.Land
                 }
             }
 
+            m_scene.EventManager.TriggerParcelPrimCountTainted();
             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)
-        {
-            join(start_x, start_y, end_x, end_y, attempting_user_id);
-        }
-
-        public void Subdivide(int start_x, int start_y, int end_x, int end_y, UUID attempting_user_id)
-        {
-            subdivide(start_x, start_y, end_x, end_y, attempting_user_id);
-        }
-
         #endregion
 
         #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 +1278,115 @@ 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)
+                for (int x = 0; x < m_scene.RegionInfo.RegionSizeX; x += LandUnit)
                 {
-                    txLow = xLow;
-                    txHigh = Math.Min(yLow + (layerViewDistance * 2), xHigh);
-                }
-                if (txHigh > xHigh)
-                {
-                    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 +1406,11 @@ namespace OpenSim.Region.CoreModules.World.Land
                     {
                         if (!temp.Contains(currentParcel))
                         {
-                            currentParcel.ForceUpdateLandInfo();
-                            temp.Add(currentParcel);
+                            if (!currentParcel.IsBannedFromLand(remote_client.AgentId))
+                            {
+                                currentParcel.ForceUpdateLandInfo();
+                                temp.Add(currentParcel);
+                            }
                         }
                     }
                 }
@@ -1338,8 +1427,44 @@ 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))
+            {
+                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)
+                    {
+                        if(client == remote_client)
+                            land.SendLandProperties(-10000, false, LandChannel.LAND_RESULT_SINGLE, client);
+                        return;
+                    }
+
+                    ILandObject aland = GetLandObject(avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y);
+                    if (aland != null)
+                    {
+                        if(client == remote_client && land != aland)
+                            land.SendLandProperties(-10000, false, LandChannel.LAND_RESULT_SINGLE, client);
+                        else if (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,19 +1477,19 @@ 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);
             }
         }
 
         public void ClientOnParcelDivideRequest(int west, int south, int east, int north, IClientAPI remote_client)
         {
-            subdivide(west, south, east, north, remote_client.AgentId);
+            Subdivide(west, south, east, north, remote_client.AgentId);
         }
 
         public void ClientOnParcelJoinRequest(int west, int south, int east, int north, IClientAPI remote_client)
         {
-            join(west, south, east, north, remote_client.AgentId);
+            Join(west, south, east, north, remote_client.AgentId);
         }
 
         public void ClientOnParcelSelectObjects(int local_id, int request_type,
@@ -1375,7 +1500,7 @@ namespace OpenSim.Region.CoreModules.World.Land
 
         public void ClientOnParcelObjectOwnerRequest(int local_id, IClientAPI remote_client)
         {
-            ILandObject land;
+            ILandObject land = null;
             lock (m_landList)
             {
                 m_landList.TryGetValue(local_id, out land);
@@ -1384,7 +1509,7 @@ namespace OpenSim.Region.CoreModules.World.Land
             if (land != null)
             {
                 m_scene.EventManager.TriggerParcelPrimCountUpdate();
-                m_landList[local_id].SendLandObjectOwners(remote_client);
+                land.SendLandObjectOwners(remote_client);
             }
             else
             {
@@ -1394,7 +1519,7 @@ namespace OpenSim.Region.CoreModules.World.Land
 
         public void ClientOnParcelGodForceOwner(int local_id, UUID ownerID, IClientAPI remote_client)
         {
-            ILandObject land;
+            ILandObject land = null;
             lock (m_landList)
             {
                 m_landList.TryGetValue(local_id, out land);
@@ -1408,7 +1533,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);
@@ -1418,7 +1542,7 @@ namespace OpenSim.Region.CoreModules.World.Land
 
         public void ClientOnParcelAbandonRequest(int local_id, IClientAPI remote_client)
         {
-            ILandObject land;
+            ILandObject land = null;
             lock (m_landList)
             {
                 m_landList.TryGetValue(local_id, out land);
@@ -1432,7 +1556,7 @@ 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);
@@ -1442,7 +1566,7 @@ namespace OpenSim.Region.CoreModules.World.Land
 
         public void ClientOnParcelReclaim(int local_id, IClientAPI remote_client)
         {
-            ILandObject land;
+            ILandObject land = null;
             lock (m_landList)
             {
                 m_landList.TryGetValue(local_id, out land);
@@ -1458,8 +1582,10 @@ namespace OpenSim.Region.CoreModules.World.Land
                     land.LandData.IsGroupOwned = false;
                     land.LandData.SalePrice = 0;
                     land.LandData.AuthBuyerID = UUID.Zero;
+                    land.LandData.SeeAVs = true;
+                    land.LandData.AnyAVSounds = true;
+                    land.LandData.GroupAVSounds = true;
                     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);
@@ -1526,17 +1652,16 @@ namespace OpenSim.Region.CoreModules.World.Land
 
         void ClientOnParcelDeedToGroup(int parcelLocalID, UUID groupID, IClientAPI remote_client)
         {
-            ILandObject land;
+            ILandObject land = null;
             lock (m_landList)
             {
                 m_landList.TryGetValue(parcelLocalID, out land);
             }
 
-            if (!m_scene.Permissions.CanDeedParcel(remote_client.AgentId, land))
-                return;
-
             if (land != null)
             {
+                if (!m_scene.Permissions.CanDeedParcel(remote_client.AgentId, land))
+                    return;
                 land.DeedToGroup(groupID);
             }
         }
@@ -1545,17 +1670,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 +1685,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 +1708,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,20 +1723,23 @@ 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);
                             }
                         }
                     }
                 }
+                FinalizeLandPrimCountUpdate(); // update simarea information
             }
         }
 
         private void IncomingLandObjectFromStorage(LandData data)
         {
-            ILandObject new_land = new LandObject(data, m_scene);
-            new_land.SetLandBitmapFromByteArray();            
+            ILandObject new_land = new LandObject(data.OwnerID, data.IsGroupOwned, m_scene, data);
+
+            new_land.SetLandBitmapFromByteArray();
             AddLandObject(new_land);
+//            new_land.SendLandUpdateToAvatarsOverMe();
         }
 
         public void ReturnObjectsInParcel(int localID, uint returnType, UUID[] agentIDs, UUID[] taskIDs, IClientAPI remoteClient)
@@ -1629,7 +1752,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                     m_landList.TryGetValue(localID, out selectedParcel);
                 }
 
-                if (selectedParcel == null) 
+                if (selectedParcel == null)
                     return;
 
                 selectedParcel.ReturnLandObjects(returnType, agentIDs, taskIDs, remoteClient);
@@ -1670,9 +1793,9 @@ namespace OpenSim.Region.CoreModules.World.Land
                 foreach (HashSet<SceneObjectGroup> objs in returns.Values)
                 {
                     List<SceneObjectGroup> objs2 = new List<SceneObjectGroup>(objs);
-                    if (m_scene.Permissions.CanReturnObjects(null, remoteClient.AgentId, objs2))
+                    if (m_scene.Permissions.CanReturnObjects(null, remoteClient, objs2))
                     {
-                        m_scene.returnObjects(objs2.ToArray(), remoteClient.AgentId);
+                        m_scene.returnObjects(objs2.ToArray(), remoteClient);
                     }
                     else
                     {
@@ -1710,12 +1833,13 @@ namespace OpenSim.Region.CoreModules.World.Land
 
         private void EventManagerOnRegisterCaps(UUID agentID, Caps caps)
         {
+            //string capsBase = "/CAPS/" + UUID.Random();
             string capsBase = "/CAPS/" + caps.CapsObjectPath;
             caps.RegisterHandler(
                 "RemoteParcelRequest",
                 new RestStreamHandler(
                     "POST",
-                    capsBase + remoteParcelRequestPath,
+                    capsBase,
                     (request, path, param, httpRequest, httpResponse)
                         => RemoteParcelRequest(request, path, param, agentID, caps),
                     "RemoteParcelRequest",
@@ -1735,7 +1859,7 @@ namespace OpenSim.Region.CoreModules.World.Land
         private string ProcessPropertiesUpdate(string request, string path, string param, UUID agentID, Caps caps)
         {
             IClientAPI client;
-            if (!m_scene.TryGetClient(agentID, out client)) 
+            if (!m_scene.TryGetClient(agentID, out client))
             {
                 m_log.WarnFormat("[LAND MANAGEMENT MODULE]: Unable to retrieve IClientAPI for {0}", agentID);
                 return LLSDHelpers.SerialiseLLSDReply(new LLSDEmpty());
@@ -1759,7 +1883,7 @@ namespace OpenSim.Region.CoreModules.World.Land
             land_update.MusicURL = properties.MusicURL;
             land_update.Name = properties.Name;
             land_update.ParcelFlags = (uint) properties.ParcelFlags;
-            land_update.PassHours = (int) properties.PassHours;
+            land_update.PassHours = properties.PassHours;
             land_update.PassPrice = (int) properties.PassPrice;
             land_update.SalePrice = (int) properties.SalePrice;
             land_update.SnapshotID = properties.SnapshotID;
@@ -1773,7 +1897,20 @@ namespace OpenSim.Region.CoreModules.World.Land
             land_update.ObscureMusic = properties.ObscureMusic;
             land_update.ObscureMedia = properties.ObscureMedia;
 
-            ILandObject land;
+            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 = null;
             lock (m_landList)
             {
                 m_landList.TryGetValue(parcelID, out land);
@@ -1781,13 +1918,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
@@ -1815,9 +1953,9 @@ namespace OpenSim.Region.CoreModules.World.Land
             {
                 Hashtable hash = new Hashtable();
                 hash = (Hashtable)LLSD.LLSDDeserialize(Utils.StringToBytes(request));
-                if (hash.ContainsKey("region_id") && hash.ContainsKey("location"))
+                if (hash.ContainsKey("location"))
                 {
-                    UUID regionID = (UUID)hash["region_id"];
+                    UUID scope = m_scene.RegionInfo.ScopeID;
                     ArrayList list = (ArrayList)hash["location"];
                     uint x = (uint)(double)list[0];
                     uint y = (uint)(double)list[1];
@@ -1826,19 +1964,46 @@ namespace OpenSim.Region.CoreModules.World.Land
                         // if you do a "About Landmark" on a landmark a second time, the viewer sends the
                         // region_handle it got earlier via RegionHandleRequest
                         ulong regionHandle = Util.BytesToUInt64Big((byte[])hash["region_handle"]);
-                        parcelID = Util.BuildFakeParcelID(regionHandle, x, y);
+                        if(regionHandle == m_scene.RegionInfo.RegionHandle)
+                            parcelID = Util.BuildFakeParcelID(regionHandle, x, y);
+                        else
+                        {
+                            uint wx;
+                            uint wy;
+                            Util.RegionHandleToWorldLoc(regionHandle, out wx, out wy);
+                            GridRegion info = m_scene.GridService.GetRegionByPosition(scope, (int)wx, (int)wy);
+                            if(info != null)
+                            {
+                                wx -= (uint)info.RegionLocX;
+                                wy -= (uint)info.RegionLocY;
+                                wx += x;
+                                wy += y;
+                                // Firestorm devs have no ideia how to do handlers math
+                                // on all cases
+                                if(wx > info.RegionSizeX || wy > info.RegionSizeY)
+                                {
+                                    wx = x;
+                                    wy = y;
+                                }
+                                parcelID = Util.BuildFakeParcelID(info.RegionHandle, wx, wy);
+                            }
+                        }
                     }
-                    else if (regionID == m_scene.RegionInfo.RegionID)
+                    else if(hash.ContainsKey("region_id"))
                     {
+                        UUID regionID = (UUID)hash["region_id"];
+                        if (regionID == m_scene.RegionInfo.RegionID)
+                        {
                         // a parcel request for a local parcel => no need to query the grid
-                        parcelID = Util.BuildFakeParcelID(m_scene.RegionInfo.RegionHandle, x, y);
-                    }
-                    else
-                    {
-                        // a parcel request for a parcel in another region. Ask the grid about the region
-                        GridRegion info = m_scene.GridService.GetRegionByUUID(UUID.Zero, regionID);
-                        if (info != null)
-                            parcelID = Util.BuildFakeParcelID(info.RegionHandle, x, y);
+                            parcelID = Util.BuildFakeParcelID(m_scene.RegionInfo.RegionHandle, x, y);
+                        }
+                        else
+                        {
+                            // a parcel request for a parcel in another region. Ask the grid about the region
+                            GridRegion info = m_scene.GridService.GetRegionByUUID(scope, regionID);
+                            if (info != null)
+                                parcelID = Util.BuildFakeParcelID(info.RegionHandle, x, y);
+                        }
                     }
                 }
             }
@@ -1854,7 +2019,7 @@ namespace OpenSim.Region.CoreModules.World.Land
 
             LLSDRemoteParcelResponse response = new LLSDRemoteParcelResponse();
             response.parcel_id = parcelID;
-            m_log.DebugFormat("[LAND MANAGEMENT MODULE]: Got parcelID {0}", parcelID);
+            //m_log.DebugFormat("[LAND MANAGEMENT MODULE]: Got parcelID {0}", parcelID);
 
             return LLSDHelpers.SerialiseLLSDReply(response);
         }
@@ -1871,17 +2036,25 @@ namespace OpenSim.Region.CoreModules.World.Land
                     {
                         UUID parcel = UUID.Zero;
                         UUID.TryParse(id, out parcel);
+
                         // assume we've got the parcelID we just computed in RemoteParcelRequest
                         ExtendedLandData extLandData = new ExtendedLandData();
-                        Util.ParseFakeParcelID(parcel, out extLandData.RegionHandle,
-                                               out extLandData.X, out extLandData.Y);
-                        m_log.DebugFormat("[LAND MANAGEMENT MODULE]: Got parcelinfo request for regionHandle {0}, x/y {1}/{2}",
+                        if(!Util.ParseFakeParcelID(parcel, out extLandData.RegionHandle,
+                                               out extLandData.X, out extLandData.Y))
+                            return null;
+                        m_log.DebugFormat("[LAND MANAGEMENT MODULE] : Got parcelinfo request for regionHandle {0}, x/y {1}/{2}",
                                           extLandData.RegionHandle, extLandData.X, extLandData.Y);
 
                         // for this region or for somewhere else?
                         if (extLandData.RegionHandle == m_scene.RegionInfo.RegionHandle)
                         {
-                            extLandData.LandData = this.GetLandObject(extLandData.X, extLandData.Y).LandData;
+                            ILandObject extLandObject = this.GetLandObject(extLandData.X, extLandData.Y);
+                            if(extLandObject == null)
+                            {
+                                m_log.DebugFormat("[LAND MANAGEMENT MODULE]: ParcelInfoRequest: a FakeParcelID points to outside the region");
+                                return null; 
+                            }
+                            extLandData.LandData = extLandObject.LandData;
                             extLandData.RegionAccess = m_scene.RegionInfo.AccessLevel;
                         }
                         else
@@ -1907,6 +2080,9 @@ namespace OpenSim.Region.CoreModules.World.Land
                 if (data.RegionHandle == m_scene.RegionInfo.RegionHandle)
                 {
                     info = new GridRegion(m_scene.RegionInfo);
+                    IDwellModule dwellModule = m_scene.RequestModuleInterface<IDwellModule>();
+                    if (dwellModule != null)
+                        data.LandData.Dwell = dwellModule.GetDwell(data.LandData);
                 }
                 else
                 {
@@ -1932,7 +2108,7 @@ namespace OpenSim.Region.CoreModules.World.Land
 
         public void setParcelOtherCleanTime(IClientAPI remoteClient, int localID, int otherCleanTime)
         {
-            ILandObject land;
+            ILandObject land = null;
             lock (m_landList)
             {
                 m_landList.TryGetValue(localID, out land);
@@ -1940,14 +2116,91 @@ 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.GodController.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);
+        }
+
         Dictionary<UUID, System.Threading.Timer> Timers = new Dictionary<UUID, System.Threading.Timer>();
 
         public void ClientOnParcelFreezeUser(IClientAPI client, UUID parcelowner, uint flags, UUID target)
@@ -1958,12 +2211,12 @@ namespace OpenSim.Region.CoreModules.World.Land
             ((Scene)client.Scene).TryGetScenePresence(client.AgentId, out parcelManager);
             System.Threading.Timer Timer;
 
-            if (targetAvatar.UserLevel == 0)
+            if (targetAvatar.GodController.UserLevel < 200)
             {
                 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)
+                if ((flags & 1) == 0) // only lowest bit has meaning for now
                 {
                     targetAvatar.AllowMovement = false;
                     targetAvatar.ControllingClient.SendAlertMessage(parcelManager.Firstname + " " + parcelManager.Lastname + " has frozen you for 30 seconds.  You cannot move or interact with the world.");
@@ -1983,7 +2236,6 @@ namespace OpenSim.Region.CoreModules.World.Land
                 }
             }
         }
-
         private void OnEndParcelFrozen(object avatar)
         {
             ScenePresence targetAvatar = (ScenePresence)avatar;
@@ -2010,12 +2262,13 @@ 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.TeleportOnEject(pos);
             targetAvatar.ControllingClient.SendAlertMessage("You have been ejected by " + parcelManager.Firstname + " " + parcelManager.Lastname);
             parcelManager.ControllingClient.SendAlertMessage("Avatar Ejected.");
 
@@ -2059,7 +2312,7 @@ namespace OpenSim.Region.CoreModules.World.Land
             if (// Required: local user; foreign users cannot set home
                 m_scene.UserManagementModule.IsLocalGridUser(remoteClient.AgentId) &&
                 (// (a) gods and land managers can set home
-                 m_scene.Permissions.IsAdministrator(remoteClient.AgentId) || 
+                 m_scene.Permissions.IsAdministrator(remoteClient.AgentId) ||
                  m_scene.Permissions.IsGod(remoteClient.AgentId) ||
                  // (b) land owners can set home
                  remoteClient.AgentId == land.LandData.OwnerID ||
@@ -2111,8 +2364,8 @@ namespace OpenSim.Region.CoreModules.World.Land
                 "If no local land ID is given, then summary information about all the parcels is shown.\n"
                     + "If a local land ID is given then full information about that parcel is shown.",
                 HandleShowCommand);
-        }    
-        
+        }
+
         protected void HandleClearCommand(string module, string[] args)
         {
             if (!(MainConsole.Instance.ConsoleScene == null || MainConsole.Instance.ConsoleScene == m_scene))
@@ -2120,9 +2373,9 @@ namespace OpenSim.Region.CoreModules.World.Land
 
             string response = MainConsole.Instance.CmdPrompt(
                 string.Format(
-                    "Are you sure that you want to clear all land parcels from {0} (y or n)", m_scene.Name), 
+                    "Are you sure that you want to clear all land parcels from {0} (y or n)", m_scene.Name),
                 "n");
-            
+
             if (response.ToLower() == "y")
             {
                 Clear(true);
@@ -2132,14 +2385,14 @@ namespace OpenSim.Region.CoreModules.World.Land
             {
                 MainConsole.Instance.OutputFormat("Aborting clear of all parcels from {0}", m_scene.Name);
             }
-        }        
-        
+        }
+
         protected void HandleShowCommand(string module, string[] args)
         {
             if (!(MainConsole.Instance.ConsoleScene == null || MainConsole.Instance.ConsoleScene == m_scene))
                 return;
 
-            StringBuilder report = new StringBuilder(); 
+            StringBuilder report = new StringBuilder();
 
             if (args.Length <= 2)
             {
@@ -2152,10 +2405,10 @@ namespace OpenSim.Region.CoreModules.World.Land
                 if (!ConsoleUtil.TryParseConsoleInt(MainConsole.Instance, args[2], out landLocalId))
                     return;
 
-                ILandObject lo;
+                ILandObject lo = null;
 
                 lock (m_landList)
-                { 
+                {
                     if (!m_landList.TryGetValue(landLocalId, out lo))
                     {
                         MainConsole.Instance.OutputFormat("No parcel found with local ID {0}", landLocalId);
@@ -2170,7 +2423,7 @@ 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();
@@ -2180,7 +2433,7 @@ namespace OpenSim.Region.CoreModules.World.Land
             cdt.AddColumn("Starts", ConsoleDisplayUtil.VectorSize);
             cdt.AddColumn("Ends", ConsoleDisplayUtil.VectorSize);
             cdt.AddColumn("Owner", ConsoleDisplayUtil.UserNameSize);
-            
+
             lock (m_landList)
             {
                 foreach (ILandObject lo in m_landList.Values)
@@ -2202,7 +2455,7 @@ namespace OpenSim.Region.CoreModules.World.Land
             }
 
             report.Append(cdt.ToString());
-        } 
+        }
 
         private void AppendParcelReport(StringBuilder report, ILandObject lo)
         {
@@ -2214,8 +2467,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;
@@ -2233,7 +2484,7 @@ namespace OpenSim.Region.CoreModules.World.Land
             cdl.AddRow("GroupID", ld.GroupID);
 
             cdl.AddRow("Status", ld.Status);
-            cdl.AddRow("Flags", (ParcelFlags)ld.Flags);           
+            cdl.AddRow("Flags", (ParcelFlags)ld.Flags);
 
             cdl.AddRow("Landing Type", (LandingType)ld.LandingType);
             cdl.AddRow("User Location", ld.UserLocation);
@@ -2242,12 +2493,14 @@ namespace OpenSim.Region.CoreModules.World.Land
             cdl.AddRow("Other clean time", ld.OtherCleanTime);
 
             cdl.AddRow("Max Prims", lo.GetParcelMaxPrimCount());
+            cdl.AddRow("Simwide Max Prims (owner)", lo.GetSimulatorMaxPrimCount());
             IPrimCounts pc = lo.PrimCounts;
             cdl.AddRow("Owner Prims", pc.Owner);
             cdl.AddRow("Group Prims", pc.Group);
             cdl.AddRow("Other Prims", pc.Others);
             cdl.AddRow("Selected Prims", pc.Selected);
             cdl.AddRow("Total Prims", pc.Total);
+            cdl.AddRow("SimWide Prims (owner)", pc.Simulator);
 
             cdl.AddRow("Music URL", ld.MusicURL);
             cdl.AddRow("Obscure Music", ld.ObscureMusic);
diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
index a0c1b9d..ce67fcc 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
@@ -50,15 +50,22 @@ 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>();
 
         protected ExpiringCache<UUID, bool> m_groupMemberCache = new ExpiringCache<UUID, bool>();
         protected TimeSpan m_groupMemberCacheTimeout = TimeSpan.FromSeconds(30);  // cache invalidation after 30 seconds
+        IDwellModule m_dwellModule;
 
-        public bool[,] LandBitmap { get; set; }
+        private bool[,] m_landBitmap;
+        public bool[,] LandBitmap
+        {
+            get { return m_landBitmap; }
+            set { m_landBitmap = value; }
+        }
 
         #endregion
 
@@ -69,7 +76,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; }
 
@@ -78,77 +91,230 @@ namespace OpenSim.Region.CoreModules.World.Land
             get { return m_scene.RegionInfo.RegionID; }
         }
 
-        public Vector3 StartPoint
+        private Vector2 m_startPoint = Vector2.Zero;
+        private Vector2 m_endPoint = Vector2.Zero;
+        private Vector2 m_centerPoint = Vector2.Zero;
+        private Vector2 m_AABBmin = Vector2.Zero;
+        private Vector2 m_AABBmax = Vector2.Zero;
+
+        public Vector2 StartPoint
         {
             get
             {
-                for (int y = 0; y < LandBitmap.GetLength(1); y++)
-                {
-                    for (int x = 0; x < LandBitmap.GetLength(0); x++)
-                    {
-                        if (LandBitmap[x, y])
-                            return new Vector3(x * landUnit, y * landUnit, 0);
-                    }
-                }
+                return m_startPoint;
+            }
+        }
 
-                m_log.ErrorFormat("{0} StartPoint. No start point found. bitmapSize=<{1},{2}>",
-                                    LogHeader, LandBitmap.GetLength(0), LandBitmap.GetLength(1));
-                return new Vector3(-1, -1, -1);
+        public Vector2 EndPoint
+        {
+            get
+            {
+                return m_endPoint;
             }
         }
 
-        public Vector3 EndPoint
+        //estimate a center point of a parcel
+        public Vector2 CenterPoint
         {
             get
             {
-                for (int y = LandBitmap.GetLength(1) - 1; y >= 0; y--)
+                return m_centerPoint;
+            }
+        }
+
+        public Vector2? GetNearestPoint(Vector3 pos)
+        {
+            Vector3 direction = new Vector3(m_centerPoint.X - pos.X, m_centerPoint.Y - pos.Y, 0f );
+            return GetNearestPointAlongDirection(pos, direction);
+        }
+
+        public Vector2? GetNearestPointAlongDirection(Vector3 pos, Vector3 pdirection)
+        {
+            Vector2 testpos;
+            Vector2 direction;
+
+            testpos.X = pos.X / landUnit;
+            testpos.Y = pos.Y / landUnit;
+
+            if(LandBitmap[(int)testpos.X, (int)testpos.Y])
+                return new Vector2(pos.X, pos.Y); // we are already here
+
+            direction.X = pdirection.X;
+            direction.Y = pdirection.Y;
+
+            if(direction.X == 0f && direction.Y == 0f)
+                return null; // we can't look anywhere
+
+            direction.Normalize();
+
+            int minx = (int)(m_AABBmin.X / landUnit);
+            int maxx = (int)(m_AABBmax.X / landUnit);
+
+            // check against AABB
+            if(direction.X > 0f)
+            {
+                if(testpos.X >= maxx)
+                    return null;  // will never get there
+                if(testpos.X < minx)
+                    testpos.X = minx;
+            }
+            else if(direction.X < 0f)
+            {
+                if(testpos.X < minx)
+                    return null;  // will never get there
+                if(testpos.X >= maxx)
+                    testpos.X = maxx - 1;
+            }
+            else
+            {
+                if(testpos.X < minx)
+                    return null;  // will never get there
+                else if(testpos.X >= maxx)
+                    return null;  // will never get there
+            }
+
+            int miny = (int)(m_AABBmin.Y / landUnit);
+            int maxy = (int)(m_AABBmax.Y / landUnit);
+
+            if(direction.Y > 0f)
+            {
+                if(testpos.Y >= maxy)
+                    return null;  // will never get there
+                if(testpos.Y < miny)
+                    testpos.Y = miny;
+            }
+            else if(direction.Y < 0f)
+            {
+                if(testpos.Y < miny)
+                    return null;  // will never get there
+                if(testpos.Y >= maxy)
+                    testpos.Y = maxy - 1;
+            }
+            else
+            {
+                if(testpos.Y < miny)
+                    return null;  // will never get there
+                else if(testpos.Y >= maxy)
+                    return null;  // will never get there
+            }
+
+            while(!LandBitmap[(int)testpos.X, (int)testpos.Y])
+            {
+                testpos += direction;
+
+                if(testpos.X < minx)
+                    return null;
+                if (testpos.X >= maxx)
+                    return null;
+                if(testpos.Y < miny)
+                    return null;
+                if (testpos.Y >= maxy)
+                    return null;
+            }
+
+            testpos *= landUnit;
+            float ftmp;
+
+            if(Math.Abs(direction.X) > Math.Abs(direction.Y))
+            {
+                if(direction.X < 0)
+                    testpos.X += landUnit - 0.5f;
+                else
+                    testpos.X += 0.5f;
+                ftmp = testpos.X - pos.X;
+                ftmp /= direction.X;
+                ftmp = Math.Abs(ftmp);
+                ftmp *= direction.Y;
+                ftmp += pos.Y;
+
+                if(ftmp < testpos.Y + .5f)
+                    ftmp = testpos.Y + .5f;
+                else
                 {
-                    for (int x = LandBitmap.GetLength(0) - 1; x >= 0; x--)
-                    {
-                        if (LandBitmap[x, y])
-                        {
-                            return new Vector3(x * landUnit + landUnit, y * landUnit + landUnit, 0);
-                        }
-                    }
+                    testpos.Y += landUnit - 0.5f;
+                    if(ftmp > testpos.Y)
+                        ftmp = testpos.Y;
                 }
-
-                m_log.ErrorFormat("{0} EndPoint. No end point found. bitmapSize=<{1},{2}>",
-                                    LogHeader, LandBitmap.GetLength(0), LandBitmap.GetLength(1));
-                return new Vector3(-1, -1, -1);
+                testpos.Y = ftmp;
+            }
+            else
+            {
+                if(direction.Y < 0)
+                    testpos.Y += landUnit - 0.5f;
+                else
+                    testpos.Y += 0.5f;
+                ftmp = testpos.Y - pos.Y;
+                ftmp /= direction.Y;
+                ftmp = Math.Abs(ftmp);
+                ftmp *= direction.X;
+                ftmp += pos.X;
+
+                if(ftmp < testpos.X + .5f)
+                    ftmp = testpos.X + .5f;
+                else
+                {
+                    testpos.X += landUnit - 0.5f;
+                    if(ftmp > testpos.X)
+                        ftmp = testpos.X;
+                }
+                testpos.X = ftmp;
             }
+            return testpos;
         }
 
+
         #region Constructors
 
         public LandObject(LandData landData, Scene scene)
         {
             LandData = landData.Copy();
             m_scene = scene;
+            m_scene.EventManager.OnFrame += OnFrame;
+            m_dwellModule = m_scene.RequestModuleInterface<IDwellModule>();
         }
 
-        public LandObject(UUID owner_id, bool is_group_owned, Scene scene)
+        public LandObject(UUID owner_id, bool is_group_owned, Scene scene, LandData data = null)
         {
             m_scene = scene;
             if (m_scene == null)
                 LandBitmap = new bool[Constants.RegionSize / landUnit, Constants.RegionSize / landUnit];
             else
+            {
                 LandBitmap = new bool[m_scene.RegionInfo.RegionSizeX / landUnit, m_scene.RegionInfo.RegionSizeY / landUnit];
+                m_dwellModule = m_scene.RequestModuleInterface<IDwellModule>();
+            }
+
+            if(data == null)
+                LandData = new LandData();
+            else
+                LandData = data;
 
-            LandData = new LandData(); 
             LandData.OwnerID = owner_id;
             if (is_group_owned)
                 LandData.GroupID = owner_id;
-            else
-                LandData.GroupID = UUID.Zero;
+            
             LandData.IsGroupOwned = is_group_owned;
+
+            if(m_dwellModule == null)
+                LandData.Dwell = 0;
+
+            m_scene.EventManager.OnFrame += OnFrame;
+        }
+
+        public void Clear()
+        {
+            if(m_scene != null)
+                 m_scene.EventManager.OnFrame -= OnFrame;
+            LandData = null;     
         }
 
+
         #endregion
 
         #region Member Functions
 
         #region General Functions
-        
+
         /// <summary>
         /// Checks to see if this land object contains a point
         /// </summary>
@@ -195,14 +361,22 @@ 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)(
+                                (double)LandData.Area
+                              * (double)m_scene.RegionInfo.ObjectCapacity
+                              * (double)m_scene.RegionInfo.RegionSettings.ObjectBonus
+                              / (double)(m_scene.RegionInfo.RegionSizeX * m_scene.RegionInfo.RegionSizeY)
+                              + 0.5 );
+
+                if(parcelMax > m_scene.RegionInfo.ObjectCapacity)
+                    parcelMax = m_scene.RegionInfo.ObjectCapacity;
+
+                //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;
             }
         }
 
+        // the total prims a parcel owner can have on a region
         public int GetSimulatorMaxPrimCount()
         {
             if (overrideSimulatorMaxPrimCount != null)
@@ -212,18 +386,34 @@ 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)(   (double)LandData.SimwideArea
+                                    * (double)m_scene.RegionInfo.ObjectCapacity
+                                    * (double)m_scene.RegionInfo.RegionSettings.ObjectBonus
+                                    / (long)(m_scene.RegionInfo.RegionSizeX * m_scene.RegionInfo.RegionSizeY)
+                                    +0.5 );
+                // sanity check
+                if(simMax > m_scene.RegionInfo.ObjectCapacity)
+                    simMax = m_scene.RegionInfo.ObjectCapacity;
+                 //m_log.DebugFormat("Simwide Area: {0}, Capacity {1}, SimMax {2}, SimWidePrims {3}",
+                 //    LandData.SimwideArea, m_scene.RegionInfo.ObjectCapacity, simMax, LandData.SimwidePrims);
                 return simMax;
             }
         }
-        
+
         #endregion
 
         #region Packet Request Handling
 
         public void SendLandProperties(int sequence_id, bool snap_selection, int request_result, IClientAPI remote_client)
         {
+            if(m_scene.RegionInfo.RegionSettings.AllowDamage)
+                remote_client.SceneAgent.Invulnerable = false;
+            else
+                remote_client.SceneAgent.Invulnerable = (m_landData.Flags & (uint)ParcelFlags.AllowDamage) == 0;
+
+            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
@@ -252,10 +442,11 @@ namespace OpenSim.Region.CoreModules.World.Land
                     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 +455,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 +468,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 +496,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 +540,8 @@ namespace OpenSim.Region.CoreModules.World.Land
                         ParcelFlags.UseEstateVoiceChan);
             }
 
-            if (m_scene.Permissions.CanEditParcelProperties(remote_client.AgentId,this, GroupPowers.LandManagePasses))
+            // don't allow passes on group owned until we can give money to groups
+            if (!newData.IsGroupOwned && m_scene.Permissions.CanEditParcelProperties(remote_client.AgentId,this, GroupPowers.LandManagePasses, false))
             {
                 newData.PassHours = args.PassHours;
                 newData.PassPrice = args.PassPrice;
@@ -354,13 +549,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 +567,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 +597,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);
@@ -431,7 +633,7 @@ namespace OpenSim.Region.CoreModules.World.Land
 
         public bool CanBeOnThisLand(UUID avatar, float posHeight)
         {
-            if (posHeight < LandChannel.BAN_LINE_SAFETY_HIEGHT && IsBannedFromLand(avatar))
+            if (posHeight < LandChannel.BAN_LINE_SAFETY_HEIGHT && IsBannedFromLand(avatar))
             {
                 return false;
             }
@@ -530,7 +732,30 @@ namespace OpenSim.Region.CoreModules.World.Land
             if (HasGroupAccess(avatar))
                 return false;
 
-            return !IsInLandAccessList(avatar);
+            if(IsInLandAccessList(avatar))
+                return false;
+
+            // check for a NPC
+            ScenePresence sp;
+            if (!m_scene.TryGetScenePresence(avatar, out sp))
+                return true;
+
+            if(sp==null || !sp.IsNPC)
+                return true;
+
+            INPC npccli = (INPC)sp.ControllingClient;
+            if(npccli== null)
+                return true;
+
+            UUID owner = npccli.Owner;
+
+            if(owner == UUID.Zero)
+                return true;
+
+            if (owner == LandData.OwnerID)
+                return false;
+
+            return !IsInLandAccessList(owner);
         }
 
         public bool IsInLandAccessList(UUID avatar)
@@ -568,6 +793,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;
@@ -587,13 +813,13 @@ namespace OpenSim.Region.CoreModules.World.Land
                 {
                     if (over.LandData.LocalID == LandData.LocalID)
                     {
-                        if (((over.LandData.Flags & (uint)ParcelFlags.AllowDamage) != 0) &&
-                            m_scene.RegionInfo.RegionSettings.AllowDamage)
+                        if(m_scene.RegionInfo.RegionSettings.AllowDamage)
                             avatar.Invulnerable = false;
                         else
-                            avatar.Invulnerable = true;
+                            avatar.Invulnerable = (over.LandData.Flags & (uint)ParcelFlags.AllowDamage) == 0;
 
                         SendLandUpdateToClient(snap_selection, avatar.ControllingClient);
+                        avatar.currentParcelUUID = LandData.GlobalID;
                     }
                 }
             });
@@ -630,13 +856,13 @@ namespace OpenSim.Region.CoreModules.World.Land
                                    IClientAPI remote_client)
         {
 
-            if (flags == (uint) AccessList.Access || flags == (uint) AccessList.Both)
+            if ((flags & (uint) AccessList.Access) != 0)
             {
                 List<LandAccessEntry> accessEntries = CreateAccessListArrayByFlag(AccessList.Access);
                 remote_client.SendLandAccessListData(accessEntries,(uint) AccessList.Access,LandData.LocalID);
             }
 
-            if (flags == (uint) AccessList.Ban || flags == (uint) AccessList.Both)
+            if ((flags & (uint) AccessList.Ban) != 0)
             {
                 List<LandAccessEntry> accessEntries = CreateAccessListArrayByFlag(AccessList.Ban);
                 remote_client.SendLandAccessListData(accessEntries, (uint)AccessList.Ban, LandData.LocalID);
@@ -691,6 +917,17 @@ namespace OpenSim.Region.CoreModules.World.Land
                 newData.ParcelAccessList.Add(temp);
             }
 
+            // update use lists flags
+            // rights already checked or we wont be here
+            uint parcelflags = newData.Flags;
+
+            if((flags & (uint)AccessList.Access) != 0)
+                    parcelflags |= (uint)ParcelFlags.UseAccessList;
+            if((flags & (uint)AccessList.Ban) != 0)
+                parcelflags |= (uint)ParcelFlags.UseBanList;
+
+            newData.Flags = parcelflags;
+
             m_scene.LandChannel.UpdateLandObject(LandData.LocalID, newData);
         }
 
@@ -708,7 +945,7 @@ namespace OpenSim.Region.CoreModules.World.Land
         /// </summary>
         public void ForceUpdateLandInfo()
         {
-            UpdateAABBAndAreaValues();
+            UpdateGeometryValues();
             UpdateLandBitmapByteArray();
         }
 
@@ -718,52 +955,117 @@ namespace OpenSim.Region.CoreModules.World.Land
         }
 
         /// <summary>
-        /// Updates the AABBMin and AABBMax values after area/shape modification of the land object
+        /// Updates geomtric values after area/shape modification of the land object
         /// </summary>
-        private void UpdateAABBAndAreaValues()
+        private void UpdateGeometryValues()
         {
-            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;
+
+            int lastX = 0;
+            int lastY = 0;
+            float avgx = 0f;
+            float avgy = 0f;
+
+            bool needFirst = true;
+
             for (x = 0; x < LandBitmap.GetLength(0); x++)
             {
                 for (y = 0; y < LandBitmap.GetLength(1); y++)
                 {
-                    if (LandBitmap[x, y] == true)
+                    if (LandBitmap[x, 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
+                        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(needFirst)
+                        {
+                            avgx = x;
+                            avgy = y;
+                            m_startPoint.X = x * landUnit;
+                            m_startPoint.Y = y * landUnit;
+                            needFirst = false;
+                        }
+                        else
+                        {
+                            // keeping previus odd average
+                            avgx = (avgx * tempArea + x) / (tempArea + 1);
+                            avgy = (avgy * tempArea + y) / (tempArea + 1);
+                        }
+
+                        tempArea++;
+
+                        lastX = x;
+                        lastY = y;
                     }
                 }
             }
+
+            int halfunit = landUnit/2;
+
+            m_centerPoint.X = avgx * landUnit + halfunit;
+            m_centerPoint.Y = avgy * landUnit + halfunit;
+
+            m_endPoint.X = lastX * landUnit + landUnit;
+            m_endPoint.Y = lastY * landUnit + landUnit;
+
+            // next tests should not be needed
+            // if they fail, something is wrong
+
+            int regionSizeX = (int)Constants.RegionSize;
+            int regionSizeY = (int)Constants.RegionSize;
+
+            if(m_scene != null)
+            {
+                regionSizeX = (int)m_scene.RegionInfo.RegionSizeX;
+                regionSizeY = (int)m_scene.RegionInfo.RegionSizeX;
+            }
+
             int tx = min_x * landUnit;
-            if (tx > ((int)m_scene.RegionInfo.RegionSizeX - 1))
-                tx = ((int)m_scene.RegionInfo.RegionSizeX - 1);
+            if (tx >= regionSizeX)
+                tx = regionSizeX - 1;
+
             int ty = min_y * landUnit;
-            if (ty > ((int)m_scene.RegionInfo.RegionSizeY - 1))
-                ty = ((int)m_scene.RegionInfo.RegionSizeY - 1);
+            if (ty >= regionSizeY)
+                ty = regionSizeY - 1;
 
-            LandData.AABBMin =
-                new Vector3(
-                    (float)(min_x * landUnit), (float)(min_y * landUnit), m_scene != null ? (float)m_scene.Heightmap[tx, ty] : 0);
+            m_AABBmin.X = tx;
+            m_AABBmin.Y = ty;
+
+            if(m_scene == null || m_scene.Heightmap == null)
+                LandData.AABBMin = new Vector3(tx, ty, 0f);
+            else
+                LandData.AABBMin = new Vector3(tx, ty, (float)m_scene.Heightmap[tx, ty]);
 
+            max_x++;
             tx = max_x * landUnit;
-            if (tx > ((int)m_scene.RegionInfo.RegionSizeX - 1))
-                tx = ((int)m_scene.RegionInfo.RegionSizeX - 1);
+            if (tx > regionSizeX)
+                tx = regionSizeX;
+
+            max_y++;
             ty = max_y * landUnit;
-            if (ty > ((int)m_scene.RegionInfo.RegionSizeY - 1))
-                ty = ((int)m_scene.RegionInfo.RegionSizeY - 1);
+            if (ty > regionSizeY)
+                ty = regionSizeY;
+
+            m_AABBmax.X = tx;
+            m_AABBmax.Y = ty;
 
-            LandData.AABBMax 
-                = new Vector3(
-                    (float)(max_x * landUnit), (float)(max_y * landUnit), m_scene != null ? (float)m_scene.Heightmap[tx, ty] : 0);
+            if(m_scene == null || m_scene.Heightmap == null)
+                LandData.AABBMax = new Vector3(tx, ty, 0f);
+            else
+                LandData.AABBMax = new Vector3(tx, ty, (float)m_scene.Heightmap[tx - 1, ty - 1]);
 
+            tempArea *= landUnit * landUnit;
             LandData.Area = tempArea;
         }
 
@@ -778,7 +1080,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();
         }
 
@@ -793,17 +1094,17 @@ namespace OpenSim.Region.CoreModules.World.Land
 
         public bool[,] BasicFullRegionLandBitmap()
         {
-            return GetSquareLandBitmap(0, 0, (int)m_scene.RegionInfo.RegionSizeX, (int) m_scene.RegionInfo.RegionSizeY);
+            return GetSquareLandBitmap(0, 0, (int)m_scene.RegionInfo.RegionSizeX, (int) m_scene.RegionInfo.RegionSizeY, true);
         }
-        
-        public bool[,] GetSquareLandBitmap(int start_x, int start_y, int end_x, int end_y)
+
+        public bool[,] GetSquareLandBitmap(int start_x, int start_y, int end_x, int end_y, bool set_value = true)
         {
             // Empty bitmap for the whole region
             bool[,] tempBitmap = new bool[m_scene.RegionInfo.RegionSizeX / landUnit, m_scene.RegionInfo.RegionSizeY / landUnit];
             tempBitmap.Initialize();
 
             // Fill the bitmap square area specified by state and end
-            tempBitmap = ModifyLandBitmapSquare(tempBitmap, start_x, start_y, end_x, end_y, true);
+            tempBitmap = ModifyLandBitmapSquare(tempBitmap, start_x, start_y, end_x, end_y, set_value);
             // m_log.DebugFormat("{0} GetSquareLandBitmap. tempBitmapSize=<{1},{2}>",
             //                         LogHeader, tempBitmap.GetLength(0), tempBitmap.GetLength(1));
             return tempBitmap;
@@ -873,51 +1174,287 @@ namespace OpenSim.Region.CoreModules.World.Land
         }
 
         /// <summary>
+        /// Remap a land bitmap. Takes the supplied land bitmap and rotates it, crops it and finally offsets it into
+        /// a final land bitmap of the target region size.
+        /// </summary>
+        /// <param name="bitmap_base">The original parcel bitmap</param>
+        /// <param name="rotationDegrees"></param>
+        /// <param name="displacement">&lt;x,y,?&gt;</param>
+        /// <param name="boundingOrigin">&lt;x,y,?&gt;</param>
+        /// <param name="boundingSize">&lt;x,y,?&gt;</param>
+        /// <param name="regionSize">&lt;x,y,?&gt;</param>
+        /// <param name="isEmptyNow">out: This is set if the resultant bitmap is now empty</param>
+        /// <param name="AABBMin">out: parcel.AABBMin &lt;x,y,0&gt</param>
+        /// <param name="AABBMax">out: parcel.AABBMax &lt;x,y,0&gt</param>
+        /// <returns>New parcel bitmap</returns>
+        public bool[,] RemapLandBitmap(bool[,] bitmap_base, Vector2 displacement, float rotationDegrees, Vector2 boundingOrigin, Vector2 boundingSize, Vector2 regionSize, out bool isEmptyNow, out Vector3 AABBMin, out Vector3 AABBMax)
+        {
+            // get the size of the incoming bitmap
+            int baseX = bitmap_base.GetLength(0);
+            int baseY = bitmap_base.GetLength(1);
+
+            // create an intermediate bitmap that is 25% bigger on each side that we can work with to handle rotations
+            int offsetX = baseX / 4; // the original origin will now be at these coordinates so now we can have imaginary negative coordinates ;)
+            int offsetY = baseY / 4;
+            int tmpX = baseX + baseX / 2;
+            int tmpY = baseY + baseY / 2;
+            int centreX = tmpX / 2;
+            int centreY = tmpY / 2;
+            bool[,] bitmap_tmp = new bool[tmpX, tmpY];
+
+            double radianRotation = Math.PI * rotationDegrees / 180f;
+            double cosR = Math.Cos(radianRotation);
+            double sinR = Math.Sin(radianRotation);
+            if (rotationDegrees < 0f) rotationDegrees += 360f; //-90=270 -180=180 -270=90
+
+            // So first we apply the rotation to the incoming bitmap, storing the result in bitmap_tmp
+            // We special case orthogonal rotations for accuracy because even using double precision math, Math.Cos(90 degrees) is never fully 0
+            // and we can never rotate around a centre pixel because the bitmap size is always even
+            int x, y, sx, sy;
+            for (y = 0; y <= tmpY; y++)
+            {
+                for (x = 0; x <= tmpX; x++)
+                {
+                    if (rotationDegrees == 0f)
+                    {
+                        sx = x - offsetX;
+                        sy = y - offsetY;
+                    }
+                    else if (rotationDegrees == 90f)
+                    {
+                        sx = y - offsetX;
+                        sy = tmpY - 1 - x - offsetY;
+                    }
+                    else if (rotationDegrees == 180f)
+                    {
+                        sx = tmpX - 1 - x - offsetX;
+                        sy = tmpY - 1 - y - offsetY;
+                    }
+                    else if (rotationDegrees == 270f)
+                    {
+                        sx = tmpX - 1 - y - offsetX;
+                        sy = x - offsetY;
+                    }
+                    else
+                    {
+                        // arbitary rotation: hmmm should I be using (centreX - 0.5) and (centreY - 0.5) and round cosR and sinR to say only 5 decimal places?
+                        sx = centreX + (int)Math.Round((((double)x - centreX) * cosR) + (((double)y - centreY) * sinR)) - offsetX;
+                        sy = centreY + (int)Math.Round((((double)y - centreY) * cosR) - (((double)x - centreX) * sinR)) - offsetY;
+                    }
+                    if (sx >= 0 && sx < baseX && sy >= 0 && sy < baseY)
+                    {
+                        try
+                        {
+                            if (bitmap_base[sx, sy]) bitmap_tmp[x, y] = true;
+                        }
+                        catch (Exception)   //just in case we've still not taken care of every way the arrays might go out of bounds! ;)
+                        {
+                            m_log.DebugFormat("{0} RemapLandBitmap Rotate: Out of Bounds sx={1} sy={2} dx={3} dy={4}", LogHeader, sx, sy, x, y);
+                        }
+                    }
+                }
+            }
+
+            // We could also incorporate the next steps, bounding-rectangle and displacement in the loop above, but it's simpler to visualise if done separately
+            // and will also make it much easier when later I want the option for maybe a circular or oval bounding shape too ;).
+            // So... our output land bitmap must be the size of the current region but rememeber, parcel landbitmaps are landUnit metres (4x4 metres) per point,
+            // and region sizes, boundaries and displacements are in metres so we need to scale down
+
+            int newX = (int)(regionSize.X / landUnit);
+            int newY = (int)(regionSize.Y / landUnit);
+            bool[,] bitmap_new = new bool[newX, newY];
+            // displacement is relative to <0,0> in the destination region and defines where the origin of the data selected by the bounding-rectangle is placed
+            int dispX = (int)Math.Floor(displacement.X / landUnit);
+            int dispY = (int)Math.Floor(displacement.Y / landUnit);
+
+            // startX/Y and endX/Y are coordinates in bitmap_tmp
+            int startX = (int)Math.Floor(boundingOrigin.X / landUnit) + offsetX;
+            if (startX > tmpX) startX = tmpX;
+            if (startX < 0) startX = 0;
+            int startY = (int)Math.Floor(boundingOrigin.Y / landUnit) + offsetY;
+            if (startY > tmpY) startY = tmpY;
+            if (startY < 0) startY = 0;
+
+            int endX = (int)Math.Floor((boundingOrigin.X + boundingSize.X) / landUnit) + offsetX;
+            if (endX > tmpX) endX = tmpX;
+            if (endX < 0) endX = 0;
+            int endY = (int)Math.Floor((boundingOrigin.Y + boundingSize.Y) / landUnit) + offsetY;
+            if (endY > tmpY) endY = tmpY;
+            if (endY < 0) endY = 0;
+
+            //m_log.DebugFormat("{0} RemapLandBitmap: inSize=<{1},{2}>, disp=<{3},{4}> rot={5}, offset=<{6},{7}>, boundingStart=<{8},{9}>, boundingEnd=<{10},{11}>, cosR={12}, sinR={13}, outSize=<{14},{15}>", LogHeader,
+            //                            baseX, baseY, dispX, dispY, radianRotation, offsetX, offsetY, startX, startY, endX, endY, cosR, sinR, newX, newY);
+
+            isEmptyNow = true;
+            int minX = newX;
+            int minY = newY;
+            int maxX = 0;
+            int maxY = 0;
+
+            int dx, dy;
+            for (y = startY; y < endY; y++)
+            {
+                for (x = startX; x < endX; x++)
+                {
+                    dx = x - startX + dispX;
+                    dy = y - startY + dispY;
+                    if (dx >= 0 && dx < newX && dy >= 0 && dy < newY)
+                    {
+                        try
+                        {
+                            if (bitmap_tmp[x, y])
+                            {
+                                bitmap_new[dx, dy] = true;
+                                isEmptyNow = false;
+                                if (dx < minX) minX = dx;
+                                if (dy < minY) minY = dy;
+                                if (dx > maxX) maxX = dx;
+                                if (dy > maxY) maxY = dy;
+                            }
+                        }
+                        catch (Exception)   //just in case we've still not taken care of every way the arrays might go out of bounds! ;)
+                        {
+                            m_log.DebugFormat("{0} RemapLandBitmap - Bound & Displace: Out of Bounds sx={1} sy={2} dx={3} dy={4}", LogHeader, x, y, dx, dy);
+                        }
+                    }
+                }
+            }
+            if (isEmptyNow)
+            {
+                //m_log.DebugFormat("{0} RemapLandBitmap: Land bitmap is marked as Empty", LogHeader);
+                minX = 0;
+                minY = 0;
+            }
+
+            AABBMin = new Vector3(minX * landUnit, minY * landUnit, 0);
+            AABBMax = new Vector3(maxX * landUnit, maxY * landUnit, 0);
+            return bitmap_new;
+        }
+
+        /// <summary>
+        /// Clears any parcel data in bitmap_base where there exists parcel data in bitmap_new. In other words the parcel data
+        /// in bitmap_new takes over the space of the parcel data in bitmap_base.
+        /// </summary>
+        /// <param name="bitmap_base"></param>
+        /// <param name="bitmap_new"></param>
+        /// <param name="isEmptyNow">out: This is set if the resultant bitmap is now empty</param>
+        /// <param name="AABBMin">out: parcel.AABBMin &lt;x,y,0&gt</param>
+        /// <param name="AABBMax">out: parcel.AABBMax &lt;x,y,0&gt</param>
+        /// <returns>New parcel bitmap</returns>
+        public bool[,] RemoveFromLandBitmap(bool[,] bitmap_base, bool[,] bitmap_new, out bool isEmptyNow, out Vector3 AABBMin, out Vector3 AABBMax)
+        {
+            // get the size of the incoming bitmaps
+            int baseX = bitmap_base.GetLength(0);
+            int baseY = bitmap_base.GetLength(1);
+            int newX = bitmap_new.GetLength(0);
+            int newY = bitmap_new.GetLength(1);
+
+            if (baseX != newX || baseY != newY)
+            {
+                throw new Exception(
+                    String.Format("{0} RemoveFromLandBitmap: Land bitmaps are not the same size! baseX={1} baseY={2} newX={3} newY={4}", LogHeader, baseX, baseY, newX, newY));
+            }
+
+            isEmptyNow = true;
+            int minX = baseX;
+            int minY = baseY;
+            int maxX = 0;
+            int maxY = 0;
+
+            for (int y = 0; y < baseY; y++)
+            {
+                for (int x = 0; x < baseX; x++)
+                {
+                    if (bitmap_new[x, y]) bitmap_base[x, y] = false;
+                    if (bitmap_base[x, y])
+                    {
+                        isEmptyNow = false;
+                        if (x < minX) minX = x;
+                        if (y < minY) minY = y;
+                        if (x > maxX) maxX = x;
+                        if (y > maxY) maxY = y;
+                    }
+                }
+            }
+            if (isEmptyNow)
+            {
+                //m_log.DebugFormat("{0} RemoveFromLandBitmap: Land bitmap is marked as Empty", LogHeader);
+                minX = 0;
+                minY = 0;
+            }
+            AABBMin = new Vector3(minX * landUnit, minY * landUnit, 0);
+            AABBMax = new Vector3(maxX * landUnit, maxY * landUnit, 0);
+            return bitmap_base;
+        }
+
+        /// <summary>
         /// Converts the land bitmap to a packet friendly byte array
         /// </summary>
         /// <returns></returns>
-        private byte[] ConvertLandBitmapToBytes()
+        public byte[] ConvertLandBitmapToBytes()
         {
             byte[] tempConvertArr = new byte[LandBitmap.GetLength(0) * LandBitmap.GetLength(1) / 8];
-            byte tempByte = 0;
+
+            int tempByte = 0;
             int byteNum = 0;
-            int i = 0;
+            int mask = 1;
             for (int y = 0; y < LandBitmap.GetLength(1); y++)
             {
                 for (int x = 0; x < LandBitmap.GetLength(0); x++)
                 {
-                    tempByte = Convert.ToByte(tempByte | Convert.ToByte(LandBitmap[x, y]) << (i++ % 8));
-                    if (i % 8 == 0)
+                    if (LandBitmap[x, y])
+                        tempByte |= mask;
+                    mask = mask << 1;
+                    if (mask == 0x100)
                     {
-                        tempConvertArr[byteNum] = tempByte;
-                        tempByte = (byte) 0;
-                        i = 0;
-                        byteNum++;
+                        mask = 1;
+                        tempConvertArr[byteNum++] = (byte)tempByte;
+                        tempByte = 0;
                     }
                 }
             }
-            // m_log.DebugFormat("{0} ConvertLandBitmapToBytes. BitmapSize=<{1},{2}>",
-            //                         LogHeader, LandBitmap.GetLength(0), LandBitmap.GetLength(1));
+
+            if(tempByte != 0 && byteNum < 512)
+                tempConvertArr[byteNum] = (byte)tempByte;
+
             return tempConvertArr;
         }
 
-        private bool[,] ConvertBytesToLandBitmap()
+        public bool[,] ConvertBytesToLandBitmap(bool overrideRegionSize = false)
         {
-            bool[,] tempConvertMap = new bool[m_scene.RegionInfo.RegionSizeX / landUnit, m_scene.RegionInfo.RegionSizeY / landUnit];
-            tempConvertMap.Initialize();
-            byte tempByte = 0;
-            // Math.Min overcomes an old bug that might have made it into the database. Only use the bytes that fit into convertMap.
-            int bitmapLen = Math.Min(LandData.Bitmap.Length, tempConvertMap.GetLength(0) * tempConvertMap.GetLength(1) / 8);
-            int xLen = (int)(m_scene.RegionInfo.RegionSizeX / landUnit);
+            int bitmapLen;
+            int xLen;
+            bool[,] tempConvertMap;
 
-            if (bitmapLen == 512)
+            if (overrideRegionSize)
+            {
+                // Importing land parcel data from an OAR where the source region is a different size to the dest region requires us
+                // to make a LandBitmap that's not derived from the current region's size. We use the LandData.Bitmap size in bytes
+                // to figure out what the OAR's region dimensions are. (Is there a better way to get the src region x and y from the OAR?)
+                // This method assumes we always will have square regions
+
+                bitmapLen = LandData.Bitmap.Length;
+                xLen = (int)Math.Abs(Math.Sqrt(bitmapLen * 8));
+                tempConvertMap = new bool[xLen, xLen];
+                tempConvertMap.Initialize();
+            }
+            else
             {
-                // Legacy bitmap being passed in. Use the legacy region size
-                //    and only set the lower area of the larger region.
-                xLen = (int)(Constants.RegionSize / landUnit);
+                tempConvertMap = new bool[m_scene.RegionInfo.RegionSizeX / landUnit, m_scene.RegionInfo.RegionSizeY / landUnit];
+                tempConvertMap.Initialize();
+                // Math.Min overcomes an old bug that might have made it into the database. Only use the bytes that fit into convertMap.
+                bitmapLen = Math.Min(LandData.Bitmap.Length, tempConvertMap.GetLength(0) * tempConvertMap.GetLength(1) / 8);
+                xLen = (int)(m_scene.RegionInfo.RegionSizeX / landUnit);
+                if (bitmapLen == 512)
+                {
+                    // Legacy bitmap being passed in. Use the legacy region size
+                    //    and only set the lower area of the larger region.
+                    xLen = (int)(Constants.RegionSize / landUnit);
+                }
             }
             // m_log.DebugFormat("{0} ConvertBytesToLandBitmap: bitmapLen={1}, xLen={2}", LogHeader, bitmapLen, xLen);
 
+            byte tempByte;
             int x = 0, y = 0;
             for (int i = 0; i < bitmapLen; i++)
             {
@@ -945,13 +1482,39 @@ namespace OpenSim.Region.CoreModules.World.Land
             return tempConvertMap;
         }
 
+        public bool IsLandBitmapEmpty(bool[,] landBitmap)
+        {
+            for (int y = 0; y < landBitmap.GetLength(1); y++)
+            {
+                for (int x = 0; x < landBitmap.GetLength(0); x++)
+                {
+                    if (landBitmap[x, y]) return false;
+                }
+            }
+            return true;
+        }
+
+        public void DebugLandBitmap(bool[,] landBitmap)
+        {
+            m_log.InfoFormat("{0}: Map Key: #=claimed land .=unclaimed land.", LogHeader);
+            for (int y = landBitmap.GetLength(1) - 1; y >= 0; y--)
+            {
+                string row = "";
+                for (int x = 0; x < landBitmap.GetLength(0); x++)
+                {
+                    row += landBitmap[x, y] ? "#" : ".";
+                }
+                m_log.InfoFormat("{0}: {1}", LogHeader, row);
+            }
+        }
+
         #endregion
 
         #region Object Select and Object Owner Listing
 
         public void SendForceObjectSelect(int local_id, int request_type, List<UUID> returnIDs, IClientAPI remote_client)
         {
-            if (m_scene.Permissions.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 +1564,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>();
@@ -1009,9 +1572,9 @@ namespace OpenSim.Region.CoreModules.World.Land
                 lock (primsOverMe)
                 {
 //                    m_log.DebugFormat(
-//                        "[LAND OBJECT]: Request for SendLandObjectOwners() from {0} with {1} known prims on region", 
+//                        "[LAND OBJECT]: Request for SendLandObjectOwners() from {0} with {1} known prims on region",
 //                        remote_client.Name, primsOverMe.Count);
-                    
+
                     try
                     {
                         foreach (SceneObjectGroup obj in primsOverMe)
@@ -1052,7 +1615,7 @@ namespace OpenSim.Region.CoreModules.World.Land
         public Dictionary<UUID, int> GetLandObjectOwners()
         {
             Dictionary<UUID, int> ownersAndCount = new Dictionary<UUID, int>();
-            
+
             lock (primsOverMe)
             {
                 try
@@ -1106,8 +1669,7 @@ namespace OpenSim.Region.CoreModules.World.Land
             {
                 foreach (SceneObjectGroup obj in primsOverMe)
                 {
-                    if (obj.OwnerID == previousOwner && obj.GroupID == UUID.Zero &&
-                        (obj.GetEffectivePermissions() & (uint)(OpenSim.Framework.PermissionMask.Transfer)) != 0)
+                    if(m_scene.Permissions.CanSellObject(previousOwner,obj, (byte)SaleType.Original))
                         m_BuySellModule.BuyObject(sp.ControllingClient, UUID.Zero, obj.LocalId, 1, 0);
                 }
             }
@@ -1121,14 +1683,14 @@ namespace OpenSim.Region.CoreModules.World.Land
         {
             SceneObjectGroup[] objs = new SceneObjectGroup[1];
             objs[0] = obj;
-            m_scene.returnObjects(objs, obj.OwnerID);
+            m_scene.returnObjects(objs, null);
         }
 
         public void ReturnLandObjects(uint type, UUID[] owners, UUID[] tasks, IClientAPI remote_client)
         {
 //            m_log.DebugFormat(
 //                "[LAND OBJECT]: Request to return objects in {0} from {1}", LandData.Name, remote_client.Name);
-            
+
             Dictionary<UUID,List<SceneObjectGroup>> returns = new Dictionary<UUID,List<SceneObjectGroup>>();
 
             lock (primsOverMe)
@@ -1152,6 +1714,8 @@ namespace OpenSim.Region.CoreModules.World.Land
                     {
                         if (obj.GroupID == LandData.GroupID)
                         {
+                            if (obj.OwnerID == LandData.OwnerID)
+                                continue;
                             if (!returns.ContainsKey(obj.OwnerID))
                                 returns[obj.OwnerID] =
                                         new List<SceneObjectGroup>();
@@ -1193,8 +1757,8 @@ namespace OpenSim.Region.CoreModules.World.Land
 
             foreach (List<SceneObjectGroup> ol in returns.Values)
             {
-                if (m_scene.Permissions.CanReturnObjects(this, remote_client.AgentId, ol))
-                    m_scene.returnObjects(ol.ToArray(), remote_client.AgentId);
+                if (m_scene.Permissions.CanReturnObjects(this, remote_client, ol))
+                    m_scene.returnObjects(ol.ToArray(), remote_client);
             }
         }
 
@@ -1211,7 +1775,7 @@ namespace OpenSim.Region.CoreModules.World.Land
         public void AddPrimOverMe(SceneObjectGroup obj)
         {
 //            m_log.DebugFormat("[LAND OBJECT]: Adding scene object {0} {1} over {2}", obj.Name, obj.LocalId, LandData.Name);
-            
+
             lock (primsOverMe)
                 primsOverMe.Add(obj);
         }
@@ -1219,13 +1783,13 @@ namespace OpenSim.Region.CoreModules.World.Land
         public void RemovePrimFromOverMe(SceneObjectGroup obj)
         {
 //            m_log.DebugFormat("[LAND OBJECT]: Removing scene object {0} {1} from over {2}", obj.Name, obj.LocalId, LandData.Name);
-            
+
             lock (primsOverMe)
                 primsOverMe.Remove(obj);
         }
 
         #endregion
-        
+
         /// <summary>
         /// Set the media url for this land parcel
         /// </summary>
@@ -1233,9 +1797,10 @@ namespace OpenSim.Region.CoreModules.World.Land
         public void SetMediaUrl(string url)
         {
             LandData.MediaURL = url;
+            m_scene.LandChannel.UpdateLandObject(LandData.LocalID, LandData);
             SendLandUpdateToAvatarsOverMe();
         }
-        
+
         /// <summary>
         /// Set the music url for this land parcel
         /// </summary>
@@ -1243,6 +1808,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 +1823,48 @@ namespace OpenSim.Region.CoreModules.World.Land
 
         #endregion
 
+        private void OnFrame()
+        {
+            m_expiryCounter++;
+
+            if (m_expiryCounter >= 50)
+            {
+                ExpireAccessList();
+                m_expiryCounter = 0;
+            }
+
+            // need to update dwell here bc landdata has no parent info
+            if(LandData != null && m_dwellModule != null)
+            {
+                double now = Util.GetTimeStampMS();
+                double elapsed = now - LandData.LastDwellTimeMS;
+                if(elapsed > 150000) //2.5 minutes resolution / throttle
+                {
+                    float dwell = LandData.Dwell;
+                    double cur = dwell * 60000.0;
+                    double decay = 1.5e-8 * cur * elapsed;
+                    cur -= decay;
+                    if(cur < 0)
+                        cur = 0;
+
+                    UUID lgid = LandData.GlobalID;
+                    m_scene.ForEachRootScenePresence(delegate(ScenePresence sp)
+                    {
+                        if(sp.IsNPC || sp.IsLoggingIn || sp.IsDeleted || sp.currentParcelUUID != lgid)
+                            return;
+                        cur += (now - sp.ParcelDwellTickMS);
+                        sp.ParcelDwellTickMS = now;
+                    });
+                
+                    float newdwell = (float)(cur * 1.666666666667e-5); 
+                    LandData.Dwell = newdwell;
+
+                    if(Math.Abs(newdwell - dwell) >= 0.9)
+                        m_scene.EventManager.TriggerLandObjectAdded(this);
+                }
+            }
+        }
+
         private void ExpireAccessList()
         {
             List<LandAccessEntry> delete = new List<LandAccessEntry>();
@@ -1267,7 +1875,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.TeleportOnEject(pos);
+                        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..2a720db 100644
--- a/OpenSim/Region/CoreModules/World/Land/PrimCountModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/PrimCountModule.cs
@@ -69,11 +69,11 @@ namespace OpenSim.Region.CoreModules.World.Land
         /// For now, a simple simwide taint to get this up. Later parcel based
         /// taint to allow recounting a parcel if only ownership has changed
         /// without recounting the whole sim.
-        /// 
+        ///
         /// We start out tainted so that the first get call resets the various prim counts.
         /// </value>
         private bool m_Tainted = true;
-        
+
         private Object m_TaintLock = new Object();
 
         public Type ReplaceableInterface
@@ -88,14 +88,12 @@ namespace OpenSim.Region.CoreModules.World.Land
         public void AddRegion(Scene scene)
         {
             m_Scene = scene;
-            
+
             m_Scene.RegisterModuleInterface<IPrimCountModule>(this);
 
-            m_Scene.EventManager.OnObjectAddedToScene += OnParcelPrimCountAdd;            
-            m_Scene.EventManager.OnObjectBeingRemovedFromScene +=
-                    OnObjectBeingRemovedFromScene;
-            m_Scene.EventManager.OnParcelPrimCountTainted +=
-                    OnParcelPrimCountTainted;
+            m_Scene.EventManager.OnObjectAddedToScene += OnParcelPrimCountAdd;
+            m_Scene.EventManager.OnObjectBeingRemovedFromScene +=  OnObjectBeingRemovedFromScene;
+            m_Scene.EventManager.OnParcelPrimCountTainted +=  OnParcelPrimCountTainted;
             m_Scene.EventManager.OnLandObjectAdded += delegate(ILandObject lo) { OnParcelPrimCountTainted(); };
         }
 
@@ -104,7 +102,7 @@ namespace OpenSim.Region.CoreModules.World.Land
         }
 
         public void RemoveRegion(Scene scene)
-        {            
+        {
         }
 
         public void Close()
@@ -126,7 +124,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                     AddObject(obj);
 //                else
 //                    m_log.DebugFormat(
-//                        "[PRIM COUNT MODULE]: Ignoring OnParcelPrimCountAdd() for {0} on {1} since count is tainted", 
+//                        "[PRIM COUNT MODULE]: Ignoring OnParcelPrimCountAdd() for {0} on {1} since count is tainted",
 //                        obj.Name, m_Scene.RegionInfo.RegionName);
             }
         }
@@ -140,16 +138,16 @@ namespace OpenSim.Region.CoreModules.World.Land
                     RemoveObject(obj);
 //                else
 //                    m_log.DebugFormat(
-//                        "[PRIM COUNT MODULE]: Ignoring OnObjectBeingRemovedFromScene() for {0} on {1} since count is tainted", 
-//                        obj.Name, m_Scene.RegionInfo.RegionName);                
+//                        "[PRIM COUNT MODULE]: Ignoring OnObjectBeingRemovedFromScene() for {0} on {1} since count is tainted",
+//                        obj.Name, m_Scene.RegionInfo.RegionName);
             }
         }
 
         private void OnParcelPrimCountTainted()
         {
 //            m_log.DebugFormat(
-//                "[PRIM COUNT MODULE]: OnParcelPrimCountTainted() called on {0}", m_Scene.RegionInfo.RegionName);            
-            
+//                "[PRIM COUNT MODULE]: OnParcelPrimCountTainted() called on {0}", m_Scene.RegionInfo.RegionName);
+
             lock (m_TaintLock)
                 m_Tainted = true;
         }
@@ -174,40 +172,40 @@ namespace OpenSim.Region.CoreModules.World.Land
 
         // NOTE: Call under Taint Lock
         private void AddObject(SceneObjectGroup obj)
-        {                       
+        {
             if (obj.IsAttachment)
                 return;
             if (((obj.RootPart.Flags & PrimFlags.TemporaryOnRez) != 0))
-                return;                       
+                return;
 
             Vector3 pos = obj.AbsolutePosition;
             ILandObject landObject = m_Scene.LandChannel.GetLandObject(pos.X, pos.Y);
-            
+
             // If for some reason there is no land object (perhaps the object is out of bounds) then we can't count it
             if (landObject == null)
             {
 //                m_log.WarnFormat(
-//                    "[PRIM COUNT MODULE]: Found no land object for {0} at position ({1}, {2}) on {3}", 
+//                    "[PRIM COUNT MODULE]: Found no land object for {0} at position ({1}, {2}) on {3}",
 //                    obj.Name, pos.X, pos.Y, m_Scene.RegionInfo.RegionName);
-                
+
                 return;
             }
-            
+
             LandData landData = landObject.LandData;
-            
+
 //            m_log.DebugFormat(
-//                "[PRIM COUNT MODULE]: Adding object {0} with {1} parts to prim count for parcel {2} on {3}", 
-//                obj.Name, obj.Parts.Length, landData.Name, m_Scene.RegionInfo.RegionName);                        
-            
+//                "[PRIM COUNT MODULE]: Adding object {0} with {1} parts to prim count for parcel {2} on {3}",
+//                obj.Name, obj.Parts.Length, landData.Name, m_Scene.RegionInfo.RegionName);
+
 //            m_log.DebugFormat(
-//                "[PRIM COUNT MODULE]: Object {0} is owned by {1} over land owned by {2}", 
+//                "[PRIM COUNT MODULE]: Object {0} is owned by {1} over land owned by {2}",
 //                obj.Name, obj.OwnerID, landData.OwnerID);
 
             ParcelCounts parcelCounts;
             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))
@@ -215,37 +213,23 @@ namespace OpenSim.Region.CoreModules.World.Land
                 else
                     parcelCounts.Users[obj.OwnerID] = partCount;
 
-                if (obj.IsSelected)
-                {
-                    parcelCounts.Selected += partCount;                
-                }
+                if (obj.IsSelected || obj.GetSittingAvatarsCount() > 0)
+                    parcelCounts.Selected += partCount;
+
+                if (obj.OwnerID == landData.OwnerID)
+                    parcelCounts.Owner += partCount;
+                else if (landData.GroupID != UUID.Zero && obj.GroupID == landData.GroupID)
+                    parcelCounts.Group += partCount;
                 else
-                {
-                    if (landData.IsGroupOwned)
-                    {
-                        if (obj.OwnerID == landData.GroupID)
-                            parcelCounts.Owner += partCount;
-                        else if (landData.GroupID != UUID.Zero && obj.GroupID == landData.GroupID)
-                            parcelCounts.Group += partCount;
-                        else
-                            parcelCounts.Others += partCount;
-                    }
-                    else
-                    {
-                        if (obj.OwnerID == landData.OwnerID)
-                            parcelCounts.Owner += partCount;
-                        else
-                            parcelCounts.Others += partCount;
-                    }
-                }
+                    parcelCounts.Others += partCount;
             }
         }
 
         // NOTE: Call under Taint Lock
         private void RemoveObject(SceneObjectGroup obj)
         {
-//            m_log.DebugFormat("[PRIM COUNT MODULE]: Removing object {0} {1} from prim count", obj.Name, obj.UUID);            
-            
+//            m_log.DebugFormat("[PRIM COUNT MODULE]: Removing object {0} {1} from prim count", obj.Name, obj.UUID);
+
             // Currently this is being done by tainting the count instead.
         }
 
@@ -253,7 +237,7 @@ namespace OpenSim.Region.CoreModules.World.Land
         {
 //            m_log.DebugFormat(
 //                "[PRIM COUNT MODULE]: GetPrimCounts for parcel {0} in {1}", parcelID, m_Scene.RegionInfo.RegionName);
-            
+
             PrimCounts primCounts;
 
             lock (m_PrimCounts)
@@ -267,7 +251,7 @@ namespace OpenSim.Region.CoreModules.World.Land
             return primCounts;
         }
 
-        
+
         /// <summary>
         /// Get the number of prims on the parcel that are owned by the parcel owner.
         /// </summary>
@@ -276,7 +260,7 @@ namespace OpenSim.Region.CoreModules.World.Land
         public int GetOwnerCount(UUID parcelID)
         {
             int count = 0;
-            
+
             lock (m_TaintLock)
             {
                 if (m_Tainted)
@@ -286,11 +270,11 @@ namespace OpenSim.Region.CoreModules.World.Land
                 if (m_ParcelCounts.TryGetValue(parcelID, out counts))
                     count = counts.Owner;
             }
-            
+
 //            m_log.DebugFormat(
-//                "[PRIM COUNT MODULE]: GetOwnerCount for parcel {0} in {1} returning {2}", 
+//                "[PRIM COUNT MODULE]: GetOwnerCount for parcel {0} in {1} returning {2}",
 //                parcelID, m_Scene.RegionInfo.RegionName, count);
-            
+
             return count;
         }
 
@@ -298,11 +282,11 @@ namespace OpenSim.Region.CoreModules.World.Land
         /// Get the number of prims on the parcel that have been set to the group that owns the parcel.
         /// </summary>
         /// <param name="parcelID"></param>
-        /// <returns></returns>        
+        /// <returns></returns>
         public int GetGroupCount(UUID parcelID)
         {
             int count = 0;
-            
+
             lock (m_TaintLock)
             {
                 if (m_Tainted)
@@ -312,11 +296,11 @@ namespace OpenSim.Region.CoreModules.World.Land
                 if (m_ParcelCounts.TryGetValue(parcelID, out counts))
                     count = counts.Group;
             }
-            
+
 //            m_log.DebugFormat(
-//                "[PRIM COUNT MODULE]: GetGroupCount for parcel {0} in {1} returning {2}", 
+//                "[PRIM COUNT MODULE]: GetGroupCount for parcel {0} in {1} returning {2}",
 //                parcelID, m_Scene.RegionInfo.RegionName, count);
-            
+
             return count;
         }
 
@@ -324,11 +308,11 @@ namespace OpenSim.Region.CoreModules.World.Land
         /// Get the number of prims on the parcel that are not owned by the parcel owner or set to the parcel group.
         /// </summary>
         /// <param name="parcelID"></param>
-        /// <returns></returns>                
+        /// <returns></returns>
         public int GetOthersCount(UUID parcelID)
         {
             int count = 0;
-            
+
             lock (m_TaintLock)
             {
                 if (m_Tainted)
@@ -338,23 +322,23 @@ namespace OpenSim.Region.CoreModules.World.Land
                 if (m_ParcelCounts.TryGetValue(parcelID, out counts))
                     count = counts.Others;
             }
-            
+
 //            m_log.DebugFormat(
-//                "[PRIM COUNT MODULE]: GetOthersCount for parcel {0} in {1} returning {2}", 
+//                "[PRIM COUNT MODULE]: GetOthersCount for parcel {0} in {1} returning {2}",
 //                parcelID, m_Scene.RegionInfo.RegionName, count);
-            
+
             return count;
         }
-        
+
         /// <summary>
         /// Get the number of selected prims.
         /// </summary>
         /// <param name="parcelID"></param>
-        /// <returns></returns>           
+        /// <returns></returns>
         public int GetSelectedCount(UUID parcelID)
         {
             int count = 0;
-            
+
             lock (m_TaintLock)
             {
                 if (m_Tainted)
@@ -364,24 +348,24 @@ namespace OpenSim.Region.CoreModules.World.Land
                 if (m_ParcelCounts.TryGetValue(parcelID, out counts))
                     count = counts.Selected;
             }
-            
+
 //            m_log.DebugFormat(
-//                "[PRIM COUNT MODULE]: GetSelectedCount for parcel {0} in {1} returning {2}", 
+//                "[PRIM COUNT MODULE]: GetSelectedCount for parcel {0} in {1} returning {2}",
 //                parcelID, m_Scene.RegionInfo.RegionName, count);
-            
+
             return count;
         }
-        
+
         /// <summary>
         /// Get the total count of owner, group and others prims on the parcel.
-        /// FIXME: Need to do selected prims once this is reimplemented.   
+        /// FIXME: Need to do selected prims once this is reimplemented.
         /// </summary>
         /// <param name="parcelID"></param>
         /// <returns></returns>
         public int GetTotalCount(UUID parcelID)
         {
             int count = 0;
-            
+
             lock (m_TaintLock)
             {
                 if (m_Tainted)
@@ -393,31 +377,30 @@ namespace OpenSim.Region.CoreModules.World.Land
                     count = counts.Owner;
                     count += counts.Group;
                     count += counts.Others;
-                    count += counts.Selected;
                 }
             }
-            
+
 //            m_log.DebugFormat(
-//                "[PRIM COUNT MODULE]: GetTotalCount for parcel {0} in {1} returning {2}", 
+//                "[PRIM COUNT MODULE]: GetTotalCount for parcel {0} in {1} returning {2}",
 //                parcelID, m_Scene.RegionInfo.RegionName, count);
-            
-            return count;            
+
+            return count;
         }
 
         /// <summary>
         /// Get the number of prims that are in the entire simulator for the owner of this parcel.
         /// </summary>
         /// <param name="parcelID"></param>
-        /// <returns></returns>              
+        /// <returns></returns>
         public int GetSimulatorCount(UUID parcelID)
         {
             int count = 0;
-            
+
             lock (m_TaintLock)
             {
                 if (m_Tainted)
                     Recount();
-                
+
                 UUID owner;
                 if (m_OwnerMap.TryGetValue(parcelID, out owner))
                 {
@@ -426,11 +409,11 @@ namespace OpenSim.Region.CoreModules.World.Land
                         count = val;
                 }
             }
-            
+
 //            m_log.DebugFormat(
-//                "[PRIM COUNT MODULE]: GetOthersCount for parcel {0} in {1} returning {2}", 
+//                "[PRIM COUNT MODULE]: GetOthersCount for parcel {0} in {1} returning {2}",
 //                parcelID, m_Scene.RegionInfo.RegionName, count);
-            
+
             return count;
         }
 
@@ -439,11 +422,11 @@ namespace OpenSim.Region.CoreModules.World.Land
         /// </summary>
         /// <param name="parcelID"></param>
         /// <param name="userID"></param>
-        /// <returns></returns>          
+        /// <returns></returns>
         public int GetUserCount(UUID parcelID, UUID userID)
         {
             int count = 0;
-            
+
             lock (m_TaintLock)
             {
                 if (m_Tainted)
@@ -459,9 +442,9 @@ namespace OpenSim.Region.CoreModules.World.Land
             }
 
 //            m_log.DebugFormat(
-//                "[PRIM COUNT MODULE]: GetUserCount for user {0} in parcel {1} in region {2} returning {3}", 
+//                "[PRIM COUNT MODULE]: GetUserCount for user {0} in parcel {1} in region {2} returning {3}",
 //                userID, parcelID, m_Scene.RegionInfo.RegionName, count);
-            
+
             return count;
         }
 
@@ -469,13 +452,13 @@ namespace OpenSim.Region.CoreModules.World.Land
         private void Recount()
         {
 //            m_log.DebugFormat("[PRIM COUNT MODULE]: Recounting prims on {0}", m_Scene.RegionInfo.RegionName);
-            
+
             m_OwnerMap.Clear();
             m_SimwideCounts.Clear();
             m_ParcelCounts.Clear();
 
             List<ILandObject> land = m_Scene.LandChannel.AllParcels();
-            
+
             foreach (ILandObject l in land)
             {
                 LandData landData = l.LandData;
@@ -483,7 +466,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                 m_OwnerMap[landData.GlobalID] = landData.OwnerID;
                 m_SimwideCounts[landData.OwnerID] = 0;
 //                m_log.DebugFormat(
-//                    "[PRIM COUNT MODULE]: Initializing parcel count for {0} on {1}", 
+//                    "[PRIM COUNT MODULE]: Initializing parcel count for {0} on {1}",
 //                    landData.Name, m_Scene.RegionInfo.RegionName);
                 m_ParcelCounts[landData.GlobalID] = new ParcelCounts();
             }
@@ -499,7 +482,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                         m_PrimCounts.Remove(k);
                 }
             }
-            
+
             m_Tainted = false;
         }
     }
@@ -541,7 +524,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                 return m_Parent.GetOthersCount(m_ParcelID);
             }
         }
-        
+
         public int Selected
         {
             get
@@ -549,7 +532,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                 return m_Parent.GetSelectedCount(m_ParcelID);
             }
         }
-        
+
         public int Total
         {
             get
@@ -597,4 +580,4 @@ namespace OpenSim.Region.CoreModules.World.Land
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/CoreModules/World/Land/Tests/LandManagementModuleTests.cs b/OpenSim/Region/CoreModules/World/Land/Tests/LandManagementModuleTests.cs
index 4ed67f3..d6a3ded 100644
--- a/OpenSim/Region/CoreModules/World/Land/Tests/LandManagementModuleTests.cs
+++ b/OpenSim/Region/CoreModules/World/Land/Tests/LandManagementModuleTests.cs
@@ -45,14 +45,14 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
             UUID userId = TestHelpers.ParseTail(0x1);
 
             LandManagementModule lmm = new LandManagementModule();
-            Scene scene = new SceneHelpers().SetupScene();            
-            SceneHelpers.SetupSceneModules(scene, lmm);             
-            
+            Scene scene = new SceneHelpers().SetupScene();
+            SceneHelpers.SetupSceneModules(scene, lmm);
+
             ILandObject lo = new LandObject(userId, false, scene);
             lo.LandData.Name = "lo1";
             lo.SetLandBitmap(
                 lo.GetSquareLandBitmap(0, 0, (int)Constants.RegionSize, (int)Constants.RegionSize));
-            lo = lmm.AddLandObject(lo);          
+            lo = lmm.AddLandObject(lo);
 
             // TODO: Should add asserts to check that land object was added properly.
 
@@ -67,7 +67,7 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
             {
                 ILandObject loAtCoord = lmm.GetLandObject(0, 0);
                 Assert.That(loAtCoord.LandData.LocalID, Is.EqualTo(lo.LandData.LocalID));
-                Assert.That(loAtCoord.LandData.GlobalID, Is.EqualTo(lo.LandData.GlobalID));                          
+                Assert.That(loAtCoord.LandData.GlobalID, Is.EqualTo(lo.LandData.GlobalID));
             }
 
             {
@@ -88,8 +88,8 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
 
             SceneHelpers sh = new SceneHelpers();
             LandManagementModule lmm = new LandManagementModule();
-            Scene scene = sh.SetupScene();            
-            SceneHelpers.SetupSceneModules(scene, lmm);   
+            Scene scene = sh.SetupScene();
+            SceneHelpers.SetupSceneModules(scene, lmm);
 
             scene.loadAllLandObjectsFromStorage(scene.RegionInfo.RegionID);
 
@@ -115,8 +115,8 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
 
             SceneHelpers sh = new SceneHelpers();
             LandManagementModule lmm = new LandManagementModule();
-            Scene scene = sh.SetupScene();            
-            SceneHelpers.SetupSceneModules(scene, lmm);   
+            Scene scene = sh.SetupScene();
+            SceneHelpers.SetupSceneModules(scene, lmm);
 
             ILandObject originalLo1 = new LandObject(userId, false, scene);
             originalLo1.LandData.Name = "lo1";
@@ -149,8 +149,8 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
 
             SceneHelpers sh = new SceneHelpers();
             LandManagementModule lmm = new LandManagementModule();
-            Scene scene = sh.SetupScene();            
-            SceneHelpers.SetupSceneModules(scene, lmm);   
+            Scene scene = sh.SetupScene();
+            SceneHelpers.SetupSceneModules(scene, lmm);
 
             ILandObject originalLo1 = new LandObject(userId, false, scene);
             originalLo1.LandData.Name = "lo1";
@@ -173,7 +173,7 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
             Assert.That(loAtCoord1.LandData.Name, Is.EqualTo(originalLo1.LandData.Name));
             Assert.That(loAtCoord1.LandData.GlobalID, Is.EqualTo(originalLo1.LandData.GlobalID));
 
-            ILandObject loAtCoord2 
+            ILandObject loAtCoord2
                 = lmm.GetLandObject((int)Constants.RegionSize - 1, (((int)Constants.RegionSize / 4) * 3) - 1);
             Assert.That(loAtCoord2.LandData.Name, Is.EqualTo(originalLo2.LandData.Name));
             Assert.That(loAtCoord2.LandData.GlobalID, Is.EqualTo(originalLo2.LandData.GlobalID));
@@ -198,8 +198,8 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
 
             SceneHelpers sh = new SceneHelpers();
             LandManagementModule lmm = new LandManagementModule();
-            Scene scene = sh.SetupScene();            
-            SceneHelpers.SetupSceneModules(scene, lmm);   
+            Scene scene = sh.SetupScene();
+            SceneHelpers.SetupSceneModules(scene, lmm);
 
             ILandObject originalLo1 = new LandObject(userId, false, scene);
             originalLo1.LandData.Name = "lo1";
@@ -220,7 +220,7 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
             {
                 ILandObject loAtCoord = lmm.GetLandObject(0, 0);
                 Assert.That(loAtCoord.LandData.Name, Is.EqualTo(originalLo1.LandData.Name));
-                Assert.That(loAtCoord.LandData.GlobalID, Is.EqualTo(originalLo1.LandData.GlobalID));                          
+                Assert.That(loAtCoord.LandData.GlobalID, Is.EqualTo(originalLo1.LandData.GlobalID));
             }
 
             {
@@ -239,21 +239,21 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
             UUID userId = TestHelpers.ParseTail(0x1);
 
             LandManagementModule lmm = new LandManagementModule();
-            Scene scene = new SceneHelpers().SetupScene();            
-            SceneHelpers.SetupSceneModules(scene, lmm);             
-            
+            Scene scene = new SceneHelpers().SetupScene();
+            SceneHelpers.SetupSceneModules(scene, lmm);
+
             ILandObject lo = new LandObject(userId, false, scene);
             lo.LandData.Name = "lo1";
             lo.SetLandBitmap(
                 lo.GetSquareLandBitmap(0, 0, (int)Constants.RegionSize, (int)Constants.RegionSize));
-            lo = lmm.AddLandObject(lo);          
+            lo = lmm.AddLandObject(lo);
 
             lmm.Subdivide(0, 0, LandManagementModule.LandUnit, LandManagementModule.LandUnit, userId);
 
             {
                 ILandObject loAtCoord = lmm.GetLandObject(0, 0);
                 Assert.That(loAtCoord.LandData.LocalID, Is.Not.EqualTo(lo.LandData.LocalID));
-                Assert.That(loAtCoord.LandData.GlobalID, Is.Not.EqualTo(lo.LandData.GlobalID));                          
+                Assert.That(loAtCoord.LandData.GlobalID, Is.Not.EqualTo(lo.LandData.GlobalID));
             }
 
             {
diff --git a/OpenSim/Region/CoreModules/World/Land/Tests/PrimCountModuleTests.cs b/OpenSim/Region/CoreModules/World/Land/Tests/PrimCountModuleTests.cs
index 949acb6..a349aa1 100644
--- a/OpenSim/Region/CoreModules/World/Land/Tests/PrimCountModuleTests.cs
+++ b/OpenSim/Region/CoreModules/World/Land/Tests/PrimCountModuleTests.cs
@@ -43,21 +43,21 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
     public class PrimCountModuleTests : OpenSimTestCase
     {
         protected UUID m_userId = new UUID("00000000-0000-0000-0000-100000000000");
-        protected UUID m_groupId = new UUID("00000000-0000-0000-8888-000000000000");        
-        protected UUID m_otherUserId = new UUID("99999999-9999-9999-9999-999999999999");        
+        protected UUID m_groupId = new UUID("00000000-0000-0000-8888-000000000000");
+        protected UUID m_otherUserId = new UUID("99999999-9999-9999-9999-999999999999");
         protected TestScene m_scene;
         protected PrimCountModule m_pcm;
-        
+
         /// <summary>
         /// A parcel that covers the entire sim except for a 1 unit wide strip on the eastern side.
         /// </summary>
         protected ILandObject m_lo;
-        
+
         /// <summary>
         /// A parcel that covers just the eastern strip of the sim.
         /// </summary>
-        protected ILandObject m_lo2;        
-            
+        protected ILandObject m_lo2;
+
         [SetUp]
         public override void SetUp()
         {
@@ -65,24 +65,24 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
 
             m_pcm = new PrimCountModule();
             LandManagementModule lmm = new LandManagementModule();
-            m_scene = new SceneHelpers().SetupScene();            
-            SceneHelpers.SetupSceneModules(m_scene, lmm, m_pcm);             
-                        
+            m_scene = new SceneHelpers().SetupScene();
+            SceneHelpers.SetupSceneModules(m_scene, lmm, m_pcm);
+
             int xParcelDivider = (int)Constants.RegionSize - 1;
-            
+
             ILandObject lo = new LandObject(m_userId, false, m_scene);
             lo.LandData.Name = "m_lo";
             lo.SetLandBitmap(
                 lo.GetSquareLandBitmap(0, 0, xParcelDivider, (int)Constants.RegionSize));
-            m_lo = lmm.AddLandObject(lo);          
-            
+            m_lo = lmm.AddLandObject(lo);
+
             ILandObject lo2 = new LandObject(m_userId, false, m_scene);
             lo2.SetLandBitmap(
                 lo2.GetSquareLandBitmap(xParcelDivider, 0, (int)Constants.RegionSize, (int)Constants.RegionSize));
             lo2.LandData.Name = "m_lo2";
             m_lo2 = lmm.AddLandObject(lo2);
-        } 
-        
+        }
+
         /// <summary>
         /// Test that counts before we do anything are correct.
         /// </summary>
@@ -90,7 +90,7 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
         public void TestInitialCounts()
         {
             IPrimCounts pc = m_lo.PrimCounts;
-            
+
             Assert.That(pc.Owner, Is.EqualTo(0));
             Assert.That(pc.Group, Is.EqualTo(0));
             Assert.That(pc.Others, Is.EqualTo(0));
@@ -98,9 +98,9 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
             Assert.That(pc.Selected, Is.EqualTo(0));
             Assert.That(pc.Users[m_userId], Is.EqualTo(0));
             Assert.That(pc.Users[m_otherUserId], Is.EqualTo(0));
-            Assert.That(pc.Simulator, Is.EqualTo(0));              
-        }            
-        
+            Assert.That(pc.Simulator, Is.EqualTo(0));
+        }
+
         /// <summary>
         /// Test count after a parcel owner owned object is added.
         /// </summary>
@@ -108,13 +108,13 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
         public void TestAddOwnerObject()
         {
             TestHelpers.InMethod();
-//            log4net.Config.XmlConfigurator.Configure();                                  
-                  
-            IPrimCounts pc = m_lo.PrimCounts;         
-            
-            SceneObjectGroup sog = SceneHelpers.CreateSceneObject(3, m_userId, "a", 0x01);             
+//            log4net.Config.XmlConfigurator.Configure();
+
+            IPrimCounts pc = m_lo.PrimCounts;
+
+            SceneObjectGroup sog = SceneHelpers.CreateSceneObject(3, m_userId, "a", 0x01);
             m_scene.AddNewSceneObject(sog, false);
-            
+
             Assert.That(pc.Owner, Is.EqualTo(3));
             Assert.That(pc.Group, Is.EqualTo(0));
             Assert.That(pc.Others, Is.EqualTo(0));
@@ -122,12 +122,12 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
             Assert.That(pc.Selected, Is.EqualTo(0));
             Assert.That(pc.Users[m_userId], Is.EqualTo(3));
             Assert.That(pc.Users[m_otherUserId], Is.EqualTo(0));
-            Assert.That(pc.Simulator, Is.EqualTo(3));            
-            
+            Assert.That(pc.Simulator, Is.EqualTo(3));
+
             // Add a second object and retest
-            SceneObjectGroup sog2 = SceneHelpers.CreateSceneObject(2, m_userId, "b", 0x10);             
-            m_scene.AddNewSceneObject(sog2, false);   
-            
+            SceneObjectGroup sog2 = SceneHelpers.CreateSceneObject(2, m_userId, "b", 0x10);
+            m_scene.AddNewSceneObject(sog2, false);
+
             Assert.That(pc.Owner, Is.EqualTo(5));
             Assert.That(pc.Group, Is.EqualTo(0));
             Assert.That(pc.Others, Is.EqualTo(0));
@@ -135,9 +135,9 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
             Assert.That(pc.Selected, Is.EqualTo(0));
             Assert.That(pc.Users[m_userId], Is.EqualTo(5));
             Assert.That(pc.Users[m_otherUserId], Is.EqualTo(0));
-            Assert.That(pc.Simulator, Is.EqualTo(5));              
+            Assert.That(pc.Simulator, Is.EqualTo(5));
         }
-        
+
         /// <summary>
         /// Test count after a parcel owner owned copied object is added.
         /// </summary>
@@ -145,14 +145,14 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
         public void TestCopyOwnerObject()
         {
             TestHelpers.InMethod();
-//            log4net.Config.XmlConfigurator.Configure();                                  
-                  
+//            log4net.Config.XmlConfigurator.Configure();
+
             IPrimCounts pc = m_lo.PrimCounts;
-            
-            SceneObjectGroup sog = SceneHelpers.CreateSceneObject(3, m_userId, "a", 0x01);             
+
+            SceneObjectGroup sog = SceneHelpers.CreateSceneObject(3, m_userId, "a", 0x01);
             m_scene.AddNewSceneObject(sog, false);
-            m_scene.SceneGraph.DuplicateObject(sog.LocalId, Vector3.Zero, 0, m_userId, UUID.Zero, Quaternion.Identity); 
-            
+            m_scene.SceneGraph.DuplicateObject(sog.LocalId, Vector3.Zero, m_userId, UUID.Zero, Quaternion.Identity, false);
+
             Assert.That(pc.Owner, Is.EqualTo(6));
             Assert.That(pc.Group, Is.EqualTo(0));
             Assert.That(pc.Others, Is.EqualTo(0));
@@ -160,9 +160,9 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
             Assert.That(pc.Selected, Is.EqualTo(0));
             Assert.That(pc.Users[m_userId], Is.EqualTo(6));
             Assert.That(pc.Users[m_otherUserId], Is.EqualTo(0));
-            Assert.That(pc.Simulator, Is.EqualTo(6));              
-        }     
-        
+            Assert.That(pc.Simulator, Is.EqualTo(6));
+        }
+
         /// <summary>
         /// Test that parcel counts update correctly when an object is moved between parcels, where that movement
         /// is not done directly by the user/
@@ -171,18 +171,18 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
         public void TestMoveOwnerObject()
         {
             TestHelpers.InMethod();
-//            log4net.Config.XmlConfigurator.Configure();                                  
-                                          
-            SceneObjectGroup sog = SceneHelpers.CreateSceneObject(3, m_userId, "a", 0x01);             
+//            log4net.Config.XmlConfigurator.Configure();
+
+            SceneObjectGroup sog = SceneHelpers.CreateSceneObject(3, m_userId, "a", 0x01);
             m_scene.AddNewSceneObject(sog, false);
-            SceneObjectGroup sog2 = SceneHelpers.CreateSceneObject(2, m_userId, "b", 0x10);             
-            m_scene.AddNewSceneObject(sog2, false);   
-            
-            // Move the first scene object to the eastern strip parcel           
+            SceneObjectGroup sog2 = SceneHelpers.CreateSceneObject(2, m_userId, "b", 0x10);
+            m_scene.AddNewSceneObject(sog2, false);
+
+            // Move the first scene object to the eastern strip parcel
             sog.AbsolutePosition = new Vector3(254, 2, 2);
-            
-            IPrimCounts pclo1 = m_lo.PrimCounts;         
-            
+
+            IPrimCounts pclo1 = m_lo.PrimCounts;
+
             Assert.That(pclo1.Owner, Is.EqualTo(2));
             Assert.That(pclo1.Group, Is.EqualTo(0));
             Assert.That(pclo1.Others, Is.EqualTo(0));
@@ -190,10 +190,10 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
             Assert.That(pclo1.Selected, Is.EqualTo(0));
             Assert.That(pclo1.Users[m_userId], Is.EqualTo(2));
             Assert.That(pclo1.Users[m_otherUserId], Is.EqualTo(0));
-            Assert.That(pclo1.Simulator, Is.EqualTo(5));                
-            
-            IPrimCounts pclo2 = m_lo2.PrimCounts;         
-            
+            Assert.That(pclo1.Simulator, Is.EqualTo(5));
+
+            IPrimCounts pclo2 = m_lo2.PrimCounts;
+
             Assert.That(pclo2.Owner, Is.EqualTo(3));
             Assert.That(pclo2.Group, Is.EqualTo(0));
             Assert.That(pclo2.Others, Is.EqualTo(0));
@@ -201,11 +201,11 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
             Assert.That(pclo2.Selected, Is.EqualTo(0));
             Assert.That(pclo2.Users[m_userId], Is.EqualTo(3));
             Assert.That(pclo2.Users[m_otherUserId], Is.EqualTo(0));
-            Assert.That(pclo2.Simulator, Is.EqualTo(5)); 
-            
+            Assert.That(pclo2.Simulator, Is.EqualTo(5));
+
             // Now move it back again
-            sog.AbsolutePosition = new Vector3(2, 2, 2);   
-            
+            sog.AbsolutePosition = new Vector3(2, 2, 2);
+
             Assert.That(pclo1.Owner, Is.EqualTo(5));
             Assert.That(pclo1.Group, Is.EqualTo(0));
             Assert.That(pclo1.Others, Is.EqualTo(0));
@@ -213,8 +213,8 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
             Assert.That(pclo1.Selected, Is.EqualTo(0));
             Assert.That(pclo1.Users[m_userId], Is.EqualTo(5));
             Assert.That(pclo1.Users[m_otherUserId], Is.EqualTo(0));
-            Assert.That(pclo1.Simulator, Is.EqualTo(5));              
-            
+            Assert.That(pclo1.Simulator, Is.EqualTo(5));
+
             Assert.That(pclo2.Owner, Is.EqualTo(0));
             Assert.That(pclo2.Group, Is.EqualTo(0));
             Assert.That(pclo2.Others, Is.EqualTo(0));
@@ -222,9 +222,9 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
             Assert.That(pclo2.Selected, Is.EqualTo(0));
             Assert.That(pclo2.Users[m_userId], Is.EqualTo(0));
             Assert.That(pclo2.Users[m_otherUserId], Is.EqualTo(0));
-            Assert.That(pclo2.Simulator, Is.EqualTo(5));             
+            Assert.That(pclo2.Simulator, Is.EqualTo(5));
         }
-        
+
         /// <summary>
         /// Test count after a parcel owner owned object is removed.
         /// </summary>
@@ -233,14 +233,14 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
         {
             TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
-            
+
             IPrimCounts pc = m_lo.PrimCounts;
-            
+
             m_scene.AddNewSceneObject(SceneHelpers.CreateSceneObject(1, m_userId, "a", 0x1), false);
             SceneObjectGroup sogToDelete = SceneHelpers.CreateSceneObject(3, m_userId, "b", 0x10);
-            m_scene.AddNewSceneObject(sogToDelete, false);            
+            m_scene.AddNewSceneObject(sogToDelete, false);
             m_scene.DeleteSceneObject(sogToDelete, false);
-            
+
             Assert.That(pc.Owner, Is.EqualTo(1));
             Assert.That(pc.Group, Is.EqualTo(0));
             Assert.That(pc.Others, Is.EqualTo(0));
@@ -248,37 +248,37 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
             Assert.That(pc.Selected, Is.EqualTo(0));
             Assert.That(pc.Users[m_userId], Is.EqualTo(1));
             Assert.That(pc.Users[m_otherUserId], Is.EqualTo(0));
-            Assert.That(pc.Simulator, Is.EqualTo(1));            
-        } 
-        
+            Assert.That(pc.Simulator, Is.EqualTo(1));
+        }
+
         [Test]
         public void TestAddGroupObject()
         {
             TestHelpers.InMethod();
-//            log4net.Config.XmlConfigurator.Configure();                                  
-            
+//            log4net.Config.XmlConfigurator.Configure();
+
             m_lo.DeedToGroup(m_groupId);
-                  
-            IPrimCounts pc = m_lo.PrimCounts;       
-            
-            SceneObjectGroup sog = SceneHelpers.CreateSceneObject(3, m_otherUserId, "a", 0x01);             
+
+            IPrimCounts pc = m_lo.PrimCounts;
+
+            SceneObjectGroup sog = SceneHelpers.CreateSceneObject(3, m_otherUserId, "a", 0x01);
             sog.GroupID = m_groupId;
             m_scene.AddNewSceneObject(sog, false);
-            
+
             Assert.That(pc.Owner, Is.EqualTo(0));
             Assert.That(pc.Group, Is.EqualTo(3));
             Assert.That(pc.Others, Is.EqualTo(0));
             Assert.That(pc.Total, Is.EqualTo(3));
             Assert.That(pc.Selected, Is.EqualTo(0));
-            
+
             // Is this desired behaviour?  Not totally sure.
             Assert.That(pc.Users[m_userId], Is.EqualTo(0));
             Assert.That(pc.Users[m_groupId], Is.EqualTo(0));
             Assert.That(pc.Users[m_otherUserId], Is.EqualTo(3));
-            
-            Assert.That(pc.Simulator, Is.EqualTo(3));             
+
+            Assert.That(pc.Simulator, Is.EqualTo(3));
         }
-        
+
         /// <summary>
         /// Test count after a parcel owner owned object is removed.
         /// </summary>
@@ -287,19 +287,19 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
         {
             TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
-            
+
             m_lo.DeedToGroup(m_groupId);
-            
+
             IPrimCounts pc = m_lo.PrimCounts;
-            
+
             SceneObjectGroup sogToKeep = SceneHelpers.CreateSceneObject(1, m_userId, "a", 0x1);
-            sogToKeep.GroupID = m_groupId;            
+            sogToKeep.GroupID = m_groupId;
             m_scene.AddNewSceneObject(sogToKeep, false);
-            
+
             SceneObjectGroup sogToDelete = SceneHelpers.CreateSceneObject(3, m_userId, "b", 0x10);
-            m_scene.AddNewSceneObject(sogToDelete, false);            
+            m_scene.AddNewSceneObject(sogToDelete, false);
             m_scene.DeleteSceneObject(sogToDelete, false);
-            
+
             Assert.That(pc.Owner, Is.EqualTo(0));
             Assert.That(pc.Group, Is.EqualTo(1));
             Assert.That(pc.Others, Is.EqualTo(0));
@@ -308,20 +308,20 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
             Assert.That(pc.Users[m_userId], Is.EqualTo(1));
             Assert.That(pc.Users[m_groupId], Is.EqualTo(0));
             Assert.That(pc.Users[m_otherUserId], Is.EqualTo(0));
-            Assert.That(pc.Simulator, Is.EqualTo(1));            
-        }        
-        
-        [Test]        
+            Assert.That(pc.Simulator, Is.EqualTo(1));
+        }
+
+        [Test]
         public void TestAddOthersObject()
         {
             TestHelpers.InMethod();
-//            log4net.Config.XmlConfigurator.Configure();                                  
-                  
-            IPrimCounts pc = m_lo.PrimCounts;       
-            
-            SceneObjectGroup sog = SceneHelpers.CreateSceneObject(3, m_otherUserId, "a", 0x01);             
+//            log4net.Config.XmlConfigurator.Configure();
+
+            IPrimCounts pc = m_lo.PrimCounts;
+
+            SceneObjectGroup sog = SceneHelpers.CreateSceneObject(3, m_otherUserId, "a", 0x01);
             m_scene.AddNewSceneObject(sog, false);
-            
+
             Assert.That(pc.Owner, Is.EqualTo(0));
             Assert.That(pc.Group, Is.EqualTo(0));
             Assert.That(pc.Others, Is.EqualTo(3));
@@ -329,22 +329,22 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
             Assert.That(pc.Selected, Is.EqualTo(0));
             Assert.That(pc.Users[m_userId], Is.EqualTo(0));
             Assert.That(pc.Users[m_otherUserId], Is.EqualTo(3));
-            Assert.That(pc.Simulator, Is.EqualTo(3));                          
+            Assert.That(pc.Simulator, Is.EqualTo(3));
         }
-        
+
         [Test]
         public void TestRemoveOthersObject()
         {
             TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
-            
+
             IPrimCounts pc = m_lo.PrimCounts;
-            
+
             m_scene.AddNewSceneObject(SceneHelpers.CreateSceneObject(1, m_otherUserId, "a", 0x1), false);
             SceneObjectGroup sogToDelete = SceneHelpers.CreateSceneObject(3, m_otherUserId, "b", 0x10);
-            m_scene.AddNewSceneObject(sogToDelete, false);            
+            m_scene.AddNewSceneObject(sogToDelete, false);
             m_scene.DeleteSceneObject(sogToDelete, false);
-            
+
             Assert.That(pc.Owner, Is.EqualTo(0));
             Assert.That(pc.Group, Is.EqualTo(0));
             Assert.That(pc.Others, Is.EqualTo(1));
@@ -352,9 +352,9 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
             Assert.That(pc.Selected, Is.EqualTo(0));
             Assert.That(pc.Users[m_userId], Is.EqualTo(0));
             Assert.That(pc.Users[m_otherUserId], Is.EqualTo(1));
-            Assert.That(pc.Simulator, Is.EqualTo(1));            
-        }           
-        
+            Assert.That(pc.Simulator, Is.EqualTo(1));
+        }
+
         /// <summary>
         /// Test the count is correct after is has been tainted.
         /// </summary>
@@ -363,12 +363,12 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
         {
             TestHelpers.InMethod();
             IPrimCounts pc = m_lo.PrimCounts;
-            
-            SceneObjectGroup sog = SceneHelpers.CreateSceneObject(3, m_userId, "a", 0x01);             
-            m_scene.AddNewSceneObject(sog, false); 
-            
+
+            SceneObjectGroup sog = SceneHelpers.CreateSceneObject(3, m_userId, "a", 0x01);
+            m_scene.AddNewSceneObject(sog, false);
+
             m_pcm.TaintPrimCount();
-            
+
             Assert.That(pc.Owner, Is.EqualTo(3));
             Assert.That(pc.Group, Is.EqualTo(0));
             Assert.That(pc.Others, Is.EqualTo(0));
@@ -376,7 +376,7 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
             Assert.That(pc.Selected, Is.EqualTo(0));
             Assert.That(pc.Users[m_userId], Is.EqualTo(3));
             Assert.That(pc.Users[m_otherUserId], Is.EqualTo(0));
-            Assert.That(pc.Simulator, Is.EqualTo(3));              
+            Assert.That(pc.Simulator, Is.EqualTo(3));
         }
     }
 }
\ 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..1e63662 100644
--- a/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs
+++ b/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs
@@ -73,6 +73,10 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
 
         #region IMapImageGenerator Members
 
+        public Bitmap CreateMapTileForce()
+        {
+            return CreateMapTile();
+        }
         public Bitmap CreateMapTile()
         {
             bool drawPrimVolume = true;
@@ -82,11 +86,11 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
 
             string[] configSections = new string[] { "Map", "Startup" };
 
-            drawPrimVolume 
+            drawPrimVolume
                 = Util.GetConfigVarFromSections<bool>(m_config, "DrawPrimOnMapTile", configSections, drawPrimVolume);
-            textureTerrain 
+            textureTerrain
                 = Util.GetConfigVarFromSections<bool>(m_config, "TextureOnMapTile", configSections, textureTerrain);
-            generateMaptiles 
+            generateMaptiles
                 = Util.GetConfigVarFromSections<bool>(m_config, "GenerateMaptiles", configSections, generateMaptiles);
 
             if (generateMaptiles)
@@ -112,7 +116,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);
@@ -127,15 +130,15 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
                     catch (Exception)
                     {
                         m_log.ErrorFormat(
-                            "[MAPTILE]: Failed to load Static map image texture file: {0} for {1}", 
+                            "[MAPTILE]: Failed to load Static map image texture file: {0} for {1}",
                             m_scene.RegionInfo.MaptileStaticFile, m_scene.Name);
                         //mapbmp = new Bitmap((int)m_scene.Heightmap.Width, (int)m_scene.Heightmap.Height, System.Drawing.Imaging.PixelFormat.Format24bppRgb);
                         mapbmp = null;
                     }
 
-                    if (mapbmp != null) 
+                    if (mapbmp != null)
                         m_log.DebugFormat(
-                            "[MAPTILE]: Static map image texture file {0} found for {1}", 
+                            "[MAPTILE]: Static map image texture file {0} found for {1}",
                             m_scene.RegionInfo.MaptileStaticFile, m_scene.Name);
                 }
             }
@@ -309,7 +312,7 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
             List<uint> z_localIDs = new List<uint>();
             Dictionary<uint, DrawStruct> z_sort = new Dictionary<uint, DrawStruct>();
 
-            try 
+            try
             {
                 lock (objs)
                 {
@@ -383,7 +386,7 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
 
                                     Vector3 pos = part.GetWorldPosition();
 
-                                    // skip prim outside of retion
+                                    // skip prim outside of region
                                     if (!m_scene.PositionIsInCurrentRegion(pos))
                                         continue;
 
@@ -407,12 +410,13 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
                                     {
                                         // Translate scale by rotation so scale is represented properly when object is rotated
                                         Vector3 lscale = new Vector3(part.Shape.Scale.X, part.Shape.Scale.Y, part.Shape.Scale.Z);
+                                        lscale *= 0.5f;
+
                                         Vector3 scale = new Vector3();
                                         Vector3 tScale = new Vector3();
                                         Vector3 axPos = new Vector3(pos.X, pos.Y, pos.Z);
 
-                                        Quaternion llrot = part.GetWorldRotation();
-                                        Quaternion rot = new Quaternion(llrot.W, llrot.X, llrot.Y, llrot.Z);
+                                        Quaternion rot = part.GetWorldRotation();
                                         scale = lscale * rot;
 
                                         // negative scales don't work in this situation
@@ -471,7 +475,6 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
 
                                         tScale = new Vector3(lscale.X, -lscale.Y, -lscale.Z);
                                         scale = ((tScale * rot));
-
                                         vertexes[2] = (new Vector3((pos.X + scale.X), (pos.Y + scale.Y), (pos.Z + scale.Z)));
 
                                         //vertexes[2].x = pos.X + vertexes[2].x;
diff --git a/OpenSim/Region/CoreModules/World/LegacyMap/ShadedMapTileRenderer.cs b/OpenSim/Region/CoreModules/World/LegacyMap/ShadedMapTileRenderer.cs
index 708286c..0b37179 100644
--- a/OpenSim/Region/CoreModules/World/LegacyMap/ShadedMapTileRenderer.cs
+++ b/OpenSim/Region/CoreModules/World/LegacyMap/ShadedMapTileRenderer.cs
@@ -38,18 +38,20 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
 {
     public class ShadedMapTileRenderer : IMapTileTerrainRenderer
     {
-        private static readonly Color WATER_COLOR = Color.FromArgb(29, 71, 95);
-
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         private static readonly string LogHeader = "[SHADED MAPTILE RENDERER]";
 
         private Scene m_scene;
-        //private IConfigSource m_config; // not used currently
+        private IConfigSource m_config;
+        private Color m_color_water;
 
         public void Initialise(Scene scene, IConfigSource config)
         {
             m_scene = scene;
-            // m_config = config; // not used currently
+            m_config = config;
+
+            string[] configSections = new string[] { "Map", "Startup" };
+            m_color_water = System.Drawing.ColorTranslator.FromHtml(Util.GetConfigVarFromSections<string>(m_config, "MapColorWater", configSections, "#1D475F"));
         }
 
         public void TerrainToBitmap(Bitmap mapbmp)
@@ -231,7 +233,7 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
 
                         try
                         {
-                            mapbmp.SetPixel(x, yr, WATER_COLOR);
+                            mapbmp.SetPixel(x, yr, m_color_water);
                         }
                         catch (ArgumentException)
                         {
diff --git a/OpenSim/Region/CoreModules/World/LegacyMap/TexturedMapTileRenderer.cs b/OpenSim/Region/CoreModules/World/LegacyMap/TexturedMapTileRenderer.cs
index 9f23141..c71f5c0 100644
--- a/OpenSim/Region/CoreModules/World/LegacyMap/TexturedMapTileRenderer.cs
+++ b/OpenSim/Region/CoreModules/World/LegacyMap/TexturedMapTileRenderer.cs
@@ -130,21 +130,19 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
         // some hardcoded terrain UUIDs that work with SL 1.20 (the four default textures and "Blank").
         // The color-values were choosen because they "look right" (at least to me) ;-)
         private static readonly UUID defaultTerrainTexture1 = new UUID("0bc58228-74a0-7e83-89bc-5c23464bcec5");
-        private static readonly Color defaultColor1 = Color.FromArgb(165, 137, 118);
         private static readonly UUID defaultTerrainTexture2 = new UUID("63338ede-0037-c4fd-855b-015d77112fc8");
-        private static readonly Color defaultColor2 = Color.FromArgb(69, 89, 49);
         private static readonly UUID defaultTerrainTexture3 = new UUID("303cd381-8560-7579-23f1-f0a880799740");
-        private static readonly Color defaultColor3 = Color.FromArgb(162, 154, 141);
         private static readonly UUID defaultTerrainTexture4 = new UUID("53a2f406-4895-1d13-d541-d2e3b86bc19c");
-        private static readonly Color defaultColor4 = Color.FromArgb(200, 200, 200);
-
-        private static readonly Color WATER_COLOR = Color.FromArgb(29, 71, 95);
 
         #endregion
 
-
         private Scene m_scene;
-        // private IConfigSource m_config; // not used currently
+        private IConfigSource m_config;
+        private Color m_color_water;
+        private Color m_color_1;
+        private Color m_color_2;
+        private Color m_color_3;
+        private Color m_color_4;
 
         // mapping from texture UUIDs to averaged color. This will contain 5-9 values, in general; new values are only
         // added when the terrain textures are changed in the estate dialog and a new map is generated (and will stay in
@@ -156,12 +154,21 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
         public void Initialise(Scene scene, IConfigSource source)
         {
             m_scene = scene;
-            // m_config = source; // not used currently
+            m_config = source;
+
+            string[] configSections = new string[] { "Map", "Startup" };
+            
+            m_color_water = System.Drawing.ColorTranslator.FromHtml(Util.GetConfigVarFromSections<string>(m_config, "MapColorWater", configSections, "#1D475F"));
+            m_color_1 = System.Drawing.ColorTranslator.FromHtml(Util.GetConfigVarFromSections<string>(m_config, "MapColor1", configSections, "#A58976"));
+            m_color_2 = System.Drawing.ColorTranslator.FromHtml(Util.GetConfigVarFromSections<string>(m_config, "MapColor2", configSections, "#455931"));
+            m_color_3 = System.Drawing.ColorTranslator.FromHtml(Util.GetConfigVarFromSections<string>(m_config, "MapColor3", configSections, "#A29A8D"));
+            m_color_4 = System.Drawing.ColorTranslator.FromHtml(Util.GetConfigVarFromSections<string>(m_config, "MapColor4", configSections, "#C8C8C8"));
+
             m_mapping = new Dictionary<UUID,Color>();
-            m_mapping.Add(defaultTerrainTexture1, defaultColor1);
-            m_mapping.Add(defaultTerrainTexture2, defaultColor2);
-            m_mapping.Add(defaultTerrainTexture3, defaultColor3);
-            m_mapping.Add(defaultTerrainTexture4, defaultColor4);
+            m_mapping.Add(defaultTerrainTexture1, m_color_1);
+            m_mapping.Add(defaultTerrainTexture2, m_color_2);
+            m_mapping.Add(defaultTerrainTexture3, m_color_3);
+            m_mapping.Add(defaultTerrainTexture4, m_color_4);
             m_mapping.Add(Util.BLANK_TEXTURE_UUID, Color.White);
         }
 
@@ -180,7 +187,7 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
 
             ManagedImage managedImage;
             Image image;
-            
+
             try
             {
                 if (OpenJPEG.DecodeToImage(asset.Data, out managedImage, out image))
@@ -201,7 +208,7 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
                 m_log.ErrorFormat("{0} OpenJpeg was unable to encode this.   Asset Data is empty for {1}", LogHeader, id);
             }
             return null;
-            
+
         }
 
         // Compute the average color of a texture.
@@ -288,7 +295,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
@@ -298,10 +305,10 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
             RegionSettings settings = m_scene.RegionInfo.RegionSettings;
 
             // the four terrain colors as HSVs for interpolation
-            HSV hsv1 = new HSV(computeAverageColor(settings.TerrainTexture1, defaultColor1));
-            HSV hsv2 = new HSV(computeAverageColor(settings.TerrainTexture2, defaultColor2));
-            HSV hsv3 = new HSV(computeAverageColor(settings.TerrainTexture3, defaultColor3));
-            HSV hsv4 = new HSV(computeAverageColor(settings.TerrainTexture4, defaultColor4));
+            HSV hsv1 = new HSV(computeAverageColor(settings.TerrainTexture1, m_color_1));
+            HSV hsv2 = new HSV(computeAverageColor(settings.TerrainTexture2, m_color_2));
+            HSV hsv3 = new HSV(computeAverageColor(settings.TerrainTexture3, m_color_3));
+            HSV hsv4 = new HSV(computeAverageColor(settings.TerrainTexture4, m_color_4));
 
             float levelNElow = (float)settings.Elevation1NE;
             float levelNEhigh = (float)settings.Elevation2NE;
@@ -371,8 +378,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);
                         }
 
@@ -417,7 +424,7 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
 
                         heightvalue = 100f - (heightvalue * 100f) / 19f;  // 0 - 19 => 100 - 0
 
-                        mapbmp.SetPixel(x, yr, WATER_COLOR);
+                        mapbmp.SetPixel(x, yr, m_color_water);
                     }
                 }
             }
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/Media/Moap/MoapModule.cs b/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs
index 46b0470..f5aa40a 100644
--- a/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs
+++ b/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs
@@ -56,7 +56,7 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap
     public class MoapModule : INonSharedRegionModule, IMoapModule
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
+
         public string Name { get { return "MoapModule"; } }
         public Type ReplaceableInterface { get { return null; } }
 
@@ -64,33 +64,33 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap
         /// Is this module enabled?
         /// </summary>
         protected bool m_isEnabled = true;
-        
+
         /// <summary>
         /// The scene to which this module is attached
         /// </summary>
         protected Scene m_scene;
-        
+
         /// <summary>
         /// Track the ObjectMedia capabilities given to users keyed by path
         /// </summary>
         protected Dictionary<string, UUID> m_omCapUsers = new Dictionary<string, UUID>();
-        
+
         /// <summary>
         /// Track the ObjectMedia capabilities given to users keyed by agent.  Lock m_omCapUsers to manipulate.
         /// </summary>
         protected Dictionary<UUID, string> m_omCapUrls = new Dictionary<UUID, string>();
-        
+
         /// <summary>
         /// Track the ObjectMediaUpdate capabilities given to users keyed by path
         /// </summary>
         protected Dictionary<string, UUID> m_omuCapUsers = new Dictionary<string, UUID>();
-        
+
         /// <summary>
         /// Track the ObjectMediaUpdate capabilities given to users keyed by agent.  Lock m_omuCapUsers to manipulate
         /// </summary>
         protected Dictionary<UUID, string> m_omuCapUrls = new Dictionary<UUID, string>();
-        
-        public void Initialise(IConfigSource configSource) 
+
+        public void Initialise(IConfigSource configSource)
         {
             IConfig config = configSource.Configs["MediaOnAPrim"];
 
@@ -100,63 +100,63 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap
 //                m_log.Debug("[MOAP]: Initialised module.")l
         }
 
-        public void AddRegion(Scene scene) 
-        { 
+        public void AddRegion(Scene scene)
+        {
             if (!m_isEnabled)
                 return;
-            
+
             m_scene = scene;
             m_scene.RegisterModuleInterface<IMoapModule>(this);
         }
 
         public void RemoveRegion(Scene scene) {}
 
-        public void RegionLoaded(Scene scene) 
+        public void RegionLoaded(Scene scene)
         {
             if (!m_isEnabled)
                 return;
-            
+
             m_scene.EventManager.OnRegisterCaps += OnRegisterCaps;
             m_scene.EventManager.OnDeregisterCaps += OnDeregisterCaps;
             m_scene.EventManager.OnSceneObjectPartCopy += OnSceneObjectPartCopy;
         }
-        
-        public void Close() 
+
+        public void Close()
         {
             if (!m_isEnabled)
                 return;
-            
+
             m_scene.EventManager.OnRegisterCaps -= OnRegisterCaps;
             m_scene.EventManager.OnDeregisterCaps -= OnDeregisterCaps;
             m_scene.EventManager.OnSceneObjectPartCopy -= OnSceneObjectPartCopy;
         }
-        
+
         public void OnRegisterCaps(UUID agentID, Caps caps)
         {
 //            m_log.DebugFormat(
 //                "[MOAP]: Registering ObjectMedia and ObjectMediaNavigate capabilities for agent {0}", agentID);
-            
+
             string omCapUrl = "/CAPS/" + UUID.Random();
-            
+
             lock (m_omCapUsers)
             {
                 m_omCapUsers[omCapUrl] = agentID;
                 m_omCapUrls[agentID] = omCapUrl;
-                
+
                 // Even though we're registering for POST we're going to get GETS and UPDATES too
                 caps.RegisterHandler(
                     "ObjectMedia",
                     new RestStreamHandler(
                         "POST", omCapUrl, HandleObjectMediaMessage, "ObjectMedia", agentID.ToString()));
             }
-            
+
             string omuCapUrl = "/CAPS/" + UUID.Random();
-            
+
             lock (m_omuCapUsers)
             {
                 m_omuCapUsers[omuCapUrl] = agentID;
                 m_omuCapUrls[agentID] = omuCapUrl;
-                
+
                 // Even though we're registering for POST we're going to get GETS and UPDATES too
                 caps.RegisterHandler(
                     "ObjectMediaNavigate",
@@ -164,7 +164,7 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap
                         "POST", omuCapUrl, HandleObjectMediaNavigateMessage, "ObjectMediaNavigate", agentID.ToString()));
             }
         }
-        
+
         public void OnDeregisterCaps(UUID agentID, Caps caps)
         {
             lock (m_omCapUsers)
@@ -173,7 +173,7 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap
                 m_omCapUrls.Remove(agentID);
                 m_omCapUsers.Remove(path);
             }
-            
+
             lock (m_omuCapUsers)
             {
                 string path = m_omuCapUrls[agentID];
@@ -181,7 +181,7 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap
                 m_omuCapUsers.Remove(path);
             }
         }
-        
+
         protected void OnSceneObjectPartCopy(SceneObjectPart copy, SceneObjectPart original, bool userExposed)
         {
             if (original.Shape.Media != null)
@@ -197,19 +197,19 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap
                             dupeMedia.Add(null);
                     }
                 }
-                
+
                 copy.Shape.Media = dupeMedia;
             }
         }
-            
+
         public MediaEntry GetMediaEntry(SceneObjectPart part, int face)
         {
             MediaEntry me = null;
-            
+
             CheckFaceParam(part, face);
-            
+
             List<MediaEntry> media = part.Shape.Media;
-            
+
             if (null == media)
             {
                 me = null;
@@ -218,17 +218,17 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap
             {
                 lock (media)
                     me = media[face];
-                
+
                 // TODO: Really need a proper copy constructor down in libopenmetaverse
                 if (me != null)
                     me = MediaEntry.FromOSD(me.GetOSD());
             }
-            
+
 //            m_log.DebugFormat("[MOAP]: GetMediaEntry for {0} face {1} found {2}", part.Name, face, me);
-            
+
             return me;
         }
-        
+
         /// <summary>
         /// Set the media entry on the face of the given part.
         /// </summary>
@@ -238,28 +238,29 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap
         public void SetMediaEntry(SceneObjectPart part, int face, MediaEntry me)
         {
 //            m_log.DebugFormat("[MOAP]: SetMediaEntry for {0}, face {1}", part.Name, face);
-            
+
             CheckFaceParam(part, face);
-            
+
             if (null == part.Shape.Media)
             {
                 if (me == null)
                     return;
-                else                            
+                else
                     part.Shape.Media = new PrimitiveBaseShape.MediaList(new MediaEntry[part.GetNumberOfSides()]);
             }
 
             lock (part.Shape.Media)
-                part.Shape.Media[face] = me;                      
-            
+                part.Shape.Media[face] = me;
+
             UpdateMediaUrl(part, UUID.Zero);
-            
+
             SetPartMediaFlags(part, face, me != null);
-            
+
+            part.ParentGroup.HasGroupChanged = true;
             part.ScheduleFullUpdate();
             part.TriggerScriptChangedEvent(Changed.MEDIA);
         }
-        
+
         /// <summary>
         /// Clear the media entry from the face of the given part.
         /// </summary>
@@ -267,9 +268,9 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap
         /// <param name="face"></param>
         public void ClearMediaEntry(SceneObjectPart part, int face)
         {
-            SetMediaEntry(part, face, null);            
+            SetMediaEntry(part, face, null);
         }
-        
+
         /// <summary>
         /// Set the media flags on the texture face of the given part.
         /// </summary>
@@ -284,9 +285,9 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap
             Primitive.TextureEntry te = part.Shape.Textures;
             Primitive.TextureEntryFace teFace = te.CreateFace((uint)face);
             teFace.MediaFlags = flag;
-            part.Shape.Textures = te;            
+            part.Shape.Textures = te;
         }
-        
+
         /// <summary>
         /// Sets or gets per face media textures.
         /// </summary>
@@ -300,11 +301,11 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap
             string request, string path, string param, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
         {
 //            m_log.DebugFormat("[MOAP]: Got ObjectMedia path [{0}], raw request [{1}]", path, request);
-         
+
             OSDMap osd = (OSDMap)OSDParser.DeserializeLLSDXml(request);
             ObjectMediaMessage omm = new ObjectMediaMessage();
             omm.Deserialize(osd);
-            
+
             if (omm.Request is ObjectMediaRequest)
                 return HandleObjectMediaRequest(omm.Request as ObjectMediaRequest);
             else if (omm.Request is ObjectMediaUpdate)
@@ -312,10 +313,10 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap
 
             throw new Exception(
                 string.Format(
-                    "[MOAP]: ObjectMediaMessage has unrecognized ObjectMediaBlock of {0}", 
+                    "[MOAP]: ObjectMediaMessage has unrecognized ObjectMediaBlock of {0}",
                     omm.Request.GetType()));
         }
-        
+
         /// <summary>
         /// Handle a fetch request for media textures
         /// </summary>
@@ -324,36 +325,36 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap
         protected string HandleObjectMediaRequest(ObjectMediaRequest omr)
         {
             UUID primId = omr.PrimID;
-            
+
             SceneObjectPart part = m_scene.GetSceneObjectPart(primId);
-            
+
             if (null == part)
             {
                 m_log.WarnFormat(
-                    "[MOAP]: Received a GET ObjectMediaRequest for prim {0} but this doesn't exist in region {1}", 
+                    "[MOAP]: Received a GET ObjectMediaRequest for prim {0} but this doesn't exist in region {1}",
                     primId, m_scene.RegionInfo.RegionName);
                 return string.Empty;
             }
-            
+
             if (null == part.Shape.Media)
                 return string.Empty;
-            
+
             ObjectMediaResponse resp = new ObjectMediaResponse();
-            
+
             resp.PrimID = primId;
-            
+
             lock (part.Shape.Media)
                 resp.FaceMedia = part.Shape.Media.ToArray();
-            
+
             resp.Version = part.MediaUrl;
-           
+
             string rawResp = OSDParser.SerializeLLSDXmlString(resp.Serialize());
-            
+
 //            m_log.DebugFormat("[MOAP]: Got HandleObjectMediaRequestGet raw response is [{0}]", rawResp);
-            
+
             return rawResp;
         }
-        
+
         /// <summary>
         /// Handle an update of media textures.
         /// </summary>
@@ -363,46 +364,46 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap
         protected string HandleObjectMediaUpdate(string path, ObjectMediaUpdate omu)
         {
             UUID primId = omu.PrimID;
-            
+
             SceneObjectPart part = m_scene.GetSceneObjectPart(primId);
-            
+
             if (null == part)
             {
                 m_log.WarnFormat(
-                    "[MOAP]: Received an UPDATE ObjectMediaRequest for prim {0} but this doesn't exist in region {1}", 
+                    "[MOAP]: Received an UPDATE ObjectMediaRequest for prim {0} but this doesn't exist in region {1}",
                     primId, m_scene.RegionInfo.RegionName);
                 return string.Empty;
             }
-            
+
 //            m_log.DebugFormat("[MOAP]: Received {0} media entries for prim {1}", omu.FaceMedia.Length, primId);
-//                       
+//
 //            for (int i = 0; i < omu.FaceMedia.Length; i++)
 //            {
 //                MediaEntry me = omu.FaceMedia[i];
 //                string v = (null == me ? "null": OSDParser.SerializeLLSDXmlString(me.GetOSD()));
 //                m_log.DebugFormat("[MOAP]: Face {0} [{1}]", i, v);
 //            }
-            
+
             if (omu.FaceMedia.Length > part.GetNumberOfSides())
             {
                 m_log.WarnFormat(
-                    "[MOAP]: Received {0} media entries from client for prim {1} {2} but this prim has only {3} faces.  Dropping request.", 
+                    "[MOAP]: Received {0} media entries from client for prim {1} {2} but this prim has only {3} faces.  Dropping request.",
                     omu.FaceMedia.Length, part.Name, part.UUID, part.GetNumberOfSides());
                 return string.Empty;
             }
-            
+
             UUID agentId = default(UUID);
-            
+
             lock (m_omCapUsers)
-                agentId = m_omCapUsers[path]; 
-            
+                agentId = m_omCapUsers[path];
+
             List<MediaEntry> media = part.Shape.Media;
-            
+
             if (null == media)
             {
 //                m_log.DebugFormat("[MOAP]: Setting all new media list for {0}", part.Name);
                 part.Shape.Media = new PrimitiveBaseShape.MediaList(omu.FaceMedia);
-                
+
                 for (int i = 0; i < omu.FaceMedia.Length; i++)
                 {
                     if (omu.FaceMedia[i] != null)
@@ -412,7 +413,7 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap
                         // directly.
                         SetPartMediaFlags(part, i, true);
 //                        m_log.DebugFormat(
-//                            "[MOAP]: Media flags for face {0} is {1}", 
+//                            "[MOAP]: Media flags for face {0} is {1}",
 //                            i, part.Shape.Textures.FaceTextures[i].MediaFlags);
                     }
                 }
@@ -420,15 +421,15 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap
             else
             {
 //                m_log.DebugFormat("[MOAP]: Setting existing media list for {0}", part.Name);
-                
-                // We need to go through the media textures one at a time to make sure that we have permission 
+
+                // We need to go through the media textures one at a time to make sure that we have permission
                 // to change them
-                
+
                 // FIXME: Race condition here since some other texture entry manipulator may overwrite/get
                 // overwritten.  Unfortunately, PrimitiveBaseShape does not allow us to change texture entry
                 // directly.
                 Primitive.TextureEntry te = part.Shape.Textures;
-                
+
                 lock (media)
                 {
                     for (int i = 0; i < media.Count; i++)
@@ -436,38 +437,39 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap
                         if (m_scene.Permissions.CanControlPrimMedia(agentId, part.UUID, i))
                         {
                             media[i] = omu.FaceMedia[i];
-                            
+
                             // When a face is cleared this is done by setting the MediaFlags in the TextureEntry via a normal
                             // texture update, so we don't need to worry about clearing MediaFlags here.
                             if (null == media[i])
                                 continue;
-                            
+
                             SetPartMediaFlags(part, i, true);
-    
+
     //                        m_log.DebugFormat(
-    //                            "[MOAP]: Media flags for face {0} is {1}", 
+    //                            "[MOAP]: Media flags for face {0} is {1}",
     //                            i, face.MediaFlags);
     //                        m_log.DebugFormat("[MOAP]: Set media entry for face {0} on {1}", i, part.Name);
                         }
                     }
                 }
-                
+
                 part.Shape.Textures = te;
-                        
+
 //                for (int i2 = 0; i2 < part.Shape.Textures.FaceTextures.Length; i2++)
 //                    m_log.DebugFormat("[MOAP]: FaceTexture[{0}] is {1}", i2, part.Shape.Textures.FaceTextures[i2]);
             }
-            
+
             UpdateMediaUrl(part, agentId);
-            
+
             // Arguably, we could avoid sending a full update to the avatar that just changed the texture.
+            part.ParentGroup.HasGroupChanged = true;
             part.ScheduleFullUpdate();
-            
+
             part.TriggerScriptChangedEvent(Changed.MEDIA);
-            
+
             return string.Empty;
         }
-        
+
         /// <summary>
         /// Received from the viewer if a user has changed the url of a media texture.
         /// </summary>
@@ -481,71 +483,72 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap
             string request, string path, string param, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
         {
 //            m_log.DebugFormat("[MOAP]: Got ObjectMediaNavigate request [{0}]", request);
-            
+
             OSDMap osd = (OSDMap)OSDParser.DeserializeLLSDXml(request);
             ObjectMediaNavigateMessage omn = new ObjectMediaNavigateMessage();
             omn.Deserialize(osd);
-            
+
             UUID primId = omn.PrimID;
-            
+
             SceneObjectPart part = m_scene.GetSceneObjectPart(primId);
-            
+
             if (null == part)
             {
                 m_log.WarnFormat(
-                    "[MOAP]: Received an ObjectMediaNavigateMessage for prim {0} but this doesn't exist in region {1}", 
+                    "[MOAP]: Received an ObjectMediaNavigateMessage for prim {0} but this doesn't exist in region {1}",
                     primId, m_scene.RegionInfo.RegionName);
                 return string.Empty;
             }
-            
+
             UUID agentId = default(UUID);
-            
+
             lock (m_omuCapUsers)
                 agentId = m_omuCapUsers[path];
-            
+
             if (!m_scene.Permissions.CanInteractWithPrimMedia(agentId, part.UUID, omn.Face))
                 return string.Empty;
-            
+
 //            m_log.DebugFormat(
-//                "[MOAP]: Received request to update media entry for face {0} on prim {1} {2} to {3}", 
+//                "[MOAP]: Received request to update media entry for face {0} on prim {1} {2} to {3}",
 //                omn.Face, part.Name, part.UUID, omn.URL);
-            
+
             // If media has never been set for this prim, then just return.
             if (null == part.Shape.Media)
                 return string.Empty;
-            
+
             MediaEntry me = null;
-                
+
             lock (part.Shape.Media)
                 me = part.Shape.Media[omn.Face];
-            
+
             // Do the same if media has not been set up for a specific face
             if (null == me)
                 return string.Empty;
-            
+
             if (me.EnableWhiteList)
             {
                 if (!CheckUrlAgainstWhitelist(omn.URL, me.WhiteList))
                 {
 //                    m_log.DebugFormat(
-//                        "[MOAP]: Blocking change of face {0} on prim {1} {2} to {3} since it's not on the enabled whitelist", 
+//                        "[MOAP]: Blocking change of face {0} on prim {1} {2} to {3} since it's not on the enabled whitelist",
 //                        omn.Face, part.Name, part.UUID, omn.URL);
-                    
+
                     return string.Empty;
                 }
             }
-            
+
             me.CurrentURL = omn.URL;
-            
+
             UpdateMediaUrl(part, agentId);
-            
+
+            part.ParentGroup.HasGroupChanged = true;
             part.ScheduleFullUpdate();
-            
+
             part.TriggerScriptChangedEvent(Changed.MEDIA);
-            
+
             return OSDParser.SerializeLLSDXmlString(new OSD());
         }
-        
+
         /// <summary>
         /// Check that the face number is valid for the given prim.
         /// </summary>
@@ -555,13 +558,13 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap
         {
             if (face < 0)
                 throw new ArgumentException("Face cannot be less than zero");
-                               
+
             int maxFaces = part.GetNumberOfSides() - 1;
             if (face > maxFaces)
                 throw new ArgumentException(
                     string.Format("Face argument was {0} but max is {1}", face, maxFaces));
         }
-        
+
         /// <summary>
         /// Update the media url of the given part
         /// </summary>
@@ -583,10 +586,10 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap
                 int version = int.Parse(rawVersion);
                 part.MediaUrl = string.Format("x-mv:{0:D10}/{1}", ++version, updateId);
             }
-            
+
 //            m_log.DebugFormat("[MOAP]: Storing media url [{0}] in prim {1} {2}", part.MediaUrl, part.Name, part.UUID);
         }
-        
+
         /// <summary>
         /// Check the given url against the given whitelist.
         /// </summary>
@@ -599,22 +602,22 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap
                 return false;
 
             Uri url = new Uri(rawUrl);
-            
+
             foreach (string origWlUrl in whitelist)
             {
                 string wlUrl = origWlUrl;
-                
+
                 // Deal with a line-ending wildcard
                 if (wlUrl.EndsWith("*"))
                     wlUrl = wlUrl.Remove(wlUrl.Length - 1);
-                
+
 //                m_log.DebugFormat("[MOAP]: Checking whitelist URL pattern {0}", origWlUrl);
-                
+
                 // Handle a line starting wildcard slightly differently since this can only match the domain, not the path
                 if (wlUrl.StartsWith("*"))
                 {
                     wlUrl = wlUrl.Substring(1);
-                    
+
                     if (url.Host.Contains(wlUrl))
                     {
 //                        m_log.DebugFormat("[MOAP]: Whitelist URL {0} matches {1}", origWlUrl, rawUrl);
@@ -624,7 +627,7 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap
                 else
                 {
                     string urlToMatch = url.Authority + url.AbsolutePath;
-    
+
                     if (urlToMatch.StartsWith(wlUrl))
                     {
 //                        m_log.DebugFormat("[MOAP]: Whitelist URL {0} matches {1}", origWlUrl, rawUrl);
@@ -632,7 +635,7 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap
                     }
                 }
             }
-            
+
             return false;
         }
     }
diff --git a/OpenSim/Region/CoreModules/World/Media/Moap/Tests/MoapTests.cs b/OpenSim/Region/CoreModules/World/Media/Moap/Tests/MoapTests.cs
index ee57aed..7080705 100644
--- a/OpenSim/Region/CoreModules/World/Media/Moap/Tests/MoapTests.cs
+++ b/OpenSim/Region/CoreModules/World/Media/Moap/Tests/MoapTests.cs
@@ -47,7 +47,7 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap.Tests
     {
         protected TestScene m_scene;
         protected MoapModule m_module;
-            
+
         [SetUp]
         public override void SetUp()
         {
@@ -55,45 +55,45 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap.Tests
 
             m_module = new MoapModule();
             m_scene = new SceneHelpers().SetupScene();
-            SceneHelpers.SetupSceneModules(m_scene, m_module);            
-        }        
-        
+            SceneHelpers.SetupSceneModules(m_scene, m_module);
+        }
+
         [Test]
         public void TestClearMediaUrl()
         {
-            TestHelpers.InMethod();           
+            TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
-            
+
             SceneObjectPart part = SceneHelpers.AddSceneObject(m_scene).RootPart;
-            MediaEntry me = new MediaEntry();            
-            
+            MediaEntry me = new MediaEntry();
+
             m_module.SetMediaEntry(part, 1, me);
             m_module.ClearMediaEntry(part, 1);
-            
+
             Assert.That(part.Shape.Media[1], Is.EqualTo(null));
-            
+
             // Although we've cleared one face, other faces may still be present.  So we need to check for an
             // update media url version
             Assert.That(part.MediaUrl, Is.EqualTo("x-mv:0000000001/" + UUID.Zero));
-            
+
             // By changing media flag to false, the face texture once again becomes identical to the DefaultTexture.
             // Therefore, when libOMV reserializes it, it disappears and we are left with no face texture in this slot.
             // Not at all confusing, eh?
             Assert.That(part.Shape.Textures.FaceTextures[1], Is.Null);
         }
-        
+
         [Test]
         public void TestSetMediaUrl()
         {
             TestHelpers.InMethod();
-            
-            string homeUrl = "opensimulator.org";            
-            
+
+            string homeUrl = "opensimulator.org";
+
             SceneObjectPart part = SceneHelpers.AddSceneObject(m_scene).RootPart;
-            MediaEntry me = new MediaEntry() { HomeURL = homeUrl };            
-            
+            MediaEntry me = new MediaEntry() { HomeURL = homeUrl };
+
             m_module.SetMediaEntry(part, 1, me);
-            
+
             Assert.That(part.Shape.Media[1].HomeURL, Is.EqualTo(homeUrl));
             Assert.That(part.MediaUrl, Is.EqualTo("x-mv:0000000000/" + UUID.Zero));
             Assert.That(part.Shape.Textures.FaceTextures[1].MediaFlags, Is.True);
diff --git a/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs b/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs
index 2abc910..6a8f4c0 100644
--- a/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs
+++ b/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs
@@ -45,38 +45,38 @@ namespace OpenSim.Region.CoreModules.World.Objects.BuySell
     [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "BuySellModule")]
     public class BuySellModule : IBuySellModule, INonSharedRegionModule
     {
-//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
         protected Scene m_scene = null;
         protected IDialogModule m_dialogModule;
-        
+
         public string Name { get { return "Object BuySell Module"; } }
         public Type ReplaceableInterface { get { return null; } }
 
         public void Initialise(IConfigSource source) {}
-        
+
         public void AddRegion(Scene scene)
         {
             m_scene = scene;
             m_scene.RegisterModuleInterface<IBuySellModule>(this);
             m_scene.EventManager.OnNewClient += SubscribeToClientEvents;
         }
-        
-        public void RemoveRegion(Scene scene) 
+
+        public void RemoveRegion(Scene scene)
         {
             m_scene.EventManager.OnNewClient -= SubscribeToClientEvents;
         }
-        
-        public void RegionLoaded(Scene scene) 
+
+        public void RegionLoaded(Scene scene)
         {
             m_dialogModule = scene.RequestModuleInterface<IDialogModule>();
         }
-        
-        public void Close() 
+
+        public void Close()
         {
             RemoveRegion(m_scene);
         }
-        
+
         public void SubscribeToClientEvents(IClientAPI client)
         {
             client.OnObjectSaleInfo += ObjectSaleInfo;
@@ -89,18 +89,23 @@ namespace OpenSim.Region.CoreModules.World.Objects.BuySell
             if (part == null)
                 return;
 
-            if (part.ParentGroup.IsDeleted)
+            SceneObjectGroup sog = part.ParentGroup;
+            if (sog == null || sog.IsDeleted)
                 return;
 
-            if (part.OwnerID != client.AgentId && (!m_scene.Permissions.IsGod(client.AgentId)))
+            // Does the user have the power to put the object on sale?
+            if (!m_scene.Permissions.CanSellObject(client, sog, saleType))
+            {
+                client.SendAgentAlertMessage("You don't have permission to set object on sale", false);
                 return;
+            }
 
-            part = part.ParentGroup.RootPart;
+            part = sog.RootPart;
 
             part.ObjectSaleType = saleType;
             part.SalePrice = salePrice;
 
-            part.ParentGroup.HasGroupChanged = true;
+            sog.HasGroupChanged = true;
 
             part.SendPropertiesToClient(client);
         }
@@ -113,11 +118,16 @@ namespace OpenSim.Region.CoreModules.World.Objects.BuySell
                 return false;
 
             SceneObjectGroup group = part.ParentGroup;
+            if(group == null || group.IsDeleted || group.inTransit)
+                return false;
+
+            // make sure we are not buying a child part
+            part = group.RootPart;            
 
             switch (saleType)
             {
             case 1: // Sell as original (in-place sale)
-                uint effectivePerms = group.GetEffectivePermissions();
+                uint effectivePerms = group.EffectiveOwnerPerms;
 
                 if ((effectivePerms & (uint)PermissionMask.Transfer) == 0)
                 {
@@ -126,8 +136,7 @@ namespace OpenSim.Region.CoreModules.World.Objects.BuySell
                     return false;
                 }
 
-                group.SetOwnerId(remoteClient.AgentId);
-                group.SetRootPartOwner(part, remoteClient.AgentId, remoteClient.ActiveGroupId);
+                group.SetOwner(remoteClient.AgentId, remoteClient.ActiveGroupId);
 
                 if (m_scene.Permissions.PropagatePermissions())
                 {
@@ -137,6 +146,7 @@ namespace OpenSim.Region.CoreModules.World.Objects.BuySell
                         child.TriggerScriptChangedEvent(Changed.OWNER);
                         child.ApplyNextOwnerPermissions();
                     }
+                    group.InvalidateDeepEffectivePerms();
                 }
 
                 part.ObjectSaleType = 0;
@@ -152,19 +162,7 @@ namespace OpenSim.Region.CoreModules.World.Objects.BuySell
                 break;
 
             case 2: // Sell a copy
-                Vector3 inventoryStoredPosition = new Vector3(
-                        Math.Min(group.AbsolutePosition.X, m_scene.RegionInfo.RegionSizeX - 6),
-                        Math.Min(group.AbsolutePosition.Y, m_scene.RegionInfo.RegionSizeY - 6),
-                        group.AbsolutePosition.Z);
-
-                Vector3 originalPosition = group.AbsolutePosition;
-
-                group.AbsolutePosition = inventoryStoredPosition;
-
-                string sceneObjectXml = SceneObjectSerializer.ToOriginalXmlFormat(group);
-                group.AbsolutePosition = originalPosition;
-
-                uint perms = group.GetEffectivePermissions();
+                uint perms = group.EffectiveOwnerPerms;
 
                 if ((perms & (uint)PermissionMask.Transfer) == 0)
                 {
@@ -173,6 +171,15 @@ 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;
+                }
+
+                string sceneObjectXml = SceneObjectSerializer.ToOriginalXmlFormat(group);
+
                 AssetBase asset = m_scene.CreateAsset(
                     group.GetPartName(localID),
                     group.GetPartDescription(localID),
@@ -193,16 +200,21 @@ namespace OpenSim.Region.CoreModules.World.Objects.BuySell
                 item.AssetType = asset.Type;
                 item.InvType = (int)InventoryType.Object;
                 item.Folder = categoryID;
+                
+                perms = group.CurrentAndFoldedNextPermissions();
+                // apply parts inventory next perms            
+                PermissionsUtil.ApplyNoModFoldedPermissions(perms, ref perms);
+                // change to next owner perms
+                perms &=  part.NextOwnerMask; 
+                // update folded
+                perms = PermissionsUtil.FixAndFoldPermissions(perms);
+
+                item.BasePermissions = perms;
+                item.CurrentPermissions = perms;
+                item.NextPermissions = part.NextOwnerMask & perms;
+                item.EveryOnePermissions = part.EveryoneMask & perms;
+                item.GroupPermissions = part.GroupMask & perms;
 
-                PermissionsUtil.ApplyFoldedPermissions(perms, ref perms);
-
-                item.BasePermissions = perms & part.NextOwnerMask;
-                item.CurrentPermissions = perms & part.NextOwnerMask;
-                item.NextPermissions = part.NextOwnerMask;
-                item.EveryOnePermissions = part.EveryoneMask &
-                                           part.NextOwnerMask;
-                item.GroupPermissions = part.GroupMask &
-                                           part.NextOwnerMask;
                 item.Flags |= (uint)InventoryItemFlags.ObjectSlamPerm;
                 item.CreationDate = Util.UnixTimeSinceEpoch();
 
diff --git a/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs b/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs
index e77f0aa..3d786dd 100644
--- a/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs
+++ b/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs
@@ -53,30 +53,30 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
     [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "ObjectCommandsModule")]
     public class ObjectCommandsModule : INonSharedRegionModule
     {
-//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);                
+//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         private Scene m_scene;
         private ICommandConsole m_console;
 
         public string Name { get { return "Object Commands Module"; } }
-        
+
         public Type ReplaceableInterface { get { return null; } }
-        
+
         public void Initialise(IConfigSource source)
         {
 //            m_log.DebugFormat("[OBJECT COMMANDS MODULE]: INITIALIZED MODULE");
         }
-        
+
         public void PostInitialise()
         {
 //            m_log.DebugFormat("[OBJECT COMMANDS MODULE]: POST INITIALIZED MODULE");
         }
-        
+
         public void Close()
         {
 //            m_log.DebugFormat("[OBJECT COMMANDS MODULE]: CLOSED MODULE");
         }
-        
+
         public void AddRegion(Scene scene)
         {
 //            m_log.DebugFormat("[OBJECT COMMANDS MODULE]: REGION {0} ADDED", scene.RegionInfo.RegionName);
@@ -123,8 +123,8 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
                 "Objects",
                 false,
                 "delete object pos",
-                "delete object pos <start-coord> to <end-coord>",
-                "Delete scene objects within the given area.",
+                "delete object pos <start x, start y , start z> <end x, end y, end z>",
+                "Delete scene objects within the given volume.",
                 ConsoleUtil.CoordHelp,
                 HandleDeleteObject);
 
@@ -152,9 +152,18 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
             m_console.Commands.AddCommand(
                 "Objects",
                 false,
+                "show object owner",
+                "show object owner [--full] <OwnerID>",
+                "Show details of scene objects with given owner.",
+                "The --full option will print out information on all the parts of the object.\n",
+                HandleShowObjectByOwnerID);
+
+            m_console.Commands.AddCommand(
+                "Objects",
+                false,
                 "show object pos",
-                "show object pos [--full] <start-coord> to <end-coord>",
-                "Show details of scene objects within the given area.",
+                "show object pos [--full] <start x, start y , start z> <end x, end y, end z>",
+                "Show details of scene objects within give volume",
                 "The --full option will print out information on all the parts of the object.\n"
                     + "For yet more detailed part information, use the \"show part\" commands.\n"
                     + ConsoleUtil.CoordHelp,
@@ -180,8 +189,8 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
                 "Objects",
                 false,
                 "show part pos",
-                "show part pos <start-coord> to <end-coord>",
-                "Show details of scene object parts within the given area.",
+                "show part pos <start x, start y , start z> <end x, end y, end z>",
+                "Show details of scene object parts within the given volume.",
                 ConsoleUtil.CoordHelp,
                 HandleShowPartByPos);
 
@@ -325,6 +334,32 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
             OutputSogsToConsole(searchPredicate, showFull);
         }
 
+        private void HandleShowObjectByOwnerID(string module, string[] cmdparams)
+        {
+            if (!(m_console.ConsoleScene == null || m_console.ConsoleScene == m_scene))
+                return;
+
+            bool showFull = false;
+            OptionSet options = new OptionSet().Add("full", v => showFull = v != null);
+
+            List<string> mainParams = options.Parse(cmdparams);
+
+            if (mainParams.Count < 4)
+            {
+                m_console.OutputFormat("Usage: show object owner <OwnerID>");
+                return;
+            }
+
+            UUID ownerID;
+            if (!ConsoleUtil.TryParseConsoleUuid(m_console, mainParams[3], out ownerID))
+                return;
+
+            Predicate<SceneObjectGroup> searchPredicate
+                = so => so.OwnerID == ownerID && !so.IsAttachment;
+
+            OutputSogsToConsole(searchPredicate, showFull);
+        }
+
         private void HandleShowObjectByPos(string module, string[] cmdparams)
         {
             if (!(m_console.ConsoleScene == null || m_console.ConsoleScene == m_scene))
@@ -504,13 +539,13 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
 
             if (!ConsoleUtil.CheckFileDoesNotExist(m_console, fileName))
                 return;
-            
+
             using (XmlTextWriter xtw = new XmlTextWriter(fileName, Encoding.UTF8))
             {
                 xtw.Formatting = Formatting.Indented;
                 SceneObjectSerializer.ToOriginalXmlFormat(so, xtw, true);
             }
-            
+
             m_console.OutputFormat("Object dumped to file {0}", fileName);
         }
 
@@ -590,7 +625,7 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
                 cdl.AddRow("FlexiSoftness", s.FlexiSoftness);
                 cdl.AddRow("HollowShape", s.HollowShape);
                 cdl.AddRow(
-                    "LightColor", 
+                    "LightColor",
                     string.Format("<{0},{1},{2},{3}>", s.LightColorR, s.LightColorB, s.LightColorG, s.LightColorA));
                 cdl.AddRow("LightCutoff", s.LightCutoff);
                 cdl.AddRow("LightEntry", s.LightEntry);
@@ -624,7 +659,7 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
                 cdl.AddRow("Rotation (World)", sop.GetWorldRotation());
                 cdl.AddRow("Scale", s.Scale);
                 cdl.AddRow(
-                    "SculptData", 
+                    "SculptData",
                     string.Format("{0} bytes", s.SculptData != null ? s.SculptData.Length.ToString() : "n/a"));
                 cdl.AddRow("SculptEntry", s.SculptEntry);
                 cdl.AddRow("SculptTexture", s.SculptTexture);
@@ -633,7 +668,7 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
 
                 // TODO, need to display more information about textures but in a compact format
                 // to stop output becoming huge.
-                for (int i = 0; i < sop.GetNumberOfSides(); i++)               
+                for (int i = 0; i < sop.GetNumberOfSides(); i++)
                 {
                     Primitive.TextureEntryFace teFace = s.Textures.FaceTextures[i];
 
@@ -730,12 +765,12 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
                         if (g.OwnerID == match && !g.IsAttachment)
                             deletes.Add(g);
                     });
-        
+
         //                if (deletes.Count == 0)
         //                    m_console.OutputFormat("No objects were found with owner {0}", match);
-        
+
                     break;
-        
+
                 case "creator":
                     if (!UUID.TryParse(o, out match))
                         return;
@@ -747,12 +782,12 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
                         if (g.RootPart.CreatorID == match && !g.IsAttachment)
                             deletes.Add(g);
                     });
-        
+
         //                if (deletes.Count == 0)
         //                    m_console.OutputFormat("No objects were found with creator {0}", match);
-        
+
                     break;
-        
+
                 case "id":
                     UUID uuid;
                     uint localId;
@@ -768,18 +803,21 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
                     else
                         so = m_scene.GetSceneObjectGroup(localId);
 
-                    if (!so.IsAttachment)
-                       deletes.Add(so);
-
-        //                if (deletes.Count == 0)
-        //                    m_console.OutputFormat("No objects were found with uuid {0}", match);
-        
+                    if (so!= null)
+                    {
+                        deletes.Add(so);
+                        if(so.IsAttachment)
+                        {
+                            requireConfirmation = true;
+                            m_console.OutputFormat("Warning: object with uuid {0} is a attachment", uuid);
+                        }
+                    }
                     break;
-        
+
                 case "name":
                     deletes = GetDeleteCandidatesByName(module, cmd);
                     break;
-        
+
                 case "outside":
                     deletes = new List<SceneObjectGroup>();
 
@@ -787,7 +825,7 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
                     {
                         SceneObjectPart rootPart = g.RootPart;
                         bool delete = false;
-        
+
                         if (rootPart.GroupPosition.Z < 0.0 || rootPart.GroupPosition.Z > 10000.0)
                         {
                             delete = true;
@@ -796,18 +834,18 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
                         {
                             ILandObject parcel
                                 = m_scene.LandChannel.GetLandObject(rootPart.GroupPosition.X, rootPart.GroupPosition.Y);
-        
+
                             if (parcel == null || parcel.LandData.Name == "NO LAND")
                                 delete = true;
                         }
-        
+
                         if (delete && !g.IsAttachment && !deletes.Contains(g))
                             deletes.Add(g);
                     });
-        
+
                     if (deletes.Count == 0)
                         m_console.OutputFormat("No objects were found outside region bounds");
-        
+
                     break;
 
                 case "pos":
@@ -829,7 +867,7 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
                         "Are you sure that you want to delete {0} objects from {1}",
                         deletes.Count, m_scene.RegionInfo.RegionName),
                     "y/N");
-    
+
                 if (response.ToLower() != "y")
                 {
                     MainConsole.Instance.OutputFormat(
@@ -869,11 +907,11 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
             if (useRegex)
             {
                 Regex nameRegex = new Regex(name);
-                searchAction = so => { if (nameRegex.IsMatch(so.Name)) { sceneObjects.Add(so); }};
+                searchAction = so => { if (nameRegex.IsMatch(so.Name)) {if(!so.IsAttachment) sceneObjects.Add(so);}};
             }
             else
             {
-                searchAction = so => { if (so.Name == name) { sceneObjects.Add(so); }};
+                searchAction = so => { if (so.Name == name) {if(!so.IsAttachment) sceneObjects.Add(so);}};
             }
 
             m_scene.ForEachSOG(searchAction);
@@ -916,11 +954,11 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
             {
                 m_console.OutputFormat("Error: Start vector '{0}' does not have a valid format", rawConsoleStartVector);
                 endVector = Vector3.Zero;
-                
+
                 return false;
             }
 
-            string rawConsoleEndVector = rawComponents.Skip(2).Take(1).Single();
+            string rawConsoleEndVector = rawComponents.Skip(1).Take(1).Single();
 
             if (!ConsoleUtil.TryParseConsoleMaxVector(rawConsoleEndVector, out endVector))
             {
diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
index 780ec69..45c1c56 100644
--- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
+++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
@@ -43,12 +43,13 @@ 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);
-                
+
         protected Scene m_scene;
+        protected ScenePermissions scenePermissions;
         protected bool m_Enabled;
 
         private InventoryFolderImpl m_libraryRootFolder;
@@ -69,15 +70,6 @@ namespace OpenSim.Region.CoreModules.World.Permissions
         }
 
         #region Constants
-        // These are here for testing.  They will be taken out
-
-        //private uint PERM_ALL = (uint)2147483647;
-        private uint PERM_COPY = (uint)32768;
-        //private uint PERM_MODIFY = (uint)16384;
-        private uint PERM_MOVE = (uint)524288;
-        private uint PERM_TRANS = (uint)8192;
-        private uint PERM_LOCKED = (uint)540672;
-        
         /// <value>
         /// Different user set names that come in from the configuration file.
         /// </value>
@@ -96,12 +88,12 @@ namespace OpenSim.Region.CoreModules.World.Permissions
         private bool m_bypassPermissionsValue = true;
         private bool m_propagatePermissions = false;
         private bool m_debugPermissions = false;
-        private bool m_allowGridGods = false;
-        private bool m_RegionOwnerIsGod = false;
-        private bool m_RegionManagerIsGod = false;
-        private bool m_ParcelOwnerIsGod = false;
-
-        private bool m_SimpleBuildPermissions = false;
+        private bool m_allowGridAdmins = false;
+        private bool m_RegionOwnerIsAdmin = false;
+        private bool m_RegionManagerIsAdmin = false;
+        private bool m_forceGridAdminsOnly;
+        private bool m_forceAdminModeAlwaysOn;
+        private bool m_allowAdminActionsWithoutGodMode;
 
         /// <value>
         /// The set of users that are allowed to create scripts.  This is only active if permissions are not being
@@ -110,17 +102,17 @@ namespace OpenSim.Region.CoreModules.World.Permissions
         private UserSet m_allowedScriptCreators = UserSet.All;
 
         /// <value>
-        /// The set of users that are allowed to edit (save) scripts.  This is only active if 
+        /// The set of users that are allowed to edit (save) scripts.  This is only active if
         /// permissions are not being bypassed.  This overrides normal permissions.-
         /// </value>
         private UserSet m_allowedScriptEditors = UserSet.All;
-        
+
         private Dictionary<string, bool> GrantLSL = new Dictionary<string, bool>();
         private Dictionary<string, bool> GrantCS = new Dictionary<string, bool>();
         private Dictionary<string, bool> GrantVB = new Dictionary<string, bool>();
         private Dictionary<string, bool> GrantJS = new Dictionary<string, bool>();
         private Dictionary<string, bool> GrantYP = new Dictionary<string, bool>();
-        
+
         private IFriendsModule m_friendsModule;
         private IFriendsModule FriendsModule
         {
@@ -168,21 +160,25 @@ namespace OpenSim.Region.CoreModules.World.Permissions
 
             m_Enabled = true;
 
-            m_allowGridGods = Util.GetConfigVarFromSections<bool>(config, "allow_grid_gods",
-                new string[] { "Startup", "Permissions" }, false); 
-            m_bypassPermissions = !Util.GetConfigVarFromSections<bool>(config, "serverside_object_permissions",
-                new string[] { "Startup", "Permissions" }, true); 
-            m_propagatePermissions = Util.GetConfigVarFromSections<bool>(config, "propagate_permissions",
-                new string[] { "Startup", "Permissions" }, true); 
-            m_RegionOwnerIsGod = Util.GetConfigVarFromSections<bool>(config, "region_owner_is_god",
-                new string[] { "Startup", "Permissions" }, true); 
-            m_RegionManagerIsGod = Util.GetConfigVarFromSections<bool>(config, "region_manager_is_god",
-                new string[] { "Startup", "Permissions" }, false); 
-            m_ParcelOwnerIsGod = Util.GetConfigVarFromSections<bool>(config, "parcel_owner_is_god",
-                new string[] { "Startup", "Permissions" }, true);
-
-            m_SimpleBuildPermissions = Util.GetConfigVarFromSections<bool>(config, "simple_build_permissions",
-                new string[] { "Startup", "Permissions" }, false); 
+            string[] sections = new string[] { "Startup", "Permissions" };
+
+            m_allowGridAdmins = Util.GetConfigVarFromSections<bool>(config, "allow_grid_gods", sections, false);
+            m_bypassPermissions = !Util.GetConfigVarFromSections<bool>(config, "serverside_object_permissions", sections, true);
+            m_propagatePermissions = Util.GetConfigVarFromSections<bool>(config, "propagate_permissions", sections, true);
+
+            m_forceGridAdminsOnly = Util.GetConfigVarFromSections<bool>(config, "force_grid_gods_only", sections, false);
+            if(!m_forceGridAdminsOnly)
+            {            
+                m_RegionOwnerIsAdmin = Util.GetConfigVarFromSections<bool>(config, "region_owner_is_god",sections, true);
+                m_RegionManagerIsAdmin = Util.GetConfigVarFromSections<bool>(config, "region_manager_is_god",sections, false);
+            }
+            else
+                m_allowGridAdmins = true;
+
+            m_forceAdminModeAlwaysOn = Util.GetConfigVarFromSections<bool>(config, "automatic_gods", sections, false);
+            m_allowAdminActionsWithoutGodMode = Util.GetConfigVarFromSections<bool>(config, "implicit_gods", sections, false);
+            if(m_allowAdminActionsWithoutGodMode)
+                m_forceAdminModeAlwaysOn = false;
 
             m_allowedScriptCreators
                 = ParseUserSetConfigSetting(config, "allowed_script_creators", m_allowedScriptCreators);
@@ -206,7 +202,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
             }
 
             grant = Util.GetConfigVarFromSections<string>(config, "GrantCS",
-                new string[] { "Startup", "Permissions" }, string.Empty); 
+                new string[] { "Startup", "Permissions" }, string.Empty);
             if (grant.Length > 0)
             {
                 foreach (string uuidl in grant.Split(','))
@@ -258,61 +254,79 @@ namespace OpenSim.Region.CoreModules.World.Permissions
             m_scene = scene;
 
             scene.RegisterModuleInterface<IPermissionsModule>(this);
+            scenePermissions = m_scene.Permissions;
 
             //Register functions with Scene External Checks!
-            m_scene.Permissions.OnBypassPermissions += BypassPermissions;
-            m_scene.Permissions.OnSetBypassPermissions += SetBypassPermissions;
-            m_scene.Permissions.OnPropagatePermissions += PropagatePermissions;
-            m_scene.Permissions.OnGenerateClientFlags += GenerateClientFlags;
-            m_scene.Permissions.OnAbandonParcel += CanAbandonParcel;
-            m_scene.Permissions.OnReclaimParcel += CanReclaimParcel;
-            m_scene.Permissions.OnDeedParcel += CanDeedParcel;
-            m_scene.Permissions.OnDeedObject += CanDeedObject;
-            m_scene.Permissions.OnIsGod += IsGod;
-            m_scene.Permissions.OnIsGridGod += IsGridGod;
-            m_scene.Permissions.OnIsAdministrator += IsAdministrator;
-            m_scene.Permissions.OnDuplicateObject += CanDuplicateObject;
-            m_scene.Permissions.OnDeleteObject += CanDeleteObject; 
-            m_scene.Permissions.OnEditObject += CanEditObject; 
-            m_scene.Permissions.OnEditParcelProperties += CanEditParcelProperties; 
-            m_scene.Permissions.OnInstantMessage += CanInstantMessage;
-            m_scene.Permissions.OnInventoryTransfer += CanInventoryTransfer; 
-            m_scene.Permissions.OnIssueEstateCommand += CanIssueEstateCommand; 
-            m_scene.Permissions.OnMoveObject += CanMoveObject; 
-            m_scene.Permissions.OnObjectEntry += CanObjectEntry;
-            m_scene.Permissions.OnReturnObjects += CanReturnObjects; 
-            m_scene.Permissions.OnRezObject += CanRezObject; 
-            m_scene.Permissions.OnRunConsoleCommand += CanRunConsoleCommand;
-            m_scene.Permissions.OnRunScript += CanRunScript; 
-            m_scene.Permissions.OnCompileScript += CanCompileScript;
-            m_scene.Permissions.OnSellParcel += CanSellParcel;
-            m_scene.Permissions.OnTakeObject += CanTakeObject;
-            m_scene.Permissions.OnTakeCopyObject += CanTakeCopyObject;
-            m_scene.Permissions.OnTerraformLand += CanTerraformLand;
-            m_scene.Permissions.OnLinkObject += CanLinkObject; 
-            m_scene.Permissions.OnDelinkObject += CanDelinkObject; 
-            m_scene.Permissions.OnBuyLand += CanBuyLand; 
-            
-            m_scene.Permissions.OnViewNotecard += CanViewNotecard; 
-            m_scene.Permissions.OnViewScript += CanViewScript; 
-            m_scene.Permissions.OnEditNotecard += CanEditNotecard; 
-            m_scene.Permissions.OnEditScript += CanEditScript; 
-            
-            m_scene.Permissions.OnCreateObjectInventory += CanCreateObjectInventory;
-            m_scene.Permissions.OnEditObjectInventory += CanEditObjectInventory;
-            m_scene.Permissions.OnCopyObjectInventory += CanCopyObjectInventory; 
-            m_scene.Permissions.OnDeleteObjectInventory += CanDeleteObjectInventory; 
-            m_scene.Permissions.OnResetScript += CanResetScript;
+            scenePermissions.OnBypassPermissions += BypassPermissions;
+            scenePermissions.OnSetBypassPermissions += SetBypassPermissions;
+            scenePermissions.OnPropagatePermissions += PropagatePermissions;
+
+            scenePermissions.OnIsGridGod += IsGridAdministrator;
+            scenePermissions.OnIsAdministrator += IsAdministrator;
+            scenePermissions.OnIsEstateManager += IsEstateManager;
+
+            scenePermissions.OnGenerateClientFlags += GenerateClientFlags;
+
+            scenePermissions.OnIssueEstateCommand += CanIssueEstateCommand;
+            scenePermissions.OnRunConsoleCommand += CanRunConsoleCommand;
+
+            scenePermissions.OnTeleport += CanTeleport;
+
+            scenePermissions.OnInstantMessage += CanInstantMessage;
+
+            scenePermissions.OnAbandonParcel += CanAbandonParcel;
+            scenePermissions.OnReclaimParcel += CanReclaimParcel;
+            scenePermissions.OnDeedParcel += CanDeedParcel;
+            scenePermissions.OnSellParcel += CanSellParcel;
+            scenePermissions.OnEditParcelProperties += CanEditParcelProperties;
+            scenePermissions.OnTerraformLand += CanTerraformLand;
+            scenePermissions.OnBuyLand += CanBuyLand;
+
+            scenePermissions.OnReturnObjects += CanReturnObjects;
+
+            scenePermissions.OnRezObject += CanRezObject;
+            scenePermissions.OnObjectEntry += CanObjectEntry;
+            scenePermissions.OnObjectEnterWithScripts += OnObjectEnterWithScripts;
+
+            scenePermissions.OnDuplicateObject += CanDuplicateObject;
+            scenePermissions.OnDeleteObjectByIDs += CanDeleteObjectByIDs;
+            scenePermissions.OnDeleteObject += CanDeleteObject;
+            scenePermissions.OnEditObjectByIDs += CanEditObjectByIDs;
+            scenePermissions.OnEditObject += CanEditObject;
+            scenePermissions.OnEditObjectPerms += CanEditObjectPerms;
+            scenePermissions.OnInventoryTransfer += CanInventoryTransfer;
+            scenePermissions.OnMoveObject += CanMoveObject;
+            scenePermissions.OnTakeObject += CanTakeObject;
+            scenePermissions.OnTakeCopyObject += CanTakeCopyObject;
+            scenePermissions.OnLinkObject += CanLinkObject;
+            scenePermissions.OnDelinkObject += CanDelinkObject;
+            scenePermissions.OnDeedObject += CanDeedObject;
+            scenePermissions.OnSellGroupObject += CanSellGroupObject;
+            scenePermissions.OnSellObjectByUserID += CanSellObjectByUserID;
+            scenePermissions.OnSellObject += CanSellObject;
             
-            m_scene.Permissions.OnCreateUserInventory += CanCreateUserInventory; 
-            m_scene.Permissions.OnCopyUserInventory += CanCopyUserInventory; 
-            m_scene.Permissions.OnEditUserInventory += CanEditUserInventory; 
-            m_scene.Permissions.OnDeleteUserInventory += CanDeleteUserInventory; 
+            scenePermissions.OnCreateObjectInventory += CanCreateObjectInventory;
+            scenePermissions.OnEditObjectInventory += CanEditObjectInventory;
+            scenePermissions.OnCopyObjectInventory += CanCopyObjectInventory;
+            scenePermissions.OnDeleteObjectInventory += CanDeleteObjectInventory;
+            scenePermissions.OnDoObjectInvToObjectInv += CanDoObjectInvToObjectInv;
+            scenePermissions.OnDropInObjectInv += CanDropInObjectInv;
+
+            scenePermissions.OnViewNotecard += CanViewNotecard;
+            scenePermissions.OnViewScript += CanViewScript;
+            scenePermissions.OnEditNotecard += CanEditNotecard;
+            scenePermissions.OnEditScript += CanEditScript;
+            scenePermissions.OnResetScript += CanResetScript;
+            scenePermissions.OnRunScript += CanRunScript;
+            scenePermissions.OnCompileScript += CanCompileScript;
             
-            m_scene.Permissions.OnTeleport += CanTeleport; 
-            
-            m_scene.Permissions.OnControlPrimMedia += CanControlPrimMedia;
-            m_scene.Permissions.OnInteractWithPrimMedia += CanInteractWithPrimMedia;
+            scenePermissions.OnCreateUserInventory += CanCreateUserInventory;
+            scenePermissions.OnCopyUserInventory += CanCopyUserInventory;
+            scenePermissions.OnEditUserInventory += CanEditUserInventory;
+            scenePermissions.OnDeleteUserInventory += CanDeleteUserInventory;
+
+            scenePermissions.OnControlPrimMedia += CanControlPrimMedia;
+            scenePermissions.OnInteractWithPrimMedia += CanInteractWithPrimMedia;
 
             m_scene.AddCommand("Users", this, "bypass permissions",
                     "bypass permissions <true / false>",
@@ -327,8 +341,8 @@ namespace OpenSim.Region.CoreModules.World.Permissions
             m_scene.AddCommand("Debug", this, "debug permissions",
                     "debug permissions <true / false>",
                     "Turn on permissions debugging",
-                    HandleDebugPermissions);                    
-                    
+                    HandleDebugPermissions);
+
         }
 
         public void RegionLoaded(Scene scene)
@@ -341,6 +355,79 @@ namespace OpenSim.Region.CoreModules.World.Permissions
                 return;
 
             m_scene.UnregisterModuleInterface<IPermissionsModule>(this);
+
+            scenePermissions.OnBypassPermissions -= BypassPermissions;
+            scenePermissions.OnSetBypassPermissions -= SetBypassPermissions;
+            scenePermissions.OnPropagatePermissions -= PropagatePermissions;
+
+            scenePermissions.OnIsGridGod -= IsGridAdministrator;
+            scenePermissions.OnIsAdministrator -= IsAdministrator;
+            scenePermissions.OnIsEstateManager -= IsEstateManager;
+
+            scenePermissions.OnGenerateClientFlags -= GenerateClientFlags;
+
+            scenePermissions.OnIssueEstateCommand -= CanIssueEstateCommand;
+            scenePermissions.OnRunConsoleCommand -= CanRunConsoleCommand;
+
+            scenePermissions.OnTeleport -= CanTeleport;
+
+            scenePermissions.OnInstantMessage -= CanInstantMessage;
+
+            scenePermissions.OnAbandonParcel -= CanAbandonParcel;
+            scenePermissions.OnReclaimParcel -= CanReclaimParcel;
+            scenePermissions.OnDeedParcel -= CanDeedParcel;
+            scenePermissions.OnSellParcel -= CanSellParcel;
+            scenePermissions.OnEditParcelProperties -= CanEditParcelProperties;
+            scenePermissions.OnTerraformLand -= CanTerraformLand;
+            scenePermissions.OnBuyLand -= CanBuyLand;
+
+            scenePermissions.OnRezObject -= CanRezObject;
+            scenePermissions.OnObjectEntry -= CanObjectEntry;
+            scenePermissions.OnObjectEnterWithScripts -= OnObjectEnterWithScripts;
+
+            scenePermissions.OnReturnObjects -= CanReturnObjects;
+
+            scenePermissions.OnDuplicateObject -= CanDuplicateObject;
+            scenePermissions.OnDeleteObjectByIDs -= CanDeleteObjectByIDs;
+            scenePermissions.OnDeleteObject -= CanDeleteObject;
+            scenePermissions.OnEditObjectByIDs -= CanEditObjectByIDs;
+            scenePermissions.OnEditObject -= CanEditObject;
+            scenePermissions.OnEditObjectPerms -= CanEditObjectPerms;
+            scenePermissions.OnInventoryTransfer -= CanInventoryTransfer;
+            scenePermissions.OnMoveObject -= CanMoveObject;
+            scenePermissions.OnTakeObject -= CanTakeObject;
+            scenePermissions.OnTakeCopyObject -= CanTakeCopyObject;
+            scenePermissions.OnLinkObject -= CanLinkObject;
+            scenePermissions.OnDelinkObject -= CanDelinkObject;
+            scenePermissions.OnDeedObject -= CanDeedObject;
+
+            scenePermissions.OnSellGroupObject -= CanSellGroupObject;
+            scenePermissions.OnSellObjectByUserID -= CanSellObjectByUserID;
+            scenePermissions.OnSellObject -= CanSellObject;
+            
+            scenePermissions.OnCreateObjectInventory -= CanCreateObjectInventory;
+            scenePermissions.OnEditObjectInventory -= CanEditObjectInventory;
+            scenePermissions.OnCopyObjectInventory -= CanCopyObjectInventory;
+            scenePermissions.OnDeleteObjectInventory -= CanDeleteObjectInventory;
+            scenePermissions.OnDoObjectInvToObjectInv -= CanDoObjectInvToObjectInv;
+            scenePermissions.OnDropInObjectInv -= CanDropInObjectInv;
+
+            scenePermissions.OnViewNotecard -= CanViewNotecard;
+            scenePermissions.OnViewScript -= CanViewScript;
+            scenePermissions.OnEditNotecard -= CanEditNotecard;
+            scenePermissions.OnEditScript -= CanEditScript;
+            scenePermissions.OnResetScript -= CanResetScript;
+            scenePermissions.OnRunScript -= CanRunScript;
+            scenePermissions.OnCompileScript -= CanCompileScript;
+            
+            scenePermissions.OnCreateUserInventory -= CanCreateUserInventory;
+            scenePermissions.OnCopyUserInventory -= CanCopyUserInventory;
+            scenePermissions.OnEditUserInventory -= CanEditUserInventory;
+            scenePermissions.OnDeleteUserInventory -= CanDeleteUserInventory;
+
+            scenePermissions.OnControlPrimMedia -= CanControlPrimMedia;
+            scenePermissions.OnInteractWithPrimMedia -= CanInteractWithPrimMedia;
+
         }
 
         public void Close()
@@ -349,7 +436,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
 
         public string Name
         {
-            get { return "PermissionsModule"; }
+            get { return "DefaultPermissionsModule"; }
         }
 
         public Type ReplaceableInterface
@@ -439,7 +526,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
         {
             m_scene.EventManager.TriggerPermissionError(user, reason);
         }
-        
+
         protected void DebugPermissionInformation(string permissionCalled)
         {
             if (m_debugPermissions)
@@ -469,7 +556,37 @@ namespace OpenSim.Region.CoreModules.World.Permissions
 
             return false;
         }
-         
+
+        protected bool GroupMemberPowers(UUID groupID, UUID userID, ref ulong powers)
+        {
+            powers = 0;
+            if (null == GroupsModule)
+                return false;
+
+            GroupMembershipData gmd = GroupsModule.GetMembershipData(groupID, userID);
+            
+            if (gmd != null)
+            {
+                powers = gmd.GroupPowers;
+                return true;
+            }
+            return false;
+        }
+
+        protected bool GroupMemberPowers(UUID groupID, ScenePresence sp, ref ulong powers)
+        {
+            powers = 0;
+            IClientAPI client = sp.ControllingClient;
+            if (client == null)
+                return false;
+
+            if(!client.IsGroupMember(groupID))
+                return false;
+            
+            powers =  client.GetGroupPowers(groupID);          
+            return true;
+        }
+
         /// <summary>
         /// Parse a user set configuration setting
         /// </summary>
@@ -481,28 +598,28 @@ namespace OpenSim.Region.CoreModules.World.Permissions
         {
             UserSet userSet = defaultValue;
 
-            string rawSetting = Util.GetConfigVarFromSections<string>(config, settingName, 
-                new string[] {"Startup", "Permissions"}, defaultValue.ToString()); 
-            
+            string rawSetting = Util.GetConfigVarFromSections<string>(config, settingName,
+                new string[] {"Startup", "Permissions"}, defaultValue.ToString());
+
             // Temporary measure to allow 'gods' to be specified in config for consistency's sake.  In the long term
             // this should disappear.
             if ("gods" == rawSetting.ToLower())
                 rawSetting = UserSet.Administrators.ToString();
-            
+
             // Doing it this was so that we can do a case insensitive conversion
             try
             {
                 userSet = (UserSet)Enum.Parse(typeof(UserSet), rawSetting, true);
             }
-            catch 
+            catch
             {
                 m_log.ErrorFormat(
                     "[PERMISSIONS]: {0} is not a valid {1} value, setting to {2}",
                     rawSetting, settingName, userSet);
             }
-            
+
             m_log.DebugFormat("[PERMISSIONS]: {0} {1}", settingName, userSet);
-            
+
             return userSet;
         }
 
@@ -516,13 +633,13 @@ namespace OpenSim.Region.CoreModules.World.Permissions
             if (user == UUID.Zero)
                 return false;
 
-            if (m_scene.RegionInfo.EstateSettings.EstateOwner == user && m_RegionOwnerIsGod)
+            if (m_RegionOwnerIsAdmin && m_scene.RegionInfo.EstateSettings.EstateOwner == user)
                 return true;
-            
-            if (IsEstateManager(user) && m_RegionManagerIsGod)
+
+            if (m_RegionManagerIsAdmin && IsEstateManager(user))
                 return true;
 
-            if (IsGridGod(user, null))
+            if (IsGridAdministrator(user))
                 return true;
 
             return false;
@@ -534,18 +651,19 @@ namespace OpenSim.Region.CoreModules.World.Permissions
         /// <param name="user">The user</param>
         /// <param name="scene">Unused, can be null</param>
         /// <returns></returns>
-        protected bool IsGridGod(UUID user, Scene scene)
+        protected bool IsGridAdministrator(UUID user)
         {
             DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
             if (m_bypassPermissions) return m_bypassPermissionsValue;
 
-            if (user == UUID.Zero) return false;
+            if (user == UUID.Zero)
+                return false;
 
-            if (m_allowGridGods)
+            if (m_allowGridAdmins)
             {
                 ScenePresence sp = m_scene.GetScenePresence(user);
                 if (sp != null)
-                    return (sp.UserLevel >= 200);
+                    return (sp.GodController.UserLevel >= 200);
 
                 UserAccount account = m_scene.UserAccountService.GetUserAccount(m_scene.RegionInfo.ScopeID, user);
                 if (account != null)
@@ -556,11 +674,11 @@ namespace OpenSim.Region.CoreModules.World.Permissions
         }
 
         protected bool IsFriendWithPerms(UUID user, UUID objectOwner)
-        {            
-            if (user == UUID.Zero)
+        {
+            if (FriendsModule == null)
                 return false;
 
-            if (FriendsModule == null)
+            if (user == UUID.Zero)
                 return false;
 
             int friendPerms = FriendsModule.GetRightsGrantedByFriend(user, objectOwner);
@@ -570,7 +688,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
         protected bool IsEstateManager(UUID user)
         {
             if (user == UUID.Zero) return false;
-        
+
             return m_scene.RegionInfo.EstateSettings.IsEstateManagerOrOwner(user);
         }
 
@@ -596,75 +714,178 @@ namespace OpenSim.Region.CoreModules.World.Permissions
 
         #region Object Permissions
 
-        public uint GenerateClientFlags(UUID user, UUID objID)
-        {
-            // Here's the way this works,
-            // ObjectFlags and Permission flags are two different enumerations
-            // ObjectFlags, however, tells the client to change what it will allow the user to do.
-            // So, that means that all of the permissions type ObjectFlags are /temporary/ and only
-            // supposed to be set when customizing the objectflags for the client.
+        const uint DEFAULT_FLAGS  = (uint)(
+            PrimFlags.ObjectCopy | // Tells client you can copy the object
+            PrimFlags.ObjectModify | // tells client you can modify the object
+            PrimFlags.ObjectMove |   // tells client that you can move the object (only, no mod)
+            PrimFlags.ObjectTransfer | // tells the client that you can /take/ the object if you don't own it
+            PrimFlags.ObjectYouOwner | // Tells client that you're the owner of the object
+            PrimFlags.ObjectAnyOwner | // Tells client that someone owns the object
+            PrimFlags.ObjectOwnerModify // Tells client that you're the owner of the object
+            );
+
+        const uint NOT_DEFAULT_FLAGS  = (uint)~(
+            PrimFlags.ObjectCopy | // Tells client you can copy the object
+            PrimFlags.ObjectModify | // tells client you can modify the object
+            PrimFlags.ObjectMove |   // tells client that you can move the object (only, no mod)
+            PrimFlags.ObjectTransfer | // tells the client that you can /take/ the object if you don't own it
+            PrimFlags.ObjectYouOwner | // Tells client that you're the owner of the object
+            PrimFlags.ObjectAnyOwner | // Tells client that someone owns the object
+            PrimFlags.ObjectOwnerModify // Tells client that you're the owner of the object
+            );
+
+        const uint EXTRAOWNERMASK = (uint)(
+                PrimFlags.ObjectYouOwner | 
+                PrimFlags.ObjectAnyOwner
+                );
+
+        const uint EXTRAGODMASK = (uint)(
+                PrimFlags.ObjectYouOwner | 
+                PrimFlags.ObjectAnyOwner |
+                PrimFlags.ObjectOwnerModify |
+                PrimFlags.ObjectModify |
+                PrimFlags.ObjectMove
+                );
+
+        const uint GOD_FLAGS  = (uint)(
+            PrimFlags.ObjectCopy | // Tells client you can copy the object
+            PrimFlags.ObjectModify | // tells client you can modify the object
+            PrimFlags.ObjectMove |   // tells client that you can move the object (only, no mod)
+            PrimFlags.ObjectTransfer | // tells the client that you can /take/ the object if you don't own it
+            PrimFlags.ObjectYouOwner | // Tells client that you're the owner of the object
+            PrimFlags.ObjectAnyOwner | // Tells client that someone owns the object
+            PrimFlags.ObjectOwnerModify // Tells client that you're the owner of the object
+            );
+
+        const uint LOCKED_GOD_FLAGS  = (uint)(
+            PrimFlags.ObjectCopy | // Tells client you can copy the object
+            PrimFlags.ObjectTransfer | // tells the client that you can /take/ the object if you don't own it
+            PrimFlags.ObjectYouOwner | // Tells client that you're the owner of the object
+            PrimFlags.ObjectAnyOwner // Tells client that someone owns the object
+            );
+
+        const uint SHAREDMASK  = (uint)(
+            PermissionMask.Move |
+            PermissionMask.Modify |
+            PermissionMask.Copy
+            );
+
+        public uint GenerateClientFlags(SceneObjectPart task, ScenePresence sp, uint curEffectivePerms)
+        {
+            if(sp == null  || task == null || curEffectivePerms == 0)
+                return 0;
 
-            // These temporary objectflags get computed and added in this function based on the
-            // Permission mask that's appropriate!
-            // Outside of this method, they should never be added to objectflags!
-            // -teravus
+            // Remove any of the objectFlags that are temporary.  These will get added back if appropriate
+            uint objflags = curEffectivePerms & NOT_DEFAULT_FLAGS ;
 
-            SceneObjectPart task = m_scene.GetSceneObjectPart(objID);
+            uint returnMask;
 
-            // this shouldn't ever happen..     return no permissions/objectflags.
-            if (task == null)
-                return (uint)0;
+            SceneObjectGroup grp = task.ParentGroup;
+            if(grp == null)
+                return 0;
 
-            uint objflags = task.GetEffectiveObjectFlags();
-            UUID objectOwner = task.OwnerID;
+            UUID taskOwnerID = task.OwnerID;
+            UUID spID = sp.UUID;
 
+            bool unlocked = (grp.RootPart.OwnerMask & (uint)PermissionMask.Move) != 0;
 
-            // Remove any of the objectFlags that are temporary.  These will get added back if appropriate
-            // in the next bit of code
-
-            // libomv will moan about PrimFlags.ObjectYouOfficer being
-            // deprecated
-#pragma warning disable 0612
-            objflags &= (uint)
-                ~(PrimFlags.ObjectCopy | // Tells client you can copy the object
-                    PrimFlags.ObjectModify | // tells client you can modify the object
-                    PrimFlags.ObjectMove |   // tells client that you can move the object (only, no mod)
-                    PrimFlags.ObjectTransfer | // tells the client that you can /take/ the object if you don't own it
-                    PrimFlags.ObjectYouOwner | // Tells client that you're the owner of the object
-                    PrimFlags.ObjectAnyOwner | // Tells client that someone owns the object
-                    PrimFlags.ObjectOwnerModify | // Tells client that you're the owner of the object
-                    PrimFlags.ObjectYouOfficer // Tells client that you've got group object editing permission. Used when ObjectGroupOwned is set
-                    );
-#pragma warning restore 0612
-
-            // Creating the three ObjectFlags options for this method to choose from.
-            // Customize the OwnerMask
-            uint objectOwnerMask = ApplyObjectModifyMasks(task.OwnerMask, objflags);
-            objectOwnerMask |= (uint)PrimFlags.ObjectYouOwner | (uint)PrimFlags.ObjectAnyOwner | (uint)PrimFlags.ObjectOwnerModify;
-
-            // Customize the GroupMask
-            uint objectGroupMask = ApplyObjectModifyMasks(task.GroupMask, objflags);
-
-            // Customize the EveryoneMask
-            uint objectEveryoneMask = ApplyObjectModifyMasks(task.EveryoneMask, objflags);
-            if (objectOwner != UUID.Zero)
-                objectEveryoneMask |= (uint)PrimFlags.ObjectAnyOwner;
-
-            PermissionClass permissionClass = GetPermissionClass(user, task);
-
-            switch (permissionClass)
+            if(sp.IsGod)
+            {
+                // do locked on objects owned by admin
+                if(!unlocked && spID == taskOwnerID)
+                    return objflags | LOCKED_GOD_FLAGS;
+                else
+                    return objflags | GOD_FLAGS;
+            }
+
+            //bypass option == owner rights
+            if (m_bypassPermissions)
+            {
+                returnMask = ApplyObjectModifyMasks(task.OwnerMask, objflags, true);  //??
+                returnMask |= EXTRAOWNERMASK;
+                if((returnMask & (uint)PrimFlags.ObjectModify) != 0)
+                    returnMask |= (uint)PrimFlags.ObjectOwnerModify;
+                return returnMask;
+            }
+
+            // owner
+            if (spID == taskOwnerID)
+            {
+                returnMask = ApplyObjectModifyMasks(grp.EffectiveOwnerPerms, objflags, unlocked);
+                returnMask |= EXTRAOWNERMASK;
+                if((returnMask & (uint)PrimFlags.ObjectModify) != 0)
+                    returnMask |= (uint)PrimFlags.ObjectOwnerModify;
+                return returnMask;
+            }
+
+            // if not god or owner, do attachments as everyone
+            if(task.ParentGroup.IsAttachment)
+            {
+                returnMask = ApplyObjectModifyMasks(grp.EffectiveEveryOnePerms, objflags, unlocked);
+                if (taskOwnerID != UUID.Zero)
+                    returnMask |= (uint)PrimFlags.ObjectAnyOwner;
+                return returnMask;
+            }
+
+            UUID taskGroupID = task.GroupID;
+            bool notGroupdOwned = taskOwnerID != taskGroupID;
+
+            // if friends with rights then owner
+            if (notGroupdOwned && IsFriendWithPerms(spID, taskOwnerID))
+            {
+                returnMask = ApplyObjectModifyMasks(grp.EffectiveOwnerPerms, objflags, unlocked);
+                returnMask |= EXTRAOWNERMASK;
+                if((returnMask & (uint)PrimFlags.ObjectModify) != 0)
+                    returnMask |= (uint)PrimFlags.ObjectOwnerModify;
+                return returnMask;
+            }
+
+            // group owned or shared ?
+            IClientAPI client = sp.ControllingClient;
+            ulong  powers = 0;
+            if(taskGroupID != UUID.Zero && GroupMemberPowers(taskGroupID, sp, ref powers))
             {
-                case PermissionClass.Owner:
-                    return objectOwnerMask;
-                case PermissionClass.Group:
-                    return objectGroupMask | objectEveryoneMask;
-                case PermissionClass.Everyone:
-                default:
-                    return objectEveryoneMask;
+                if(notGroupdOwned)
+                {
+                    // group sharing or everyone
+                    returnMask = ApplyObjectModifyMasks(grp.EffectiveGroupOrEveryOnePerms, objflags, unlocked);
+                    if (taskOwnerID != UUID.Zero)
+                        returnMask |= (uint)PrimFlags.ObjectAnyOwner;
+                    return returnMask;
+                }
+
+                // object is owned by group, check role powers
+                if((powers & (ulong)GroupPowers.ObjectManipulate) == 0)
+                {
+                    // group sharing or everyone
+                    returnMask = ApplyObjectModifyMasks(grp.EffectiveGroupOrEveryOnePerms, objflags, unlocked);
+                    returnMask |=
+                        (uint)PrimFlags.ObjectGroupOwned |
+                        (uint)PrimFlags.ObjectAnyOwner;
+                    return returnMask;
+                }
+
+                // we may have copy without transfer
+                uint grpEffectiveOwnerPerms = grp.EffectiveOwnerPerms;
+                if((grpEffectiveOwnerPerms & (uint)PermissionMask.Transfer) == 0)
+                    grpEffectiveOwnerPerms &= ~(uint)PermissionMask.Copy;
+                returnMask = ApplyObjectModifyMasks(grpEffectiveOwnerPerms, objflags, unlocked);
+                returnMask |= 
+                    (uint)PrimFlags.ObjectGroupOwned |
+                    (uint)PrimFlags.ObjectYouOwner;
+                if((returnMask & (uint)PrimFlags.ObjectModify) != 0)
+                    returnMask |= (uint)PrimFlags.ObjectOwnerModify;
+                return returnMask;
             }
+
+            // fallback is everyone rights
+            returnMask = ApplyObjectModifyMasks(grp.EffectiveEveryOnePerms, objflags, unlocked);
+            if (taskOwnerID != UUID.Zero)
+                returnMask |= (uint)PrimFlags.ObjectAnyOwner;
+            return returnMask;
         }
 
-        private uint ApplyObjectModifyMasks(uint setPermissionMask, uint objectFlagsMask)
+        private uint ApplyObjectModifyMasks(uint setPermissionMask, uint objectFlagsMask, bool unlocked)
         {
             // We are adding the temporary objectflags to the object's objectflags based on the
             // permission flag given.  These change the F flags on the client.
@@ -674,14 +895,17 @@ namespace OpenSim.Region.CoreModules.World.Permissions
                 objectFlagsMask |= (uint)PrimFlags.ObjectCopy;
             }
 
-            if ((setPermissionMask & (uint)PermissionMask.Move) != 0)
+            if (unlocked)
             {
-                objectFlagsMask |= (uint)PrimFlags.ObjectMove;
-            }
+                if ((setPermissionMask & (uint)PermissionMask.Move) != 0)
+                {
+                    objectFlagsMask |= (uint)PrimFlags.ObjectMove;
+                }
 
-            if ((setPermissionMask & (uint)PermissionMask.Modify) != 0)
-            {
-                objectFlagsMask |= (uint)PrimFlags.ObjectModify;
+                if ((setPermissionMask & (uint)PermissionMask.Modify) != 0)
+                {
+                    objectFlagsMask |= (uint)PrimFlags.ObjectModify;
+                }
             }
 
             if ((setPermissionMask & (uint)PermissionMask.Transfer) != 0)
@@ -692,6 +916,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
             return objectFlagsMask;
         }
 
+        // OARs still need this method that handles offline users
         public PermissionClass GetPermissionClass(UUID user, SceneObjectPart obj)
         {
             if (obj == null)
@@ -705,135 +930,199 @@ namespace OpenSim.Region.CoreModules.World.Permissions
             if (user == objectOwner)
                 return PermissionClass.Owner;
 
-            if (IsFriendWithPerms(user, objectOwner))
-                return PermissionClass.Owner;
-
-            // Estate users should be able to edit anything in the sim if RegionOwnerIsGod is set
-            if (m_RegionOwnerIsGod && IsEstateManager(user) && !IsAdministrator(objectOwner))
-                return PermissionClass.Owner;
-
             // Admin should be able to edit anything in the sim (including admin objects)
             if (IsAdministrator(user))
                 return PermissionClass.Owner;
 
-            // Users should be able to edit what is over their land.
-            Vector3 taskPos = obj.AbsolutePosition;
-            ILandObject parcel = m_scene.LandChannel.GetLandObject(taskPos.X, taskPos.Y);
-            if (parcel != null && parcel.LandData.OwnerID == user && m_ParcelOwnerIsGod)
+            if(!obj.ParentGroup.IsAttachment)
             {
-                // Admin objects should not be editable by the above
-                if (!IsAdministrator(objectOwner))
+                if (IsFriendWithPerms(user, objectOwner) )
                     return PermissionClass.Owner;
-            }
 
-            // Group permissions
-            if ((obj.GroupID != UUID.Zero) && IsGroupMember(obj.GroupID, user, 0))
-                return PermissionClass.Group;
+                // Group permissions
+                if (obj.GroupID != UUID.Zero && IsGroupMember(obj.GroupID, user, 0))
+                    return PermissionClass.Group;
+            }
 
             return PermissionClass.Everyone;
         }
 
-        /// <summary>
-        /// General permissions checks for any operation involving an object.  These supplement more specific checks
-        /// implemented by callers.
-        /// </summary>
-        /// <param name="currentUser"></param>
-        /// <param name="objId">This is a scene object group UUID</param>
-        /// <param name="denyOnLocked"></param>
-        /// <returns></returns>
-        protected bool GenericObjectPermission(UUID currentUser, UUID objId, bool denyOnLocked)
+        // get effective object permissions using user UUID. User rights will be fixed
+        protected uint GetObjectPermissions(UUID currentUser, SceneObjectGroup group, bool denyOnLocked)
         {
-            // Default: deny
-            bool permission = false;
-            bool locked = false;
-
-            SceneObjectPart part = m_scene.GetSceneObjectPart(objId);
+            if (group == null)
+                return 0;
 
-            if (part == null)
-                return false;
-
-            SceneObjectGroup group = part.ParentGroup;
+            SceneObjectPart root = group.RootPart;
+            if (root == null)
+                return 0;
 
             UUID objectOwner = group.OwnerID;
-            locked = ((group.RootPart.OwnerMask & PERM_LOCKED) == 0);
+            bool locked = denyOnLocked && ((root.OwnerMask & (uint)PermissionMask.Move) == 0);
 
-            // People shouldn't be able to do anything with locked objects, except the Administrator
-            // The 'set permissions' runs through a different permission check, so when an object owner
-            // sets an object locked, the only thing that they can do is unlock it.
-            //
-            // Nobody but the object owner can set permissions on an object
-            //
-            if (locked && (!IsAdministrator(currentUser)) && denyOnLocked)
+            if (IsAdministrator(currentUser))
             {
-                return false;
+                // do lock on admin owned objects
+                if(locked && currentUser == objectOwner)
+                    return (uint)(PermissionMask.AllEffective & ~(PermissionMask.Modify | PermissionMask.Move));
+                return (uint)PermissionMask.AllEffective;
             }
 
-            // Object owners should be able to edit their own content
+            uint lockmask = (uint)PermissionMask.AllEffective;
+            if(locked)
+                lockmask &= ~(uint)(PermissionMask.Modify | PermissionMask.Move);
+           
             if (currentUser == objectOwner)
+                return group.EffectiveOwnerPerms & lockmask;
+            
+            if (group.IsAttachment)
+                return 0;
+
+            UUID sogGroupID = group.GroupID;
+            bool notgroudOwned = sogGroupID != objectOwner;
+
+            if (notgroudOwned && IsFriendWithPerms(currentUser, objectOwner))
+                return group.EffectiveOwnerPerms  & lockmask;
+
+            ulong powers = 0;
+            if (sogGroupID != UUID.Zero && GroupMemberPowers(sogGroupID, currentUser, ref powers))
             {
-                // there is no way that later code can change this back to false
-                // so just return true immediately and short circuit the more
-                // expensive group checks
-                return true;
-                
-                //permission = true;
+                if(notgroudOwned)
+                    return  group.EffectiveGroupOrEveryOnePerms & lockmask;
+
+                if((powers & (ulong)GroupPowers.ObjectManipulate) == 0)
+                    return  group.EffectiveGroupOrEveryOnePerms & lockmask;
+
+                uint grpEffectiveOwnerPerms = group.EffectiveOwnerPerms & lockmask;
+                if((grpEffectiveOwnerPerms & (uint)PermissionMask.Transfer) == 0)
+                    grpEffectiveOwnerPerms &= ~(uint)PermissionMask.Copy;
+                return grpEffectiveOwnerPerms;
             }
-            else if (group.IsAttachment)
+
+            return group.EffectiveEveryOnePerms & lockmask;
+        }
+
+        // get effective object permissions using present presence. So some may depend on requested rights (ie God)
+        protected uint GetObjectPermissions(ScenePresence sp, SceneObjectGroup group, bool denyOnLocked)
+        {
+            if (sp == null || sp.IsDeleted || group == null || group.IsDeleted)
+                return 0;
+
+            SceneObjectPart root = group.RootPart;
+            if (root == null)
+                return 0;
+
+            UUID spID = sp.UUID;
+            UUID objectOwner = group.OwnerID;
+
+            bool locked = denyOnLocked && ((root.OwnerMask & (uint)PermissionMask.Move) == 0);
+
+            if (sp.IsGod)
             {
-                permission = false;
+                if(locked && spID == objectOwner)
+                    return (uint)(PermissionMask.AllEffective & ~(PermissionMask.Modify | PermissionMask.Move));
+                return (uint)PermissionMask.AllEffective;
             }
 
-//            m_log.DebugFormat(
-//                "[PERMISSIONS]: group.GroupID = {0}, part.GroupMask = {1}, isGroupMember = {2} for {3}", 
-//                group.GroupID,
-//                m_scene.GetSceneObjectPart(objId).GroupMask, 
-//                IsGroupMember(group.GroupID, currentUser, 0), 
-//                currentUser);
+            uint lockmask = (uint)PermissionMask.AllEffective;
+            if(locked)
+                lockmask &= ~(uint)(PermissionMask.Modify | PermissionMask.Move);
+           
+            if (spID == objectOwner)
+                return group.EffectiveOwnerPerms & lockmask;
             
-            // Group members should be able to edit group objects
-            if ((group.GroupID != UUID.Zero) 
-                && ((m_scene.GetSceneObjectPart(objId).GroupMask & (uint)PermissionMask.Modify) != 0) 
-                && IsGroupMember(group.GroupID, currentUser, 0))
-            {
-                // Return immediately, so that the administrator can shares group objects
-                return true;
-            }
+            if (group.IsAttachment)
+                return 0;
+          
+            UUID sogGroupID = group.GroupID;
+            bool notgroudOwned = sogGroupID != objectOwner;
 
-            // Friends with benefits should be able to edit the objects too
-            if (IsFriendWithPerms(currentUser, objectOwner))
-            {
-                // Return immediately, so that the administrator can share objects with friends
-                return true;
-            }
-        
-            // Users should be able to edit what is over their land.
-            ILandObject parcel = m_scene.LandChannel.GetLandObject(group.AbsolutePosition.X, group.AbsolutePosition.Y);
-            if ((parcel != null) && (parcel.LandData.OwnerID == currentUser))
-            {
-                permission = true;
-            }
+            if (notgroudOwned && IsFriendWithPerms(spID, objectOwner))
+                return group.EffectiveOwnerPerms  & lockmask;
 
-            // Estate users should be able to edit anything in the sim
-            if (IsEstateManager(currentUser))
+            ulong powers = 0;
+            if (sogGroupID != UUID.Zero && GroupMemberPowers(sogGroupID, sp, ref powers))
             {
-                permission = true;
+                if(notgroudOwned)
+                    return  group.EffectiveGroupOrEveryOnePerms & lockmask;
+
+                if((powers & (ulong)GroupPowers.ObjectManipulate) == 0)
+                    return  group.EffectiveGroupOrEveryOnePerms & lockmask;
+
+                uint grpEffectiveOwnerPerms = group.EffectiveOwnerPerms & lockmask;
+                if((grpEffectiveOwnerPerms & (uint)PermissionMask.Transfer) == 0)
+                    grpEffectiveOwnerPerms &= ~(uint)PermissionMask.Copy;
+                return grpEffectiveOwnerPerms;
             }
 
-            // Admin objects should not be editable by the above
-            if (IsAdministrator(objectOwner))
+            return group.EffectiveEveryOnePerms & lockmask;
+        }
+
+        private uint GetObjectItemPermissions(UUID userID, TaskInventoryItem ti)
+        {
+            UUID tiOwnerID = ti.OwnerID;
+            if(tiOwnerID == userID)
+                return ti.CurrentPermissions;
+            
+            if(IsAdministrator(userID))
+                return (uint)PermissionMask.AllEffective;
+            // ??           
+            if (IsFriendWithPerms(userID, tiOwnerID))
+                return ti.CurrentPermissions;
+
+            UUID tiGroupID = ti.GroupID;
+            if(tiGroupID != UUID.Zero)
             {
-                permission = false;
+                ulong powers = 0;
+                if(GroupMemberPowers(tiGroupID, userID, ref powers))
+                {
+                    if(tiGroupID == ti.OwnerID)
+                    {
+                        if((powers & (ulong)GroupPowers.ObjectManipulate) != 0)
+                            return ti.CurrentPermissions;
+                    }
+                    return ti.GroupPermissions;
+                } 
             }
 
-            // Admin should be able to edit anything in the sim (including admin objects)
-            if (IsAdministrator(currentUser))
+            return 0;
+        }
+
+        private uint GetObjectItemPermissions(ScenePresence sp, TaskInventoryItem ti, bool notEveryone)
+        {
+            UUID tiOwnerID = ti.OwnerID;
+            UUID spID = sp.UUID;
+
+            if(tiOwnerID == spID)
+                return ti.CurrentPermissions;
+ 
+            // ??           
+            if (IsFriendWithPerms(spID, tiOwnerID))
+                return ti.CurrentPermissions;
+
+            UUID tiGroupID = ti.GroupID;
+            if(tiGroupID != UUID.Zero)
             {
-                permission = true;
+                ulong powers = 0;
+                if(GroupMemberPowers(tiGroupID, spID, ref powers))
+                {
+                    if(tiGroupID == ti.OwnerID)
+                    {
+                        if((powers & (ulong)GroupPowers.ObjectManipulate) != 0)
+                            return ti.CurrentPermissions;
+                    }
+                    uint p = ti.GroupPermissions;
+                    if(!notEveryone)
+                        p |= ti.EveryonePermissions;
+                    return p;
+                } 
             }
 
-            return permission;
-        }
+            if(notEveryone)
+                return 0;
 
+            return ti.EveryonePermissions;
+        }
         #endregion
 
         #region Generic Permissions
@@ -858,97 +1147,45 @@ namespace OpenSim.Region.CoreModules.World.Permissions
 
         public bool GenericEstatePermission(UUID user)
         {
-            // Default: deny
-            bool permission = false;
-
             // Estate admins should be able to use estate tools
             if (IsEstateManager(user))
-                permission = true;
+                return true;
 
             // Administrators always have permission
             if (IsAdministrator(user))
-                permission = true;
+                return true;
 
-            return permission;
+            return false;
         }
 
-        protected bool GenericParcelPermission(UUID user, ILandObject parcel, ulong groupPowers)
-        {
-            bool permission = false;
-
-            if (parcel.LandData.OwnerID == user)
-            {
-                permission = true;
-            }
-
-            if ((parcel.LandData.GroupID != UUID.Zero) && IsGroupMember(parcel.LandData.GroupID, user, groupPowers))
-            {
-                permission = true;
-            }
-
-            if (IsEstateManager(user))
-            {
-                permission = true;
-            }
-
-            if (IsAdministrator(user))
-            {
-                permission = true;
-            }
-
-            if (m_SimpleBuildPermissions &&
-                (parcel.LandData.Flags & (uint)ParcelFlags.UseAccessList) == 0 && parcel.IsInLandAccessList(user))
-                permission = true;
-
-            return permission;
-        }
-    
         protected bool GenericParcelOwnerPermission(UUID user, ILandObject parcel, ulong groupPowers, bool allowEstateManager)
         {
             if (parcel.LandData.OwnerID == user)
-            {
-                // Returning immediately so that group deeded objects on group deeded land don't trigger a NRE on
-                // the subsequent redundant checks when using lParcelMediaCommandList()
-                // See http://opensimulator.org/mantis/view.php?id=3999 for more details
                 return true;
-            }
 
             if (parcel.LandData.IsGroupOwned && IsGroupMember(parcel.LandData.GroupID, user, groupPowers))
-            {
                 return true;
-            }
-    
+
             if (allowEstateManager && IsEstateManager(user))
-            {
                 return true;
-            }
 
             if (IsAdministrator(user))
-            {
                 return true;
-            }
 
             return false;
         }
-
-        protected bool GenericParcelPermission(UUID user, Vector3 pos, ulong groupPowers)
-        {
-            ILandObject parcel = m_scene.LandChannel.GetLandObject(pos.X, pos.Y);
-            if (parcel == null) return false;
-            return GenericParcelPermission(user, parcel, groupPowers);
-        }
 #endregion
 
         #region Permission Checks
-        private bool CanAbandonParcel(UUID user, ILandObject parcel, Scene scene)
+        private bool CanAbandonParcel(UUID user, ILandObject parcel)
         {
             DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
             if (m_bypassPermissions) return m_bypassPermissionsValue;
-        
+
             return GenericParcelOwnerPermission(user, parcel, (ulong)GroupPowers.LandRelease, false);
         }
 
-        private bool CanReclaimParcel(UUID user, ILandObject parcel, Scene scene)
+        private bool CanReclaimParcel(UUID user, ILandObject parcel)
         {
             DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
             if (m_bypassPermissions) return m_bypassPermissionsValue;
@@ -956,108 +1193,252 @@ namespace OpenSim.Region.CoreModules.World.Permissions
             return GenericParcelOwnerPermission(user, parcel, 0,true);
         }
 
-        private bool CanDeedParcel(UUID user, ILandObject parcel, Scene scene)
+        private bool CanDeedParcel(UUID user, ILandObject parcel)
         {
             DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
             if (m_bypassPermissions) return m_bypassPermissionsValue;
 
+            if(parcel.LandData.GroupID == UUID.Zero)
+                return false;
+
+            if (IsAdministrator(user))
+                return true;
+
             if (parcel.LandData.OwnerID != user) // Only the owner can deed!
                 return false;
 
-            ScenePresence sp = scene.GetScenePresence(user);
-            IClientAPI client = sp.ControllingClient;
+            ScenePresence sp = m_scene.GetScenePresence(user);
+            if(sp == null)
+                return false;
 
+            IClientAPI client = sp.ControllingClient;
             if ((client.GetGroupPowers(parcel.LandData.GroupID) & (ulong)GroupPowers.LandDeed) == 0)
                 return false;
 
-            return GenericParcelOwnerPermission(user, parcel, (ulong)GroupPowers.LandDeed, false);
+            return true;
         }
 
-        private bool CanDeedObject(UUID user, UUID group, Scene scene)
+        private bool CanDeedObject(ScenePresence sp, SceneObjectGroup sog, UUID targetGroupID)
         {
             DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
             if (m_bypassPermissions) return m_bypassPermissionsValue;
 
-            ScenePresence sp = scene.GetScenePresence(user);
-            IClientAPI client = sp.ControllingClient;
+            if(sog == null || sog.IsDeleted || sp == null || sp.IsDeleted || targetGroupID == UUID.Zero)
+                return false;
+
+            // object has group already?
+            if(sog.GroupID != targetGroupID)
+                return false;
+
+            // is effectivelly shared?            
+            if(sog.EffectiveGroupPerms == 0)
+                return false;
+
+            if(sp.IsGod)
+                return true;
+
+            // owned by requester?
+            if(sog.OwnerID != sp.UUID)
+                return false;
+
+            // owner can transfer?
+            if((sog.EffectiveOwnerPerms & (uint)PermissionMask.Transfer) == 0)
+                return false;
+            
+            // group member ? 
+            ulong powers = 0;
+            if(!GroupMemberPowers(targetGroupID, sp, ref powers))
+                return false;
 
-            if ((client.GetGroupPowers(group) & (ulong)GroupPowers.DeedObject) == 0)
+            // has group rights?
+            if ((powers & (ulong)GroupPowers.DeedObject) == 0)
                 return false;
 
             return true;
         }
 
-        private bool IsGod(UUID user, Scene scene)
+        private bool CanDuplicateObject(SceneObjectGroup sog, ScenePresence sp)
         {
             DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
             if (m_bypassPermissions) return m_bypassPermissionsValue;
 
-            return IsAdministrator(user);
+            if (sog == null || sog.IsDeleted || sp == null || sp.IsDeleted)
+                return false;
+
+            uint perms = GetObjectPermissions(sp, sog, false);
+            if((perms & (uint)PermissionMask.Copy) == 0)
+                return false;
+
+            if(sog.OwnerID != sp.UUID && (perms & (uint)PermissionMask.Transfer) == 0)
+                return false;
+
+            //If they can rez, they can duplicate
+            return CanRezObject(0, sp.UUID, sog.AbsolutePosition);
         }
 
-        private bool CanDuplicateObject(int objectCount, UUID objectID, UUID owner, Scene scene, Vector3 objectPosition)
+        private bool CanDeleteObject(SceneObjectGroup sog, ScenePresence sp)
         {
+            // ignoring locked. viewers should warn and ask for confirmation
+
             DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
             if (m_bypassPermissions) return m_bypassPermissionsValue;
 
-            if (!GenericObjectPermission(owner, objectID, true))
-            {
-                //They can't even edit the object
+            if (sog == null || sog.IsDeleted || sp == null || sp.IsDeleted)
                 return false;
-            }
-        
-            SceneObjectPart part = scene.GetSceneObjectPart(objectID);
-            if (part == null)
+
+            if(sog.IsAttachment)
                 return false;
 
-            if (part.OwnerID == owner)
+            UUID sogOwnerID = sog.OwnerID;
+            UUID spID = sp.UUID;
+
+            if(sogOwnerID == spID)
+                return true;
+
+            if (sp.IsGod)
+                return true;
+
+            if (IsFriendWithPerms(sog.UUID, sogOwnerID))
+                return true;
+
+            UUID sogGroupID = sog.GroupID;
+            if (sogGroupID != UUID.Zero)
             {
-                if ((part.OwnerMask & PERM_COPY) == 0)
-                    return false;
+                ulong powers = 0;
+                if(GroupMemberPowers(sogGroupID, sp, ref powers))
+                {
+                    if(sogGroupID == sogOwnerID)
+                    {
+                        if((powers & (ulong)GroupPowers.ObjectManipulate) != 0)
+                            return true;
+                    }
+                    return  (sog.EffectiveGroupPerms & (uint)PermissionMask.Modify) != 0;
+                } 
             }
-            else if (part.GroupID != UUID.Zero)
-            {
-                if ((part.OwnerID == part.GroupID) && ((owner != part.LastOwnerID) || ((part.GroupMask & PERM_TRANS) == 0)))
-                    return false;
+            return false;
+        }
 
-                if ((part.GroupMask & PERM_COPY) == 0)
-                    return false;
+        private bool CanDeleteObjectByIDs(UUID objectID, UUID userID)
+        {
+            // ignoring locked. viewers should warn and ask for confirmation
+
+            DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
+            if (m_bypassPermissions) return m_bypassPermissionsValue;
+
+            SceneObjectGroup sog = m_scene.GetGroupByPrim(objectID);
+            if (sog == null)
+                return false;
+
+            if(sog.IsAttachment)
+                return false;
+
+            UUID sogOwnerID = sog.OwnerID;
+
+            if(sogOwnerID == userID)
+                return true;
+
+            if (IsAdministrator(userID))
+                return true;
+
+            if (IsFriendWithPerms(objectID, sogOwnerID))
+                return true;
+
+            UUID sogGroupID = sog.GroupID;
+            if (sogGroupID != UUID.Zero)
+            {
+                ulong powers = 0;
+                if(GroupMemberPowers(sogGroupID, userID, ref powers))
+                {
+                    if(sogGroupID == sogOwnerID)
+                    {
+                        if((powers & (ulong)GroupPowers.ObjectManipulate) != 0)
+                            return true;
+                    }
+                    return  (sog.EffectiveGroupPerms & (uint)PermissionMask.Modify) != 0;
+                } 
             }
-        
-            //If they can rez, they can duplicate
-            return CanRezObject(objectCount, owner, objectPosition, scene);
+            return false;
+        }
+
+        private bool CanEditObjectByIDs(UUID objectID, UUID userID)
+        {
+            DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
+            if (m_bypassPermissions) return m_bypassPermissionsValue;
+
+            SceneObjectGroup sog = m_scene.GetGroupByPrim(objectID);
+            if (sog == null)
+                return false;
+
+            uint perms = GetObjectPermissions(userID, sog, true);
+            if((perms & (uint)PermissionMask.Modify) == 0)
+                return false;
+            return true;
         }
 
-        private bool CanDeleteObject(UUID objectID, UUID deleter, Scene scene)
+        private bool CanEditObject(SceneObjectGroup sog, ScenePresence sp)
         {
             DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
             if (m_bypassPermissions) return m_bypassPermissionsValue;
 
-            return GenericObjectPermission(deleter, objectID, false);
+            if(sog == null || sog.IsDeleted || sp == null || sp.IsDeleted)
+                return false;
+
+            uint perms = GetObjectPermissions(sp, sog, true);
+            if((perms & (uint)PermissionMask.Modify) == 0)
+                return false;
+            return true;
         }
 
-        private bool CanEditObject(UUID objectID, UUID editorID, Scene scene)
+        private bool CanEditObjectPerms(SceneObjectGroup sog, UUID userID)
         {
             DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
             if (m_bypassPermissions) return m_bypassPermissionsValue;
 
-            return GenericObjectPermission(editorID, objectID, false);
+            if (sog == null)
+                return false;
+
+            if(sog.OwnerID == userID || IsAdministrator(userID))
+                return true;
+
+            UUID sogGroupID = sog.GroupID;
+            if(sogGroupID == UUID.Zero || sogGroupID != sog.OwnerID)
+                return false;
+
+            uint perms = sog.EffectiveOwnerPerms;
+            if((perms & (uint)PermissionMask.Modify) == 0)
+                return false;
+
+            ulong powers = 0;
+            if(GroupMemberPowers(sogGroupID, userID, ref powers))
+            {
+                if((powers & (ulong)GroupPowers.ObjectManipulate) != 0)
+                    return true;
+            }
+
+            return false;
         }
 
-        private bool CanEditObjectInventory(UUID objectID, UUID editorID, Scene scene)
+        private bool CanEditObjectInventory(UUID objectID, UUID userID)
         {
             DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
             if (m_bypassPermissions) return m_bypassPermissionsValue;
 
-            return GenericObjectPermission(editorID, objectID, false);
+            SceneObjectGroup sog = m_scene.GetGroupByPrim(objectID);
+            if (sog == null)
+                return false;
+
+            uint perms = GetObjectPermissions(userID, sog, true);
+            if((perms & (uint)PermissionMask.Modify) == 0)
+                return false;
+            return true;
         }
 
-        private bool CanEditParcelProperties(UUID user, ILandObject parcel, GroupPowers p, Scene scene)
+        private bool CanEditParcelProperties(UUID userID, ILandObject parcel, GroupPowers p, bool allowManager)
         {
             DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
             if (m_bypassPermissions) return m_bypassPermissionsValue;
 
-            return GenericParcelOwnerPermission(user, parcel, (ulong)p, false);
+            return GenericParcelOwnerPermission(userID, parcel, (ulong)p, false);
         }
 
         /// <summary>
@@ -1068,18 +1449,18 @@ namespace OpenSim.Region.CoreModules.World.Permissions
         /// <param name="user"></param>
         /// <param name="scene"></param>
         /// <returns></returns>
-        private bool CanEditScript(UUID script, UUID objectID, UUID user, Scene scene)
+        private bool CanEditScript(UUID script, UUID objectID, UUID userID)
         {
             DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
             if (m_bypassPermissions) return m_bypassPermissionsValue;
-                            
-            if (m_allowedScriptEditors == UserSet.Administrators && !IsAdministrator(user))
+
+            if (m_allowedScriptEditors == UserSet.Administrators && !IsAdministrator(userID))
                 return false;
-            
+
             // Ordinarily, if you can view it, you can edit it
             // There is no viewing a no mod script
             //
-            return CanViewScript(script, objectID, user, scene);
+            return CanViewScript(script, objectID, userID);
         }
 
         /// <summary>
@@ -1090,7 +1471,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
         /// <param name="user"></param>
         /// <param name="scene"></param>
         /// <returns></returns>
-        private bool CanEditNotecard(UUID notecard, UUID objectID, UUID user, Scene scene)
+        private bool CanEditNotecard(UUID notecard, UUID objectID, UUID user)
         {
             DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
             if (m_bypassPermissions) return m_bypassPermissionsValue;
@@ -1098,8 +1479,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
             if (objectID == UUID.Zero) // User inventory
             {
                 IInventoryService invService = m_scene.InventoryService;
-                InventoryItemBase assetRequestItem = new InventoryItemBase(notecard, user);
-                assetRequestItem = invService.GetItem(assetRequestItem);
+                InventoryItemBase assetRequestItem = invService.GetItem(user, notecard);
                 if (assetRequestItem == null && LibraryRootFolder != null) // Library item
                 {
                     assetRequestItem = LibraryRootFolder.FindItem(notecard);
@@ -1122,69 +1502,68 @@ namespace OpenSim.Region.CoreModules.World.Permissions
             }
             else // Prim inventory
             {
-                SceneObjectPart part = scene.GetSceneObjectPart(objectID);
-
+                SceneObjectPart part = m_scene.GetSceneObjectPart(objectID);
                 if (part == null)
                     return false;
 
-                if (part.OwnerID != user)
-                {
-                    if (part.GroupID == UUID.Zero)
-                        return false;
+                SceneObjectGroup sog = part.ParentGroup;
+                if (sog == null)
+                    return false;
 
-                    if (!IsGroupMember(part.GroupID, user, 0))
-                        return false;
-            
-                    if ((part.GroupMask & (uint)PermissionMask.Modify) == 0)
-                        return false;
-                } 
-                else
-                {
-                    if ((part.OwnerMask & (uint)PermissionMask.Modify) == 0)
+                // check object mod right
+                uint perms = GetObjectPermissions(user, sog, true);
+                if((perms & (uint)PermissionMask.Modify) == 0)
                     return false;
-                }
 
                 TaskInventoryItem ti = part.Inventory.GetInventoryItem(notecard);
-
                 if (ti == null)
                     return false;
-
+               
                 if (ti.OwnerID != user)
                 {
-                    if (ti.GroupID == UUID.Zero)
+                    UUID tiGroupID = ti.GroupID;
+                    if (tiGroupID == UUID.Zero)
                         return false;
 
-                    if (!IsGroupMember(ti.GroupID, user, 0))
+                    ulong powers = 0;
+                    if(!GroupMemberPowers(tiGroupID, user, ref powers))
                         return false;
+
+                    if(tiGroupID == ti.OwnerID && (powers & (ulong)GroupPowers.ObjectManipulate) != 0)
+                    {
+                        if ((ti.CurrentPermissions & ((uint)PermissionMask.Modify | (uint)PermissionMask.Copy)) ==
+                        ((uint)PermissionMask.Modify | (uint)PermissionMask.Copy))
+                            return true;
+                    }
+                    if ((ti.GroupPermissions & ((uint)PermissionMask.Modify | (uint)PermissionMask.Copy)) ==
+                        ((uint)PermissionMask.Modify | (uint)PermissionMask.Copy))
+                        return true;
+                    return false;
                 }
 
                 // Require full perms
-                if ((ti.CurrentPermissions &
-                        ((uint)PermissionMask.Modify |
-                        (uint)PermissionMask.Copy)) !=
-                        ((uint)PermissionMask.Modify |
-                        (uint)PermissionMask.Copy))
+                if ((ti.CurrentPermissions & ((uint)PermissionMask.Modify | (uint)PermissionMask.Copy)) !=
+                        ((uint)PermissionMask.Modify | (uint)PermissionMask.Copy))
                     return false;
             }
-
             return true;
         }
 
-        private bool CanInstantMessage(UUID user, UUID target, Scene startScene)
+        private bool CanInstantMessage(UUID user, UUID target)
         {
             DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
             if (m_bypassPermissions) return m_bypassPermissionsValue;
 
             // If the sender is an object, check owner instead
             //
-            SceneObjectPart part = startScene.GetSceneObjectPart(user);
+            SceneObjectPart part = m_scene.GetSceneObjectPart(user);
             if (part != null)
                 user = part.OwnerID;
 
             return GenericCommunicationPermission(user, target);
         }
 
-        private bool CanInventoryTransfer(UUID user, UUID target, Scene startScene)
+        private bool CanInventoryTransfer(UUID user, UUID target)
         {
             DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
             if (m_bypassPermissions) return m_bypassPermissionsValue;
@@ -1192,7 +1571,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
             return GenericCommunicationPermission(user, target);
         }
 
-        private bool CanIssueEstateCommand(UUID user, Scene requestFromScene, bool ownerCommand)
+        private bool CanIssueEstateCommand(UUID user, bool ownerCommand)
         {
             DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
             if (m_bypassPermissions) return m_bypassPermissionsValue;
@@ -1200,174 +1579,161 @@ namespace OpenSim.Region.CoreModules.World.Permissions
             if (IsAdministrator(user))
                 return true;
 
-            if (m_scene.RegionInfo.EstateSettings.IsEstateOwner(user))
-                return true;
-
             if (ownerCommand)
-                return false;
+                return m_scene.RegionInfo.EstateSettings.IsEstateOwner(user);
 
-            return GenericEstatePermission(user);
+            return IsEstateManager(user);
         }
 
-        private bool CanMoveObject(UUID objectID, UUID moverID, Scene scene)
+        private bool CanMoveObject(SceneObjectGroup sog, ScenePresence sp)
         {
             DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
+
+            if(sog == null || sog.IsDeleted || sp == null || sp.IsDeleted)
+                return false;
+
             if (m_bypassPermissions)
             {
-                SceneObjectPart part = scene.GetSceneObjectPart(objectID);
-                if (part.OwnerID != moverID)
-                {
-                    if (!part.ParentGroup.IsDeleted)
-                    {
-                        if (part.ParentGroup.IsAttachment)
-                            return false;
-                    }
-                }
+                if (sog.OwnerID != sp.UUID && sog.IsAttachment)
+                    return false;
                 return m_bypassPermissionsValue;
             }
 
-            bool permission = GenericObjectPermission(moverID, objectID, true);
-            if (!permission)
-            {
-                if (!m_scene.Entities.ContainsKey(objectID))
-                {
-                    return false;
-                }
+            uint perms = GetObjectPermissions(sp, sog, true);
+            if((perms & (uint)PermissionMask.Move) == 0)
+                return false;
+            return true;
+        }
 
-                // The client
-                // may request to edit linked parts, and therefore, it needs
-                // to also check for SceneObjectPart
+        private bool CanObjectEntry(SceneObjectGroup sog, bool enteringRegion, Vector3 newPoint)
+        {
+            DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
 
-                // If it's not an object, we cant edit it.
-                if ((!(m_scene.Entities[objectID] is SceneObjectGroup)))
-                {
-                    return false;
-                }
+            float newX = newPoint.X;
+            float newY = newPoint.Y;
 
+            // allow outside region this is needed for crossings
+            if (newX < -1f || newX > (m_scene.RegionInfo.RegionSizeX + 1.0f) ||
+                newY < -1f || newY > (m_scene.RegionInfo.RegionSizeY + 1.0f) )
+                return true;
 
-                SceneObjectGroup task = (SceneObjectGroup)m_scene.Entities[objectID];
+            if(sog == null || sog.IsDeleted)
+                return false;
 
+            if (m_bypassPermissions)
+                return m_bypassPermissionsValue;
 
-                // UUID taskOwner = null;
-                // Added this because at this point in time it wouldn't be wise for
-                // the administrator object permissions to take effect.
-                // UUID objectOwner = task.OwnerID;
+            ILandObject parcel = m_scene.LandChannel.GetLandObject(newX, newY);
+            if (parcel == null)
+                return false;
 
-                // Anyone can move
-                if ((task.RootPart.EveryoneMask & PERM_MOVE) != 0)
-                    permission = true;
+            if ((parcel.LandData.Flags & ((int)ParcelFlags.AllowAPrimitiveEntry)) != 0)
+                return true;
 
-                // Locked
-                if ((task.RootPart.OwnerMask & PERM_LOCKED) == 0)
-                    permission = false;
-            }
-            else
+            if (!enteringRegion)
             {
-                bool locked = false;
-                if (!m_scene.Entities.ContainsKey(objectID))
-                {
-                    return false;
-                }
-
-                // If it's not an object, we cant edit it.
-                if ((!(m_scene.Entities[objectID] is SceneObjectGroup)))
-                {
-                    return false;
-                }
+                Vector3 oldPoint = sog.AbsolutePosition;
+                ILandObject fromparcel = m_scene.LandChannel.GetLandObject(oldPoint.X, oldPoint.Y);
+                if (fromparcel != null && fromparcel.Equals(parcel)) // it already entered parcel ????
+                    return true;
+            }
 
-                SceneObjectGroup group = (SceneObjectGroup)m_scene.Entities[objectID];
+            UUID userID = sog.OwnerID;
+            LandData landdata = parcel.LandData;
 
-                UUID objectOwner = group.OwnerID;
-                locked = ((group.RootPart.OwnerMask & PERM_LOCKED) == 0);
+            if (landdata.OwnerID == userID)
+                return true;
 
-                // This is an exception to the generic object permission.
-                // Administrators who lock their objects should not be able to move them,
-                // however generic object permission should return true.
-                // This keeps locked objects from being affected by random click + drag actions by accident
-                // and allows the administrator to grab or delete a locked object.
+            if (IsAdministrator(userID))
+                return true;
 
-                // Administrators and estate managers are still able to click+grab locked objects not
-                // owned by them in the scene
-                // This is by design.
+            UUID landGroupID = landdata.GroupID;
+            if (landGroupID != UUID.Zero)
+            {
+                if ((parcel.LandData.Flags & ((int)ParcelFlags.AllowGroupObjectEntry)) != 0)
+                    return IsGroupMember(landGroupID, userID, 0);
 
-                if (locked && (moverID == objectOwner))
-                    return false;
+                 if (landdata.IsGroupOwned && IsGroupMember(landGroupID, userID, (ulong)GroupPowers.AllowRez))
+                    return true;
             }
-            return permission;
+
+            //Otherwise, false!
+            return false;
         }
 
-        private bool CanObjectEntry(UUID objectID, bool enteringRegion, Vector3 newPoint, Scene scene)
+        private bool OnObjectEnterWithScripts(SceneObjectGroup sog, ILandObject parcel)
         {
             DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
-            if (m_bypassPermissions) return m_bypassPermissionsValue;
 
-            if ((newPoint.X > 257f || newPoint.X < -1f || newPoint.Y > 257f || newPoint.Y < -1f))
-            {
-                return true;
-            }
+            if(sog == null || sog.IsDeleted)
+                return false;
 
-            SceneObjectGroup task = (SceneObjectGroup)m_scene.Entities[objectID];
+            if (m_bypassPermissions)
+                return m_bypassPermissionsValue;
 
-            ILandObject land = m_scene.LandChannel.GetLandObject(newPoint.X, newPoint.Y);
+            if (parcel == null)
+                return true;
 
-            if (!enteringRegion)
-            {
-                ILandObject fromland = m_scene.LandChannel.GetLandObject(task.AbsolutePosition.X, task.AbsolutePosition.Y);
+            int checkflags = ((int)ParcelFlags.AllowAPrimitiveEntry);
+            bool scripts = (sog.ScriptCount() > 0);
+            if(scripts)
+                checkflags |= ((int)ParcelFlags.AllowOtherScripts);
 
-                if (fromland == land) // Not entering
-                    return true;
-            }
+            if ((parcel.LandData.Flags & checkflags) == checkflags)
+                return true;
 
-            if (land == null)
-            {
-                return false;
-            }
+            UUID userID = sog.OwnerID;
+            LandData landdata = parcel.LandData;
 
-            if ((land.LandData.Flags & ((int)ParcelFlags.AllowAPrimitiveEntry)) != 0)
-            {
+            if (landdata.OwnerID == userID)
                 return true;
-            }
 
-            if (!m_scene.Entities.ContainsKey(objectID))
-            {
-                return false;
-            }
+            if (IsAdministrator(userID))
+                return true;
 
-            // If it's not an object, we cant edit it.
-            if (!(m_scene.Entities[objectID] is SceneObjectGroup))
+            UUID landGroupID = landdata.GroupID;
+            if (landGroupID != UUID.Zero)
             {
-                return false;
-            }
+                checkflags = (int)ParcelFlags.AllowGroupObjectEntry;
+                if(scripts)
+                    checkflags |= ((int)ParcelFlags.AllowGroupScripts);
 
+                if ((parcel.LandData.Flags & checkflags) == checkflags)
+                    return IsGroupMember(landGroupID, userID, 0);
 
-            if (GenericParcelPermission(task.OwnerID, newPoint, 0))
-            {
-                return true;
+                 if (landdata.IsGroupOwned && IsGroupMember(landGroupID, userID, (ulong)GroupPowers.AllowRez))
+                    return true;
             }
 
             //Otherwise, false!
             return false;
         }
 
-        private bool CanReturnObjects(ILandObject land, UUID user, List<SceneObjectGroup> objects, Scene scene)
+        private bool CanReturnObjects(ILandObject land, ScenePresence sp, List<SceneObjectGroup> objects)
         {
             DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
             if (m_bypassPermissions) return m_bypassPermissionsValue;
 
-            GroupPowers powers;
-            ILandObject l;
+            if(sp == null)
+                return true;  // assuming that in this case rights are as owner
 
-            ScenePresence sp = scene.GetScenePresence(user);
-            if (sp == null)
-                return false;
+            UUID userID = sp.UUID;
+            bool isPrivUser = sp.IsGod || IsEstateManager(userID);
 
             IClientAPI client = sp.ControllingClient;
 
+            ulong powers = 0;
+            ILandObject l;
+
             foreach (SceneObjectGroup g in new List<SceneObjectGroup>(objects))
             {
-                // Any user can return their own objects at any time
-                //
-                if (GenericObjectPermission(user, g.UUID, false))
+                if(g.IsAttachment)
+                {
+                    objects.Remove(g);
+                    continue;
+                }
+
+                if (isPrivUser || g.OwnerID == userID)
                     continue;
 
                 // This is a short cut for efficiency. If land is non-null,
@@ -1381,39 +1747,40 @@ namespace OpenSim.Region.CoreModules.World.Permissions
                 else
                 {
                     Vector3 pos = g.AbsolutePosition;
-
-                    l = scene.LandChannel.GetLandObject(pos.X, pos.Y);
+                    l = m_scene.LandChannel.GetLandObject(pos.X, pos.Y);
                 }
 
                 // If it's not over any land, then we can't do a thing
-                if (l == null)
+                if (l == null || l.LandData == null)
                 {
                     objects.Remove(g);
                     continue;
                 }
 
+                LandData ldata = l.LandData;
                 // If we own the land outright, then allow
                 //
-                if (l.LandData.OwnerID == user)
+                if (ldata.OwnerID == userID)
                     continue;
 
                 // Group voodoo
                 //
-                if (l.LandData.IsGroupOwned)
+                if (ldata.IsGroupOwned)
                 {
-                    powers = (GroupPowers)client.GetGroupPowers(l.LandData.GroupID);
+                    UUID lGroupID = ldata.GroupID;
                     // Not a group member, or no rights at all
                     //
-                    if (powers == (GroupPowers)0)
+                    powers = client.GetGroupPowers(lGroupID);
+                    if(powers == 0)
                     {
                         objects.Remove(g);
                         continue;
                     }
-
+ 
                     // Group deeded object?
                     //
-                    if (g.OwnerID == l.LandData.GroupID &&
-                        (powers & GroupPowers.ReturnGroupOwned) == (GroupPowers)0)
+                    if (g.OwnerID == lGroupID &&
+                        (powers & (ulong)GroupPowers.ReturnGroupOwned) == 0)
                     {
                         objects.Remove(g);
                         continue;
@@ -1421,14 +1788,14 @@ namespace OpenSim.Region.CoreModules.World.Permissions
 
                     // Group set object?
                     //
-                    if (g.GroupID == l.LandData.GroupID &&
-                        (powers & GroupPowers.ReturnGroupSet) == (GroupPowers)0)
+                    if (g.GroupID == lGroupID &&
+                        (powers & (ulong)GroupPowers.ReturnGroupSet) == 0)
                     {
                         objects.Remove(g);
                         continue;
                     }
 
-                    if ((powers & GroupPowers.ReturnNonGroup) == (GroupPowers)0)
+                    if ((powers & (ulong)GroupPowers.ReturnNonGroup) == 0)
                     {
                         objects.Remove(g);
                         continue;
@@ -1451,41 +1818,41 @@ namespace OpenSim.Region.CoreModules.World.Permissions
             return true;
         }
 
-        private bool CanRezObject(int objectCount, UUID owner, Vector3 objectPosition, Scene scene)
+        private bool CanRezObject(int objectCount, UUID userID, Vector3 objectPosition)
         {
             DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
-            if (m_bypassPermissions) return m_bypassPermissionsValue;
+            if (m_bypassPermissions)
+                return m_bypassPermissionsValue;
 
 //            m_log.DebugFormat("[PERMISSIONS MODULE]: Checking rez object at {0} in {1}", objectPosition, m_scene.Name);
 
             ILandObject parcel = m_scene.LandChannel.GetLandObject(objectPosition.X, objectPosition.Y);
-            if (parcel == null)
+            if (parcel == null || parcel.LandData == null)
                 return false;
 
-            if ((parcel.LandData.Flags & (uint)ParcelFlags.CreateObjects) != 0)
-            {
-                return true;
-            }
-            else if ((owner == parcel.LandData.OwnerID) || IsAdministrator(owner))
-            {
+            LandData landdata = parcel.LandData;
+            if ((userID == landdata.OwnerID))
                 return true;
-            }
-            else if (((parcel.LandData.Flags & (uint)ParcelFlags.CreateGroupObjects) != 0)
-                && (parcel.LandData.GroupID != UUID.Zero) && IsGroupMember(parcel.LandData.GroupID, owner, 0))
-            {
+
+            if ((landdata.Flags & (uint)ParcelFlags.CreateObjects) != 0)
                 return true;
-            }
-            else if (parcel.LandData.GroupID != UUID.Zero && IsGroupMember(parcel.LandData.GroupID, owner, (ulong)GroupPowers.AllowRez))
-            {
+
+            if(IsAdministrator(userID))
                 return true;
-            }
-            else
+
+            if(landdata.GroupID != UUID.Zero)
             {
-                return false;
+                if ((landdata.Flags & (uint)ParcelFlags.CreateGroupObjects) != 0)
+                    return IsGroupMember(landdata.GroupID, userID, 0);
+
+                if (landdata.IsGroupOwned && IsGroupMember(landdata.GroupID, userID, (ulong)GroupPowers.AllowRez))
+                    return true;
             }
+
+            return false;
         }
 
-        private bool CanRunConsoleCommand(UUID user, Scene requestFromScene)
+        private bool CanRunConsoleCommand(UUID user)
         {
             DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
             if (m_bypassPermissions) return m_bypassPermissionsValue;
@@ -1494,82 +1861,214 @@ namespace OpenSim.Region.CoreModules.World.Permissions
             return IsAdministrator(user);
         }
 
-        private bool CanRunScript(UUID script, UUID objectID, UUID user, Scene scene)
+        private bool CanRunScript(TaskInventoryItem scriptitem, SceneObjectPart part)
         {
             DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
             if (m_bypassPermissions) return m_bypassPermissionsValue;
 
-            return true;
+            if(scriptitem == null || part == null)
+                return false;
+
+            SceneObjectGroup sog = part.ParentGroup;
+            if(sog == null)
+                return false;
+
+            Vector3 pos = sog.AbsolutePosition;
+            ILandObject parcel = m_scene.LandChannel.GetLandObject(pos.X, pos.Y);
+            if (parcel == null)
+                return false;
+
+            LandData ldata = parcel.LandData;
+            if(ldata == null)
+                return false;
+
+            uint lflags = ldata.Flags;
+ 
+            if ((lflags & (uint)ParcelFlags.AllowOtherScripts) != 0)
+               return true;
+
+            if ((part.OwnerID == ldata.OwnerID))
+                return true;
+
+            if (((lflags & (uint)ParcelFlags.AllowGroupScripts) != 0)
+                    && (ldata.GroupID != UUID.Zero) && (ldata.GroupID == part.GroupID))
+                return true;
+            
+            return GenericEstatePermission(part.OwnerID);
         }
 
-        private bool CanSellParcel(UUID user, ILandObject parcel, Scene scene)
+        private bool CanSellParcel(UUID user, ILandObject parcel)
         {
             DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
             if (m_bypassPermissions) return m_bypassPermissionsValue;
 
-            return GenericParcelOwnerPermission(user, parcel, (ulong)GroupPowers.LandSetSale, false);
+            return GenericParcelOwnerPermission(user, parcel, (ulong)GroupPowers.LandSetSale, true);
         }
 
-        private bool CanTakeObject(UUID objectID, UUID stealer, Scene scene)
+        private bool CanSellGroupObject(UUID userID, UUID groupID)
         {
             DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
             if (m_bypassPermissions) return m_bypassPermissionsValue;
 
-            return GenericObjectPermission(stealer,objectID, false);
+            return IsGroupMember(groupID, userID, (ulong)GroupPowers.ObjectSetForSale);
         }
 
-        private bool CanTakeCopyObject(UUID objectID, UUID userID, Scene inScene)
+        private bool CanSellObjectByUserID(SceneObjectGroup sog, UUID userID, byte saleType)
         {
             DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
             if (m_bypassPermissions) return m_bypassPermissionsValue;
 
-            bool permission = GenericObjectPermission(userID, objectID, false);
+            if (sog == null || sog.IsDeleted || userID == UUID.Zero)
+                return false;
 
-            SceneObjectGroup so = (SceneObjectGroup)m_scene.Entities[objectID];
+            // sell is not a attachment op
+            if(sog.IsAttachment)
+                return false;
 
-            if (!permission)
-            {
-                if (!m_scene.Entities.ContainsKey(objectID))
-                {
-                    return false;
-                }
+            if(IsAdministrator(userID))
+                return true;
 
-                // If it's not an object, we cant edit it.
-                if (!(m_scene.Entities[objectID] is SceneObjectGroup))
-                {
-                    return false;
-                }
+            uint sogEffectiveOwnerPerms = sog.EffectiveOwnerPerms;
+            if((sogEffectiveOwnerPerms & (uint)PermissionMask.Transfer) == 0)
+                return false;
 
-                // UUID taskOwner = null;
-                // Added this because at this point in time it wouldn't be wise for
-                // the administrator object permissions to take effect.
-                // UUID objectOwner = task.OwnerID;
+            if(saleType == (byte)SaleType.Copy &&
+                    (sogEffectiveOwnerPerms & (uint)PermissionMask.Copy) == 0)
+                return false;
 
-                if ((so.RootPart.EveryoneMask & PERM_COPY) != 0)
-                    permission = true;
-            }
+            UUID sogOwnerID = sog.OwnerID;
+
+            if(sogOwnerID == userID)
+                return true;
+
+            // else only group owned can be sold by members with powers
+            UUID sogGroupID = sog.GroupID;
+            if(sog.OwnerID != sogGroupID || sogGroupID == UUID.Zero)
+                return false;
+
+            return IsGroupMember(sogGroupID, userID, (ulong)GroupPowers.ObjectSetForSale);
+        }
+
+        private bool CanSellObject(SceneObjectGroup sog, ScenePresence sp, byte saleType)
+        {
+            DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
+            if (m_bypassPermissions) return m_bypassPermissionsValue;
 
-            if (so.OwnerID != userID)
+            if (sog == null || sog.IsDeleted || sp == null || sp.IsDeleted)
+                return false;
+
+            // sell is not a attachment op
+            if(sog.IsAttachment)
+                return false;
+
+            if(sp.IsGod)
+                return true;
+
+            uint sogEffectiveOwnerPerms = sog.EffectiveOwnerPerms;
+            if((sogEffectiveOwnerPerms & (uint)PermissionMask.Transfer) == 0)
+                return false;
+
+            if(saleType == (byte)SaleType.Copy &&
+                    (sogEffectiveOwnerPerms & (uint)PermissionMask.Copy) == 0)
+                return false;
+
+            UUID userID = sp.UUID;
+            UUID sogOwnerID = sog.OwnerID;
+
+            if(sogOwnerID == userID)
+                return true;
+
+            // else only group owned can be sold by members with powers
+            UUID sogGroupID = sog.GroupID;
+            if(sog.OwnerID != sogGroupID || sogGroupID == UUID.Zero)
+                return false;
+
+            ulong powers = 0;
+            if(!GroupMemberPowers(sogGroupID, sp, ref powers))
+                return false;
+
+            if((powers & (ulong)GroupPowers.ObjectSetForSale) == 0)
+                return false;
+
+            return true;
+        }
+
+        private bool CanTakeObject(SceneObjectGroup sog, ScenePresence sp)
+        {
+            // ignore locked, viewers shell ask for confirmation
+            DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
+            if (m_bypassPermissions) return m_bypassPermissionsValue;
+
+            if (sog == null || sog.IsDeleted || sp == null || sp.IsDeleted)
+                return false;
+
+            // take is not a attachment op
+            if(sog.IsAttachment)
+                return false;
+
+            UUID sogOwnerID = sog.OwnerID;
+            UUID spID = sp.UUID;
+
+            if(sogOwnerID == spID)
+                return true;
+
+            if (sp.IsGod)
+                return true;
+
+            if((sog.EffectiveOwnerPerms & (uint)PermissionMask.Transfer) == 0)
+                return false;
+ 
+            if (IsFriendWithPerms(sog.UUID, sogOwnerID))
+                return true;
+
+            UUID sogGroupID = sog.GroupID;
+            if (sogGroupID != UUID.Zero)
             {
-                if ((so.GetEffectivePermissions() & (PERM_COPY | PERM_TRANS)) != (PERM_COPY | PERM_TRANS))
-                    permission = false;
+                ulong powers = 0;
+                if(GroupMemberPowers(sogGroupID, sp, ref powers))
+                {
+                    if(sogGroupID == sogOwnerID)
+                    {
+                        if((powers & (ulong)GroupPowers.ObjectManipulate) != 0)
+                            return true;
+                    }
+                    return (sog.EffectiveGroupPerms & (uint)PermissionMask.Modify) != 0;
+                } 
             }
-            else
+            return false;
+        }
+
+        private bool CanTakeCopyObject(SceneObjectGroup sog, ScenePresence sp)
+        {
+            DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
+            if (m_bypassPermissions) return m_bypassPermissionsValue;
+
+            if (sog == null || sog.IsDeleted || sp == null || sp.IsDeleted)
+                return false;
+
+            // refuse on attachments
+            if(sog.IsAttachment && !sp.IsGod)
+                return false;
+
+            uint perms = GetObjectPermissions(sp, sog, true);
+            if((perms & (uint)PermissionMask.Copy) == 0)
             {
-                if ((so.GetEffectivePermissions() & PERM_COPY) != PERM_COPY)
-                    permission = false;
+                sp.ControllingClient.SendAgentAlertMessage("Copying this item has been denied by the permissions system", false);
+                return false;
             }
-            
-            return permission;
+
+            if(sog.OwnerID != sp.UUID && (perms & (uint)PermissionMask.Transfer) == 0)
+                 return false;
+            return true;
         }
 
-        private bool CanTerraformLand(UUID user, Vector3 position, Scene requestFromScene)
+        private bool CanTerraformLand(UUID userID, Vector3 position)
         {
             DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
             if (m_bypassPermissions) return m_bypassPermissionsValue;
 
             // Estate override
-            if (GenericEstatePermission(user))
+            if (GenericEstatePermission(userID))
                 return true;
 
             float X = position.X;
@@ -1587,13 +2086,19 @@ namespace OpenSim.Region.CoreModules.World.Permissions
             ILandObject parcel = m_scene.LandChannel.GetLandObject(X, Y);
             if (parcel == null)
                 return false;
-
-            // Others allowed to terraform?
-            if ((parcel.LandData.Flags & ((int)ParcelFlags.AllowTerraform)) != 0)
+            
+            LandData landdata = parcel.LandData;
+            if (landdata == null)
+                return false;
+            
+            if ((landdata.Flags & ((int)ParcelFlags.AllowTerraform)) != 0)
                 return true;
 
-            // Land owner can terraform too
-            if (parcel != null && GenericParcelPermission(user, parcel, (ulong)GroupPowers.AllowEditLand))
+            if(landdata.OwnerID == userID)
+                return true;
+            
+            if (landdata.IsGroupOwned && parcel.LandData.GroupID != UUID.Zero &&  
+                    IsGroupMember(landdata.GroupID, userID, (ulong)GroupPowers.AllowEditLand))
                 return true;
 
             return false;
@@ -1607,16 +2112,19 @@ namespace OpenSim.Region.CoreModules.World.Permissions
         /// <param name="user"></param>
         /// <param name="scene"></param>
         /// <returns></returns>
-        private bool CanViewScript(UUID script, UUID objectID, UUID user, Scene scene)
+        private bool CanViewScript(UUID script, UUID objectID, UUID userID)
         {
             DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
             if (m_bypassPermissions) return m_bypassPermissionsValue;
 
+            // A god is a god is a god
+            if (IsAdministrator(userID))
+                return true;
+
             if (objectID == UUID.Zero) // User inventory
             {
                 IInventoryService invService = m_scene.InventoryService;
-                InventoryItemBase assetRequestItem = new InventoryItemBase(script, user);
-                assetRequestItem = invService.GetItem(assetRequestItem);
+                InventoryItemBase assetRequestItem = invService.GetItem(userID, script);
                 if (assetRequestItem == null && LibraryRootFolder != null) // Library item
                 {
                     assetRequestItem = LibraryRootFolder.FindItem(script);
@@ -1636,60 +2144,53 @@ namespace OpenSim.Region.CoreModules.World.Permissions
                 // readable only if it's really full perms
                 //
                 if ((assetRequestItem.CurrentPermissions &
+/*
                         ((uint)PermissionMask.Modify |
                         (uint)PermissionMask.Copy |
                         (uint)PermissionMask.Transfer)) !=
                         ((uint)PermissionMask.Modify |
                         (uint)PermissionMask.Copy |
                         (uint)PermissionMask.Transfer))
+*/
+                        (uint)(PermissionMask.Modify | PermissionMask.Copy)) !=
+                        (uint)(PermissionMask.Modify | PermissionMask.Copy))
                     return false;
             }
             else // Prim inventory
             {
-                SceneObjectPart part = scene.GetSceneObjectPart(objectID);
-
+                SceneObjectPart part = m_scene.GetSceneObjectPart(objectID);
                 if (part == null)
                     return false;
-            
-                if (part.OwnerID != user)
-                {
-                    if (part.GroupID == UUID.Zero)
-                        return false;
 
-                    if (!IsGroupMember(part.GroupID, user, 0))
-                        return false;
-            
-                    if ((part.GroupMask & (uint)PermissionMask.Modify) == 0)
-                        return false;
-                } 
-                else 
-                {
-                    if ((part.OwnerMask & (uint)PermissionMask.Modify) == 0)
-                        return false;
-                }
+                SceneObjectGroup sog = part.ParentGroup;
+                if (sog == null)
+                    return false;
+
+                uint perms = GetObjectPermissions(userID, sog, true);
+                if((perms & (uint)PermissionMask.Modify) == 0)
+                    return false;
 
                 TaskInventoryItem ti = part.Inventory.GetInventoryItem(script);
 
-                if (ti == null)
+//                if (ti == null || ti.InvType != (int)InventoryType.LSL)
+                if (ti == null) // legacy may not have type
                     return false;
-            
-                if (ti.OwnerID != user)
-                {
-                    if (ti.GroupID == UUID.Zero)
-                        return false;
-        
-                    if (!IsGroupMember(ti.GroupID, user, 0))
-                        return false;
-                }
+
+                uint itperms = GetObjectItemPermissions(userID, ti);
 
                 // Require full perms
-                if ((ti.CurrentPermissions &
-                        ((uint)PermissionMask.Modify |
+
+                if ((itperms &
+/*
+                        ((uint)(PermissionMask.Modify |
                         (uint)PermissionMask.Copy |
                         (uint)PermissionMask.Transfer)) !=
                         ((uint)PermissionMask.Modify |
                         (uint)PermissionMask.Copy |
                         (uint)PermissionMask.Transfer))
+*/
+                        (uint)(PermissionMask.Modify | PermissionMask.Copy)) !=
+                        (uint)(PermissionMask.Modify | PermissionMask.Copy))
                     return false;
             }
 
@@ -1704,16 +2205,19 @@ namespace OpenSim.Region.CoreModules.World.Permissions
         /// <param name="user"></param>
         /// <param name="scene"></param>
         /// <returns></returns>
-        private bool CanViewNotecard(UUID notecard, UUID objectID, UUID user, Scene scene)
+        private bool CanViewNotecard(UUID notecard, UUID objectID, UUID userID)
         {
             DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
             if (m_bypassPermissions) return m_bypassPermissionsValue;
 
+            // A god is a god is a god
+            if (IsAdministrator(userID))
+                return true;
+
             if (objectID == UUID.Zero) // User inventory
             {
                 IInventoryService invService = m_scene.InventoryService;
-                InventoryItemBase assetRequestItem = new InventoryItemBase(notecard, user);
-                assetRequestItem = invService.GetItem(assetRequestItem);
+                InventoryItemBase assetRequestItem = invService.GetItem(userID, notecard);
                 if (assetRequestItem == null && LibraryRootFolder != null) // Library item
                 {
                     assetRequestItem = LibraryRootFolder.FindItem(notecard);
@@ -1731,40 +2235,29 @@ namespace OpenSim.Region.CoreModules.World.Permissions
             }
             else // Prim inventory
             {
-                SceneObjectPart part = scene.GetSceneObjectPart(objectID);
-
+                SceneObjectPart part = m_scene.GetSceneObjectPart(objectID);
                 if (part == null)
                     return false;
-            
-                if (part.OwnerID != user)
-                {
-                    if (part.GroupID == UUID.Zero)
-                        return false;
-        
-                    if (!IsGroupMember(part.GroupID, user, 0))
-                        return false;
-                }
 
-                if ((part.OwnerMask & (uint)PermissionMask.Modify) == 0)
+                SceneObjectGroup sog = part.ParentGroup;
+                if (sog == null)
+                    return false;
+
+                uint perms = GetObjectPermissions(userID, sog, true);
+                if((perms & (uint)PermissionMask.Modify) == 0)
                     return false;
 
                 TaskInventoryItem ti = part.Inventory.GetInventoryItem(notecard);
 
+//                if (ti == null || ti.InvType != (int)InventoryType.Notecard)
                 if (ti == null)
                     return false;
 
-                if (ti.OwnerID != user)
-                {
-                    if (ti.GroupID == UUID.Zero)
-                        return false;
-        
-                    if (!IsGroupMember(ti.GroupID, user, 0))
-                        return false;
-                }
+                uint itperms = GetObjectItemPermissions(userID, ti);
 
                 // Notecards are always readable unless no copy
                 //
-                if ((ti.CurrentPermissions &
+                if ((itperms &
                         (uint)PermissionMask.Copy) !=
                         (uint)PermissionMask.Copy)
                     return false;
@@ -1780,7 +2273,14 @@ namespace OpenSim.Region.CoreModules.World.Permissions
             DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
             if (m_bypassPermissions) return m_bypassPermissionsValue;
 
-            return GenericObjectPermission(userID, objectID, false);
+            SceneObjectGroup sog = m_scene.GetGroupByPrim(objectID);
+            if (sog == null)
+                return false;
+
+            uint perms = GetObjectPermissions(userID, sog, true);
+            if((perms & (uint)PermissionMask.Modify) == 0)
+                return false;
+            return true;
         }
 
         private bool CanDelinkObject(UUID userID, UUID objectID)
@@ -1788,10 +2288,17 @@ namespace OpenSim.Region.CoreModules.World.Permissions
             DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
             if (m_bypassPermissions) return m_bypassPermissionsValue;
 
-            return GenericObjectPermission(userID, objectID, false);
+            SceneObjectGroup sog = m_scene.GetGroupByPrim(objectID);
+            if (sog == null)
+                return false;
+
+            uint perms = GetObjectPermissions(userID, sog, true);
+            if((perms & (uint)PermissionMask.Modify) == 0)
+                return false;
+            return true;
         }
 
-        private bool CanBuyLand(UUID userID, ILandObject parcel, Scene scene)
+        private bool CanBuyLand(UUID userID, ILandObject parcel)
         {
             DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
             if (m_bypassPermissions) return m_bypassPermissionsValue;
@@ -1804,6 +2311,138 @@ namespace OpenSim.Region.CoreModules.World.Permissions
             DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
             if (m_bypassPermissions) return m_bypassPermissionsValue;
 
+            SceneObjectPart part = m_scene.GetSceneObjectPart(objectID);
+            if (part == null)
+                return false;
+
+            SceneObjectGroup sog = part.ParentGroup;
+            if (sog == null)
+                return false;
+
+            if(sog.OwnerID == userID || IsAdministrator(userID))
+                return true;
+ 
+            if(sog.IsAttachment)
+                return false;
+
+            UUID sogGroupID = sog.GroupID;
+
+            if(sogGroupID == UUID.Zero || sogGroupID != sog.OwnerID)
+                return false;
+
+            TaskInventoryItem ti = part.Inventory.GetInventoryItem(itemID);
+            if(ti == null)
+                return false;
+
+            ulong powers = 0;
+            if(GroupMemberPowers(sogGroupID, userID, ref powers))
+            {
+                if((powers & (ulong)GroupPowers.ObjectManipulate) != 0)
+                    return true;
+
+                if((ti.EveryonePermissions & (uint)PermissionMask.Copy) != 0)
+                        return true;
+            }
+            return false;
+        }
+
+        // object inventory to object inventory item drag and drop
+        private bool CanDoObjectInvToObjectInv(TaskInventoryItem item, SceneObjectPart sourcePart, SceneObjectPart destPart)
+        {
+            DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
+
+            if (sourcePart == null || destPart == null || item == null)
+                return false;
+
+            if (m_bypassPermissions)
+                return m_bypassPermissionsValue;
+
+            SceneObjectGroup srcsog = sourcePart.ParentGroup;
+            SceneObjectGroup destsog = destPart.ParentGroup;
+            if (srcsog == null || destsog == null)
+                return false;
+
+            // dest is locked
+            if((destsog.EffectiveOwnerPerms & (uint)PermissionMask.Move) == 0)
+                return false;
+
+            uint itperms = item.CurrentPermissions;
+
+            // if item is no copy the source is modifed
+            if((itperms & (uint)PermissionMask.Copy) == 0 && (srcsog.EffectiveOwnerPerms & (uint)PermissionMask.Modify) == 0)
+                return false;
+
+            UUID srcOwner = srcsog.OwnerID;
+            UUID destOwner = destsog.OwnerID;
+            bool notSameOwner = srcOwner != destOwner;
+
+            if(notSameOwner)
+            {
+                if((itperms & (uint)PermissionMask.Transfer) == 0)
+                    return false;
+
+                // scripts can't be droped
+                if(item.InvType == (int)InventoryType.LSL)
+                    return false;
+
+                if((destsog.RootPart.GetEffectiveObjectFlags() & (uint)PrimFlags.AllowInventoryDrop) == 0)
+                    return false;
+            }
+            else
+            {
+                if((destsog.RootPart.GetEffectiveObjectFlags() & (uint)PrimFlags.AllowInventoryDrop) == 0 &&
+                            (destsog.EffectiveOwnerPerms & (uint)PermissionMask.Modify) == 0)
+                    return false;
+            }
+
+            return true;
+        }
+
+        private bool CanDropInObjectInv(InventoryItemBase item, ScenePresence sp, SceneObjectPart destPart)
+        {
+            DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
+
+            if (sp == null || sp.IsDeleted || destPart == null || item == null)
+                return false;
+
+            SceneObjectGroup destsog = destPart.ParentGroup;
+            if (destsog == null || destsog.IsDeleted)
+                return false;
+
+            if (m_bypassPermissions)
+                return m_bypassPermissionsValue;
+
+            if(sp.IsGod)
+                return true;
+
+            // dest is locked
+            if((destsog.EffectiveOwnerPerms & (uint)PermissionMask.Move) == 0)
+                return false;
+
+            UUID destOwner = destsog.OwnerID;
+            UUID spID = sp.UUID;
+            bool spNotOwner = spID != destOwner;
+
+            // scripts can't be droped
+            if(spNotOwner && item.InvType == (int)InventoryType.LSL)
+                return false;
+
+            if(spNotOwner || item.Owner != destOwner)
+            {
+                // no copy item will be moved if it has transfer
+                uint itperms = item.CurrentPermissions;
+                if((itperms & (uint)PermissionMask.Transfer) == 0)
+                    return false;
+            }
+
+            // allowdrop is a root part thing and does bypass modify rights
+            if((destsog.RootPart.GetEffectiveObjectFlags() & (uint)PrimFlags.AllowInventoryDrop) != 0)
+                return true;
+
+            uint perms = GetObjectPermissions(spID, destsog, true);
+            if((perms & (uint)PermissionMask.Modify) == 0)
+                return false;
+
             return true;
         }
 
@@ -1812,6 +2451,23 @@ namespace OpenSim.Region.CoreModules.World.Permissions
             DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
             if (m_bypassPermissions) return m_bypassPermissionsValue;
 
+            SceneObjectPart part = m_scene.GetSceneObjectPart(objectID);
+            if (part == null)
+                return false;
+
+            SceneObjectGroup sog = part.ParentGroup;
+            if (sog == null)
+                return false;
+
+            uint perms = GetObjectPermissions(userID, sog, true);
+            if((perms & (uint)PermissionMask.Modify) == 0)
+                return false;
+
+            TaskInventoryItem ti = part.Inventory.GetInventoryItem(itemID);
+            if(ti == null)
+                return false;
+
+            //TODO item perm ?
             return true;
         }
 
@@ -1828,31 +2484,28 @@ namespace OpenSim.Region.CoreModules.World.Permissions
             DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
             if (m_bypassPermissions) return m_bypassPermissionsValue;
 
-            SceneObjectPart part = m_scene.GetSceneObjectPart(objectID);
             ScenePresence p = m_scene.GetScenePresence(userID);
 
-            if (part == null || p == null)
+            if (p == null)
+                return false;
+
+            SceneObjectGroup sog = m_scene.GetGroupByPrim(objectID);
+            if (sog == null)
+                return false;
+
+            uint perms = GetObjectPermissions(userID, sog, true);
+            if((perms & (uint)PermissionMask.Modify) == 0)
                 return false;
 
-            if (!IsAdministrator(userID))
+            if ((int)InventoryType.LSL == invType)
             {
-                if (part.OwnerID != userID)
-                {
-                    // Group permissions
-                    if ((part.GroupID == UUID.Zero) || (p.ControllingClient.GetGroupPowers(part.GroupID) == 0) || ((part.GroupMask & (uint)PermissionMask.Modify) == 0))
-                        return false;
-                } else {
-                    if ((part.OwnerMask & (uint)PermissionMask.Modify) == 0)
-                        return false;
-                }
-                if ((int)InventoryType.LSL == invType)
-                    if (m_allowedScriptCreators == UserSet.Administrators)
-                        return false;
+                if (m_allowedScriptCreators == UserSet.Administrators)
+                 return false;
             }
 
             return true;
         }
-        
+
         /// <summary>
         /// Check whether the specified user is allowed to create the given inventory type in their inventory.
         /// </summary>
@@ -1867,10 +2520,10 @@ namespace OpenSim.Region.CoreModules.World.Permissions
             if ((int)InventoryType.LSL == invType)
                 if (m_allowedScriptCreators == UserSet.Administrators && !IsAdministrator(userID))
                     return false;
-            
+
             return true;
         }
-        
+
         /// <summary>
         /// Check whether the specified user is allowed to copy the given inventory type in their inventory.
         /// </summary>
@@ -1884,7 +2537,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
 
             return true;
         }
-        
+
         /// <summary>
         /// Check whether the specified user is allowed to edit the given inventory item within their own inventory.
         /// </summary>
@@ -1898,7 +2551,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
 
             return true;
         }
-        
+
         /// <summary>
         /// Check whether the specified user is allowed to delete the given inventory item from their own inventory.
         /// </summary>
@@ -1921,22 +2574,22 @@ namespace OpenSim.Region.CoreModules.World.Permissions
             return true;
         }
 
-        private bool CanResetScript(UUID prim, UUID script, UUID agentID, Scene scene)
+        private bool CanResetScript(UUID primID, UUID script, UUID agentID)
         {
             DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
             if (m_bypassPermissions) return m_bypassPermissionsValue;
 
-            SceneObjectPart part = m_scene.GetSceneObjectPart(prim);
-
-            // If we selected a sub-prim to reset, prim won't represent the object, but only a part.
-            // We have to check the permissions of the object, though.
-            if (part.ParentID != 0) prim = part.ParentUUID;
+            SceneObjectGroup sog = m_scene.GetGroupByPrim(primID);
+            if (sog == null)
+                return false;
 
-            // You can reset the scripts in any object you can edit
-            return GenericObjectPermission(agentID, prim, false);
+            uint perms = GetObjectPermissions(agentID, sog, false);
+            if((perms & (uint)PermissionMask.Modify) == 0) // ??
+                return false;
+            return true;
         }
 
-        private bool CanCompileScript(UUID ownerUUID, int scriptType, Scene scene) 
+        private bool CanCompileScript(UUID ownerUUID, int scriptType)
         {
              //m_log.DebugFormat("check if {0} is allowed to compile {1}", ownerUUID, scriptType);
             switch (scriptType) {
@@ -1970,64 +2623,71 @@ namespace OpenSim.Region.CoreModules.World.Permissions
             }
             return(false);
         }
-        
+
         private bool CanControlPrimMedia(UUID agentID, UUID primID, int face)
         {
 //            m_log.DebugFormat(
 //                "[PERMISSONS]: Performing CanControlPrimMedia check with agentID {0}, primID {1}, face {2}",
 //                agentID, primID, face);
-            
+
             if (null == MoapModule)
                 return false;
-            
+
             SceneObjectPart part = m_scene.GetSceneObjectPart(primID);
             if (null == part)
                 return false;
-            
+
             MediaEntry me = MoapModule.GetMediaEntry(part, face);
-            
+
             // If there is no existing media entry then it can be controlled (in this context, created).
             if (null == me)
                 return true;
-            
+
 //            m_log.DebugFormat(
-//                "[PERMISSIONS]: Checking CanControlPrimMedia for {0} on {1} face {2} with control permissions {3}", 
+//                "[PERMISSIONS]: Checking CanControlPrimMedia for {0} on {1} face {2} with control permissions {3}",
 //                agentID, primID, face, me.ControlPermissions);
-            
-            return GenericObjectPermission(agentID, part.ParentGroup.UUID, true);
+
+            SceneObjectGroup sog = part.ParentGroup;
+            if (sog == null)
+                return false;
+
+            uint perms = GetObjectPermissions(agentID, sog, false);
+            if((perms & (uint)PermissionMask.Modify) == 0)
+                return false;
+            return true;
         }
-        
+
         private bool CanInteractWithPrimMedia(UUID agentID, UUID primID, int face)
         {
 //            m_log.DebugFormat(
 //                "[PERMISSONS]: Performing CanInteractWithPrimMedia check with agentID {0}, primID {1}, face {2}",
 //                agentID, primID, face);
-            
+
             if (null == MoapModule)
                 return false;
-            
+
             SceneObjectPart part = m_scene.GetSceneObjectPart(primID);
             if (null == part)
                 return false;
-            
+
             MediaEntry me = MoapModule.GetMediaEntry(part, face);
-            
+
             // If there is no existing media entry then it can be controlled (in this context, created).
             if (null == me)
                 return true;
-            
+
 //            m_log.DebugFormat(
-//                "[PERMISSIONS]: Checking CanInteractWithPrimMedia for {0} on {1} face {2} with interact permissions {3}", 
+//                "[PERMISSIONS]: Checking CanInteractWithPrimMedia for {0} on {1} face {2} with interact permissions {3}",
 //                agentID, primID, face, me.InteractPermissions);
-            
+
             return GenericPrimMediaPermission(part, agentID, me.InteractPermissions);
         }
-        
+
         private bool GenericPrimMediaPermission(SceneObjectPart part, UUID agentID, MediaPermission perms)
         {
 //            if (IsAdministrator(agentID))
 //                return true;
-            
+
             if ((perms & MediaPermission.Anyone) == MediaPermission.Anyone)
                 return true;
 
@@ -2036,13 +2696,13 @@ namespace OpenSim.Region.CoreModules.World.Permissions
                 if (agentID == part.OwnerID)
                     return true;
             }
-            
+
             if ((perms & MediaPermission.Group) == MediaPermission.Group)
             {
                 if (IsGroupMember(part.GroupID, agentID, 0))
                     return true;
             }
-            
+
             return false;
         }
     }
diff --git a/OpenSim/Region/CoreModules/World/Region/RegionCommandsModule.cs b/OpenSim/Region/CoreModules/World/Region/RegionCommandsModule.cs
index bb4dcce..49246a2 100644
--- a/OpenSim/Region/CoreModules/World/Region/RegionCommandsModule.cs
+++ b/OpenSim/Region/CoreModules/World/Region/RegionCommandsModule.cs
@@ -40,6 +40,7 @@ using OpenSim.Framework.Console;
 using OpenSim.Framework.Monitoring;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
+using GridRegion = OpenSim.Services.Interfaces.GridRegion;
 
 namespace OpenSim.Region.CoreModules.World.Objects.Commands
 {
@@ -53,24 +54,24 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
         private ICommandConsole m_console;
 
         public string Name { get { return "Region Commands Module"; } }
-        
+
         public Type ReplaceableInterface { get { return null; } }
-        
+
         public void Initialise(IConfigSource source)
         {
 //            m_log.DebugFormat("[REGION COMMANDS MODULE]: INITIALIZED MODULE");
         }
-        
+
         public void PostInitialise()
         {
 //            m_log.DebugFormat("[REGION COMMANDS MODULE]: POST INITIALIZED MODULE");
         }
-        
+
         public void Close()
         {
 //            m_log.DebugFormat("[REGION COMMANDS MODULE]: CLOSED MODULE");
         }
-        
+
         public void AddRegion(Scene scene)
         {
 //            m_log.DebugFormat("[REGION COMMANDS MODULE]: REGION {0} ADDED", scene.RegionInfo.RegionName);
@@ -86,14 +87,14 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
             m_console.Commands.AddCommand(
                 "Regions", false, "show region",
                 "show region",
-                "Show control information for the currently selected region (host name, max physical prim size, etc).", 
+                "Show control information for the currently selected region (host name, max physical prim size, etc).",
                 "A synonym for \"region get\"",
                 HandleShowRegion);
 
             m_console.Commands.AddCommand(
                 "Regions", false, "region get",
                 "region get",
-                "Show control information for the currently selected region (host name, max physical prim size, etc).", 
+                "Show control information for the currently selected region (host name, max physical prim size, etc).",
                 "Some parameters can be set with the \"region set\" command.\n"
                 + "Others must be changed via a viewer (usually via the region/estate dialog box).",
                 HandleShowRegion);
@@ -107,6 +108,15 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
                 + "max-agent-limit <int> - Maximum root agent limit.  agent-limit cannot exceed this."
                 + "  This is not persisted over restart - to set it every time you must add a MaxAgents entry to your regions file.",
                 HandleRegionSet);
+
+            m_console.Commands.AddCommand("Regions", false, "show neighbours",
+                "show neighbours",
+                "Shows the local region neighbours", HandleShowNeighboursCommand);
+
+            m_console.Commands.AddCommand("Regions", false, "show regionsinview",
+                "show regionsinview",
+                "Shows regions that can be seen from a region", HandleShowRegionsInViewCommand);
+
         }
 
         public void RemoveRegion(Scene scene)
@@ -194,7 +204,7 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
             {
                 MainConsole.Instance.OutputFormat("Usage: region set <param> <value>");
                 return;
-            }           
+            }
 
             string param = args[2];
             string rawValue = args[3];
@@ -215,7 +225,7 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
                 if (newValue > ri.AgentCapacity)
                 {
                     MainConsole.Instance.OutputFormat(
-                        "Cannot set {0} to {1} in {2} as max-agent-limit is {3}", "agent-limit", 
+                        "Cannot set {0} to {1} in {2} as max-agent-limit is {3}", "agent-limit",
                         newValue, m_scene.Name, ri.AgentCapacity);
                 }
                 else
@@ -271,8 +281,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 +290,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);
@@ -309,5 +319,60 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
 
             MainConsole.Instance.Output(sb.ToString());
         }
+
+        public void HandleShowNeighboursCommand(string module, string[] cmdparams)
+        {
+            if(m_scene == null)
+                return;
+
+            if (!(MainConsole.Instance.ConsoleScene == null || MainConsole.Instance.ConsoleScene == m_scene))
+                return;
+
+            System.Text.StringBuilder caps = new System.Text.StringBuilder();
+
+            RegionInfo sr = m_scene.RegionInfo;
+            caps.AppendFormat("*** Neighbours of {0} ({1}) ***\n", sr.RegionName, sr.RegionID);
+            List<GridRegion> regions = m_scene.GridService.GetNeighbours(sr.ScopeID, sr.RegionID);
+                foreach (GridRegion r in regions)
+                    caps.AppendFormat("    {0} @ {1}-{2}\n", r.RegionName, Util.WorldToRegionLoc((uint)r.RegionLocX), Util.WorldToRegionLoc((uint)r.RegionLocY));
+
+            MainConsole.Instance.Output(caps.ToString());
+        }
+
+        public void HandleShowRegionsInViewCommand(string module, string[] cmdparams)
+        {
+            if(m_scene == null)
+                return;
+
+            if (!(MainConsole.Instance.ConsoleScene == null || MainConsole.Instance.ConsoleScene == m_scene))
+                return;
+
+            System.Text.StringBuilder caps = new System.Text.StringBuilder();
+            int maxview = (int)m_scene.MaxRegionViewDistance;
+            RegionInfo sr = m_scene.RegionInfo;
+            caps.AppendFormat("*** Regions that can be seen from {0} ({1}) (MaxRegionViewDistance {2}m) ***\n", sr.RegionName, sr.RegionID, maxview);
+            int startX = (int)sr.WorldLocX;
+            int endX = startX + (int)sr.RegionSizeX;
+            int startY = (int)sr.WorldLocY;
+            int endY = startY + (int)sr.RegionSizeY;
+            startX -= maxview;
+            if(startX < 0 )
+                startX = 0;
+            startY -= maxview;
+            if(startY < 0)
+                startY = 0;
+            endX += maxview;
+            endY += maxview;
+
+            List<GridRegion> regions = m_scene.GridService.GetRegionRange(sr.ScopeID, startX, endX, startY, endY);
+            foreach (GridRegion r in regions)
+            {
+                if(r.RegionHandle == sr.RegionHandle)
+                    continue;
+                caps.AppendFormat("    {0} @ {1}-{2}\n", r.RegionName, Util.WorldToRegionLoc((uint)r.RegionLocX), Util.WorldToRegionLoc((uint)r.RegionLocY));
+            }
+
+            MainConsole.Instance.Output(caps.ToString());
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/CoreModules/World/Region/RestartModule.cs b/OpenSim/Region/CoreModules/World/Region/RestartModule.cs
index 75a8295..bb3b860 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,30 +59,46 @@ 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;
+        protected bool m_shortCircuitDelays = false;
+        protected bool m_rebootAll = false;
 
         public void Initialise(IConfigSource config)
         {
+            IConfig restartConfig = config.Configs["RestartModule"];
+            if (restartConfig != null)
+            {
+                m_MarkerPath = restartConfig.GetString("MarkerPath", String.Empty);
+            }
+            IConfig startupConfig = config.Configs["Startup"];
+            m_shortCircuitDelays = startupConfig.GetBoolean("SkipDelayOnEmptyRegion", false);
+            m_rebootAll = startupConfig.GetBoolean("InworldRestartShutsDown", false);
         }
 
         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);
             MainConsole.Instance.Commands.AddCommand("Regions",
                     false, "region restart bluebox",
                     "region restart bluebox <message> <delta seconds>+",
-                    "Schedule a region restart", 
+                    "Schedule a region restart",
                     "Schedule a region restart after a given number of seconds.  If one delta is given then the region is restarted in delta seconds time.  A time to restart is sent to users in the region as a dismissable bluebox notice.  If multiple deltas are given then a notice is sent when we reach each delta.",
                     HandleRegionRestart);
-            
+
             MainConsole.Instance.Commands.AddCommand("Regions",
                     false, "region restart notice",
                     "region restart notice <message> <delta seconds>+",
-                    "Schedule a region restart", 
+                    "Schedule a region restart",
                     "Schedule a region restart after a given number of seconds.  If one delta is given then the region is restarted in delta seconds time.  A time to restart is sent to users in the region as a transient notice.  If multiple deltas are given then a notice is sent when we reach each delta.",
                     HandleRegionRestart);
-            
+
             MainConsole.Instance.Commands.AddCommand("Regions",
                     false, "region restart abort",
                     "region restart abort [<message>]",
@@ -118,10 +136,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 +151,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;
             }
@@ -163,39 +188,42 @@ namespace OpenSim.Region.CoreModules.World.Region
                 nextAlert = m_Alerts[1];
                 break;
             }
-            
+
             int currentAlert = m_Alerts[0];
 
             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;
@@ -219,14 +247,42 @@ namespace OpenSim.Region.CoreModules.World.Region
             else
             {
                 m_log.WarnFormat(
-                    "[RESTART MODULE]: Tried to set restart timer to {0} in {1}, which is not a valid interval", 
+                    "[RESTART MODULE]: Tried to set restart timer to {0} in {1}, which is not a valid interval",
                     intervalSeconds, m_Scene.Name);
             }
         }
 
         private void OnTimer(object source, ElapsedEventArgs e)
         {
-            SetTimer(DoOneNotice());
+            int nextInterval = DoOneNotice(true);
+            if (m_shortCircuitDelays)
+            {
+                if (CountAgents() == 0)
+                {
+                    m_Scene.RestartNow();
+                    return;
+                }
+            }
+
+            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,10 +292,14 @@ 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)
         {
             if (!(MainConsole.Instance.ConsoleScene is Scene))
@@ -282,5 +342,55 @@ 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)
+            {
+            }
+        }
+
+        int CountAgents()
+        {
+            m_log.Info("[RESTART MODULE]: Counting affected avatars");
+            int agents = 0;
+
+            if (m_rebootAll)
+            {
+                foreach (Scene s in SceneManager.Instance.Scenes)
+                {
+                    foreach (ScenePresence sp in s.GetScenePresences())
+                    {
+                        if (!sp.IsChildAgent && !sp.IsNPC)
+                            agents++;
+                    }
+                }
+            }
+            else
+            {
+                foreach (ScenePresence sp in m_Scene.GetScenePresences())
+                {
+                    if (!sp.IsChildAgent && !sp.IsNPC)
+                        agents++;
+                }
+            }
+
+            m_log.InfoFormat("[RESTART MODULE]: Avatars in region: {0}", agents);
+
+            return agents;
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/CoreModules/World/Serialiser/SerialiseObjects.cs b/OpenSim/Region/CoreModules/World/Serialiser/SerialiseObjects.cs
index 65f464a..52a80d6 100644
--- a/OpenSim/Region/CoreModules/World/Serialiser/SerialiseObjects.cs
+++ b/OpenSim/Region/CoreModules/World/Serialiser/SerialiseObjects.cs
@@ -69,7 +69,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser
             MemoryStream stream = new MemoryStream();
             XmlTextWriter formatter = new XmlTextWriter(stream, Encoding.UTF8);
             XmlDocument doc = new XmlDocument();
-
+            doc.XmlResolver=null;
             doc.LoadXml(xmlstream);
             formatter.Formatting = Formatting.Indented;
             doc.WriteContentTo(formatter);
diff --git a/OpenSim/Region/CoreModules/World/Serialiser/SerialiserModule.cs b/OpenSim/Region/CoreModules/World/Serialiser/SerialiserModule.cs
index e0247d9..c9bc335 100644
--- a/OpenSim/Region/CoreModules/World/Serialiser/SerialiserModule.cs
+++ b/OpenSim/Region/CoreModules/World/Serialiser/SerialiserModule.cs
@@ -45,7 +45,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser
     [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "SerialiserModule")]
     public class SerialiserModule : ISharedRegionModule, IRegionSerialiserModule
     {
-        private static readonly ILog m_log = 
+        private static readonly ILog m_log =
             LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
 //        private Commander m_commander = new Commander("export");
@@ -55,15 +55,15 @@ namespace OpenSim.Region.CoreModules.World.Serialiser
 
         #region ISharedRegionModule Members
 
-        public Type ReplaceableInterface 
-        { 
+        public Type ReplaceableInterface
+        {
             get { return null; }
         }
 
         public void Initialise(IConfigSource source)
         {
             IConfig config = source.Configs["Serialiser"];
-            if (config != null) 
+            if (config != null)
             {
                 m_savedir = config.GetString("save_dir", m_savedir);
             }
@@ -150,7 +150,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser
         {
             SceneXmlLoader.SavePrimsToXml2(scene, stream, min, max);
         }
-        
+
         public void SaveNamedPrimsToXml2(Scene scene, string primName, string fileName)
         {
             SceneXmlLoader.SaveNamedPrimsToXml2(scene, primName, fileName);
diff --git a/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs b/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs
index a5bb1a7..23475a1 100644
--- a/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs
+++ b/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs
@@ -43,7 +43,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
     [TestFixture]
     public class SerialiserTests : OpenSimTestCase
     {
-        private const string ObjectRootPartStubXml = 
+        private const string ObjectRootPartStubXml =
 @"<SceneObjectGroup>
     <RootPart>
         <SceneObjectPart xmlns:xsi=""http://www.w3.org/2001/XMLSchema-instance"" xmlns:xsd=""http://www.w3.org/2001/XMLSchema"">
@@ -149,9 +149,9 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
                 <llsd>
                     <map>
                         <key>MyNamespace</key>
-                        <map>                                
+                        <map>
                             <key>MyStore</key>
-                            <map>   
+                            <map>
                                 <key>the answer</key>
                                 <integer>42</integer>
                             </map>
@@ -162,12 +162,12 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
         </SceneObjectPart>
     </RootPart>";
 
-        private const string ObjectWithNoOtherPartsXml = ObjectRootPartStubXml + 
+        private const string ObjectWithNoOtherPartsXml = ObjectRootPartStubXml +
 @"
     <OtherParts />
 </SceneObjectGroup>";
 
-        private const string ObjectWithOtherPartsXml = ObjectRootPartStubXml + 
+        private const string ObjectWithOtherPartsXml = ObjectRootPartStubXml +
 @"
   <OtherParts>
     <Part>
@@ -574,9 +574,9 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
                     <llsd>
                         <map>
                             <key>MyNamespace</key>
-                            <map>                                
+                            <map>
                                 <key>MyStore</key>
-                                <map>   
+                                <map>
                                     <key>last words</key>
                                     <string>Rosebud</string>
                                 </map>
@@ -636,7 +636,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
                 Assert.That(part.Name, Is.EqualTo("PrimMyRide"));
                 OSDMap store = part.DynAttrs.GetStore("MyNamespace", "MyStore");
                 Assert.AreEqual(42, store["the answer"].AsInteger());
-            }                                    
+            }
 
             {
                 SceneObjectPart part = parts[1];
@@ -720,10 +720,12 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
             string xml = SceneObjectSerializer.ToOriginalXmlFormat(so);
 
             XmlTextReader xtr = new XmlTextReader(new StringReader(xml));
+            xtr.ProhibitDtd = true;
+
             xtr.ReadStartElement("SceneObjectGroup");
             xtr.ReadStartElement("RootPart");
             xtr.ReadStartElement("SceneObjectPart");
-           
+
             UUID uuid = UUID.Zero;
             string name = null;
             UUID creatorId = UUID.Zero;
@@ -733,7 +735,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
             {
                 if (xtr.NodeType != XmlNodeType.Element)
                     continue;
-                
+
                 switch (xtr.Name)
                 {
                     case "UUID":
@@ -831,9 +833,11 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
             string xml2 = m_serialiserModule.SerializeGroupToXml2(so, options);
 
             XmlTextReader xtr = new XmlTextReader(new StringReader(xml2));
+            xtr.ProhibitDtd = true;
+
             xtr.ReadStartElement("SceneObjectGroup");
             xtr.ReadStartElement("SceneObjectPart");
-           
+
             UUID uuid = UUID.Zero;
             string name = null;
             UUID creatorId = UUID.Zero;
@@ -843,7 +847,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
             {
                 if (xtr.NodeType != XmlNodeType.Element)
                     continue;
-                
+
                 switch (xtr.Name)
                 {
                     case "UUID":
diff --git a/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs b/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs
index d093224..2b7db18 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)
                 {
-                    if (grp.HasPrivateAttachmentPoint && sp.ControllingClient.AgentId != grp.OwnerID)
-                        return;
-
-                    if (sp.ControllingClient.AgentId == grp.OwnerID)
-                        dis = 0;
+                    ssp.ControllingClient.SendPlayAttachedSound(soundID, objectID,
+                        ownerID, (float)gain, flags);
+                    return;
                 }
 
-                // Scale by distance
-                double thisSpGain = gain * ((radius - dis) / radius);
+                if (!ssp.ParcelAllowThisAvatarSounds)
+                    return;
+            }
 
+            m_scene.ForEachRootScenePresence(delegate(ScenePresence sp)
+            {
                 sp.ControllingClient.SendPlayAttachedSound(soundID, objectID,
-                        ownerID, (float)thisSpGain, flags);
+                        ownerID, (float)gain, flags);
             });
         }
 
@@ -151,20 +167,35 @@ 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;
+
+/* mantis 7942: coment out to allow trigger in HUDs to send sounds to all
+                    if (grp.HasPrivateAttachmentPoint)
+                    {
+                        ssp.ControllingClient.SendTriggeredSound(soundId, ownerID,
+                                objectID, parentID, handle, position,
+                                (float)gain);
+                        return;
+                    }
+*/
                 }
             }
 
@@ -174,16 +205,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 +225,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 +248,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 +262,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,41 +304,18 @@ 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);
             }
         }
 
diff --git a/OpenSim/Region/CoreModules/World/Sun/SunModule.cs b/OpenSim/Region/CoreModules/World/Sun/SunModule.cs
index d0318eb..e2b3487 100644
--- a/OpenSim/Region/CoreModules/World/Sun/SunModule.cs
+++ b/OpenSim/Region/CoreModules/World/Sun/SunModule.cs
@@ -77,7 +77,7 @@ namespace OpenSim.Region.CoreModules
         // Number of virtual days to a virtual year
         private int    m_YearLengthDays           = 0;
 
-        // Ratio of Daylight hours to Night time hours.  This is accomplished by shifting the 
+        // Ratio of Daylight hours to Night time hours.  This is accomplished by shifting the
         // sun's orbit above the horizon
         private double m_HorizonShift = 0;
 
@@ -162,7 +162,7 @@ namespace OpenSim.Region.CoreModules
                 // Determine the current "day" from current time, so we can use "today"
                 // to determine Seasonal Tilt and what'not
 
-                // Integer math rounded is on purpose to drop fractional day, determines number 
+                // Integer math rounded is on purpose to drop fractional day, determines number
                 // of virtual days since Epoch
                 PosTime = CurrentTime / SecondsPerSunCycle;
 
@@ -343,7 +343,7 @@ namespace OpenSim.Region.CoreModules
             m_log.Debug("[SUN]: Positional data updated every " + m_UpdateInterval + " frames");
         }
 
-        public Type ReplaceableInterface 
+        public Type ReplaceableInterface
         {
             get { return null; }
         }
@@ -417,7 +417,7 @@ namespace OpenSim.Region.CoreModules
                     client.SendSunPos(Position, Velocity, CurrentTime, SecondsPerSunCycle, SecondsPerYear, OrbitalPosition);
                 }
             }
-        }            
+        }
 
         public void SunUpdate()
         {
@@ -464,7 +464,7 @@ namespace OpenSim.Region.CoreModules
 
                 while (sunFixedHour < 0)
                     sunFixedHour += 24;
-                
+
                 m_SunFixedHour = sunFixedHour;
                 m_SunFixed = fixedSun;
 
@@ -516,7 +516,7 @@ namespace OpenSim.Region.CoreModules
 
                 case "current_time":
                     return GetCurrentTimeAsLindenSunHour();
-                
+
                 default:
                     throw new Exception("Unknown sun parameter.");
             }
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/FileLoaders/BMP.cs b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/BMP.cs
index fb57c82..ec2d085 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/BMP.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/BMP.cs
@@ -47,9 +47,8 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
         /// <param name="map">The terrain channel being saved</param>
         public override void SaveFile(string filename, ITerrainChannel map)
         {
-            Bitmap colours = CreateGrayscaleBitmapFromMap(map);
-
-            colours.Save(filename, ImageFormat.Bmp);
+            using(Bitmap colours = CreateGrayscaleBitmapFromMap(map))
+                colours.Save(filename,ImageFormat.Bmp);
         }
 
         /// <summary>
@@ -59,9 +58,8 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
         /// <param name="map">The terrain channel being saved</param>
         public override void SaveStream(Stream stream, ITerrainChannel map)
         {
-            Bitmap colours = CreateGrayscaleBitmapFromMap(map);
-
-            colours.Save(stream, ImageFormat.Png);
+            using(Bitmap colours = CreateGrayscaleBitmapFromMap(map))
+                colours.Save(stream,ImageFormat.Bmp);
         }
 
         /// <summary>
diff --git a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/GIF.cs b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/GIF.cs
index 79cc50b..3843708 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/GIF.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/GIF.cs
@@ -36,9 +36,8 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
     {
         public override void SaveFile(string filename, ITerrainChannel map)
         {
-            Bitmap colours = CreateGrayscaleBitmapFromMap(map);
-
-            colours.Save(filename, ImageFormat.Gif);
+            using(Bitmap colours = CreateGrayscaleBitmapFromMap(map))
+                colours.Save(filename,ImageFormat.Gif);
         }
 
         /// <summary>
@@ -48,9 +47,8 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
         /// <param name="map">The terrain channel being saved</param>
         public override void SaveStream(Stream stream, ITerrainChannel map)
         {
-            Bitmap colours = CreateGrayscaleBitmapFromMap(map);
-
-            colours.Save(stream, ImageFormat.Gif);
+            using(Bitmap colours = CreateGrayscaleBitmapFromMap(map))
+                colours.Save(stream,ImageFormat.Gif);
         }
 
         public override string ToString()
diff --git a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/GenericSystemDrawing.cs b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/GenericSystemDrawing.cs
index d5c77ec..bcd9dcd 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/GenericSystemDrawing.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/GenericSystemDrawing.cs
@@ -59,7 +59,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
         /// <returns>A terrain channel generated from the image.</returns>
         public virtual ITerrainChannel LoadFile(string filename)
         {
-            using (Bitmap b = new Bitmap(filename))
+            using(Bitmap b = new Bitmap(filename))
                 return LoadBitmap(b);
         }
 
@@ -111,9 +111,8 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
         /// <param name="map">The terrain channel being saved</param>
         public virtual void SaveFile(string filename, ITerrainChannel map)
         {
-            Bitmap colours = CreateGrayscaleBitmapFromMap(map);
-
-            colours.Save(filename, ImageFormat.Png);
+            using(Bitmap colours = CreateGrayscaleBitmapFromMap(map))
+                colours.Save(filename,ImageFormat.Png);
         }
 
         /// <summary>
@@ -123,12 +122,11 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
         /// <param name="map">The terrain channel being saved</param>
         public virtual void SaveStream(Stream stream, ITerrainChannel map)
         {
-            Bitmap colours = CreateGrayscaleBitmapFromMap(map);
-
-            colours.Save(stream, ImageFormat.Png);
+            using(Bitmap colours = CreateGrayscaleBitmapFromMap(map))
+                colours.Save(stream,ImageFormat.Png);
         }
 
-        public virtual void SaveFile(ITerrainChannel m_channel, string filename, 
+        public virtual void SaveFile(ITerrainChannel m_channel, string filename,
                                      int offsetX, int offsetY,
                                      int fileWidth, int fileHeight,
                                      int regionSizeX, int regionSizeY)
@@ -162,13 +160,13 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
                 {
                     newBitmap = new Bitmap(fileWidth * regionSizeX, fileHeight * regionSizeY);
                 }
-    
+
                 thisBitmap = CreateGrayscaleBitmapFromMap(m_channel);
-    //            Console.WriteLine("offsetX=" + offsetX + " offsetY=" + offsetY);
+                //            Console.WriteLine("offsetX=" + offsetX + " offsetY=" + offsetY);
                 for (int x = 0; x < regionSizeX; x++)
                     for (int y = 0; y < regionSizeY; y++)
                         newBitmap.SetPixel(x + offsetX * regionSizeX, y + (fileHeight - 1 - offsetY) * regionSizeY, thisBitmap.GetPixel(x, y));
-    
+
                 Save(newBitmap, filename);
             }
             finally
@@ -213,8 +211,10 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
         /// <returns>A System.Drawing.Bitmap containing a grayscale image</returns>
         protected static Bitmap CreateGrayscaleBitmapFromMap(ITerrainChannel map)
         {
+            //            Bitmap bmp = new Bitmap(map.Width, map.Height, PixelFormat.Format24bppRgb);
             Bitmap bmp = new Bitmap(map.Width, map.Height);
 
+
             const int pallete = 256;
 
             Color[] grays = new Color[pallete];
@@ -227,59 +227,24 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
             {
                 for (int x = 0; x < map.Width; x++)
                 {
-                    // 512 is the largest possible height before colours clamp
-                    int colorindex = (int) (Math.Max(Math.Min(1.0, map[x, y] / 128.0), 0.0) * (pallete - 1));
-
-                    // Handle error conditions
-                    if (colorindex > pallete - 1 || colorindex < 0)
-                        bmp.SetPixel(x, map.Height - y - 1, Color.Red);
-                    else
-                        bmp.SetPixel(x, map.Height - y - 1, grays[colorindex]);
-                }
-            }
-            return bmp;
-        }
-
-        /// <summary>
-        /// Protected method, generates a coloured bitmap
-        /// image from a specified terrain channel.
-        /// </summary>
-        /// <param name="map">The terrain channel to export to bitmap</param>
-        /// <returns>A System.Drawing.Bitmap containing a coloured image</returns>
-        protected static Bitmap CreateBitmapFromMap(ITerrainChannel map)
-        {
-            int pallete;
-            Bitmap bmp;
-            Color[] colours;
+                    // to change this, loading also needs change
 
-            using (Bitmap gradientmapLd = new Bitmap("defaultstripe.png"))
-            {
-                pallete = gradientmapLd.Height;
-    
-                bmp = new Bitmap(map.Width, map.Height);
-                colours = new Color[pallete];
-    
-                for (int i = 0; i < pallete; i++)
-                {
-                    colours[i] = gradientmapLd.GetPixel(0, i);
-                }
-            }
+                    // int colorindex = (int)map[x, y];  // one to one conversion 0 - 255m range
+                    // int colorindex = (int)map[x, y] / 2;  // 0 - 510 range
 
-            for (int y = 0; y < map.Height; y++)
-            {
-                for (int x = 0; x < map.Width; x++)
-                {
-                    // 512 is the largest possible height before colours clamp
-                    int colorindex = (int) (Math.Max(Math.Min(1.0, map[x, y] / 512.0), 0.0) * (pallete - 1));
+                    int colorindex = (int)map[x, y] * 2; // the original  0 - 127.5 range
 
-                    // Handle error conditions
-                    if (colorindex > pallete - 1 || colorindex < 0)
-                        bmp.SetPixel(x, map.Height - y - 1, Color.Red);
-                    else
-                        bmp.SetPixel(x, map.Height - y - 1, colours[colorindex]);
+                    // clamp it not adding the red warning
+                    if (colorindex < 0)
+                        colorindex = 0;
+                    else if (colorindex >= pallete)
+                        colorindex = pallete - 1;
+                    bmp.SetPixel(x, map.Height - y - 1, grays[colorindex]);
                 }
             }
             return bmp;
         }
     }
 }
+
+
diff --git a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/JPEG.cs b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/JPEG.cs
index 9cc767a..d604dc7 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/JPEG.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/JPEG.cs
@@ -59,9 +59,8 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
 
         public void SaveFile(string filename, ITerrainChannel map)
         {
-            Bitmap colours = CreateBitmapFromMap(map);
-
-            colours.Save(filename, ImageFormat.Jpeg);
+            using(Bitmap colours = CreateBitmapFromMap(map))
+                colours.Save(filename,ImageFormat.Jpeg);
         }
 
         /// <summary>
@@ -71,9 +70,8 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
         /// <param name="map">The terrain channel being saved</param>
         public void SaveStream(Stream stream, ITerrainChannel map)
         {
-            Bitmap colours = CreateBitmapFromMap(map);
-
-            colours.Save(stream, ImageFormat.Jpeg);
+            using(Bitmap colours = CreateBitmapFromMap(map))
+                colours.Save(stream,ImageFormat.Jpeg);
         }
 
         public virtual void SaveFile(ITerrainChannel m_channel, string filename,
@@ -106,10 +104,10 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
             using (Bitmap gradientmapLd = new Bitmap("defaultstripe.png"))
             {
                 pallete = gradientmapLd.Height;
-    
+
                 bmp = new Bitmap(map.Width, map.Height);
                 colours = new Color[pallete];
-    
+
                 for (int i = 0; i < pallete; i++)
                 {
                     colours[i] = gradientmapLd.GetPixel(0, i);
diff --git a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/LLRAW.cs b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/LLRAW.cs
index be1fb24..68d6ed2 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/LLRAW.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/LLRAW.cs
@@ -57,6 +57,10 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
 
         public LLRAW()
         {
+        }
+
+        private void BuildLookupHeightTable()
+        {
             LookupHeightTable = new HeightmapLookupValue[256 * 256];
 
             for (int i = 0; i < 256; i++)
@@ -186,6 +190,9 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
 
         public void SaveStream(Stream s, ITerrainChannel map)
         {
+            if (LookupHeightTable == null)
+                BuildLookupHeightTable();
+
             using (BinaryWriter binStream = new BinaryWriter(s))
             {
                 // Output the calculated raw
@@ -241,6 +248,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
                     }
                 }
             }
+            LookupHeightTable = null;
         }
 
         public string FileExtension
@@ -267,6 +275,6 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
         public bool SupportsTileSave()
         {
             return false;
-        }       
+        }
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/PNG.cs b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/PNG.cs
index c5c12ae..8ea8e9d 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/PNG.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/PNG.cs
@@ -36,9 +36,8 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
     {
         public override void SaveFile(string filename, ITerrainChannel map)
         {
-            Bitmap colours = CreateGrayscaleBitmapFromMap(map);
-
-            colours.Save(filename, ImageFormat.Png);
+            using(Bitmap colours = CreateGrayscaleBitmapFromMap(map))
+                colours.Save(filename,ImageFormat.Png);
         }
 
         /// <summary>
@@ -48,9 +47,8 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
         /// <param name="map">The terrain channel being saved</param>
         public override void SaveStream(Stream stream, ITerrainChannel map)
         {
-            Bitmap colours = CreateGrayscaleBitmapFromMap(map);
-
-            colours.Save(stream, ImageFormat.Png);
+            using(Bitmap colours = CreateGrayscaleBitmapFromMap(map))
+                colours.Save(stream,ImageFormat.Png);
         }
 
         public override string ToString()
diff --git a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/TIFF.cs b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/TIFF.cs
index b416b82..d103a6f 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/TIFF.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/TIFF.cs
@@ -36,9 +36,8 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
     {
         public override void SaveFile(string filename, ITerrainChannel map)
         {
-            Bitmap colours = CreateGrayscaleBitmapFromMap(map);
-
-            colours.Save(filename, ImageFormat.Tiff);
+            using(Bitmap colours = CreateGrayscaleBitmapFromMap(map))
+                colours.Save(filename,ImageFormat.Tiff);
         }
 
         /// <summary>
@@ -48,9 +47,8 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
         /// <param name="map">The terrain channel being saved</param>
         public override void SaveStream(Stream stream, ITerrainChannel map)
         {
-            Bitmap colours = CreateGrayscaleBitmapFromMap(map);
-
-            colours.Save(stream, ImageFormat.Tiff);
+            using(Bitmap colours = CreateGrayscaleBitmapFromMap(map))
+                colours.Save(stream,ImageFormat.Tiff);
         }
 
         public override string ToString()
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..f7be25f 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/ITerrainLoader.cs b/OpenSim/Region/CoreModules/World/Terrain/ITerrainLoader.cs
index 3ba3657..855d131 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/ITerrainLoader.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/ITerrainLoader.cs
@@ -33,7 +33,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
     public interface ITerrainLoader
     {
         // Returns true if that extension can be used for terrain save-tile
-        // (Look into each file in Region.CoreModules.World.Terrain.FileLoaders) 
+        // (Look into each file in Region.CoreModules.World.Terrain.FileLoaders)
         bool SupportsTileSave();
 
         string FileExtension { get; }
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..9d3d4cb 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;
@@ -76,7 +77,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes
                     {
                         map[x, y] += delta;
                     }
- 
+
                 }
             }
         }
diff --git a/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/LowerSphere.cs b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/LowerSphere.cs
index 68145f2..a88a022 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
@@ -74,7 +58,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes
                             map[x, y] = 0.0;
                         else
                             map[x, y] = newz;
-                    } 
+                    }
                 }
             }
 
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..5305cb4 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/RaiseSphere.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/RaiseSphere.cs
@@ -33,40 +33,24 @@ namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes
     public class RaiseSphere : ITerrainPaintableEffect
     {
         #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;
-
-            if (xFrom < 0)
-                xFrom = 0;
-
-            if (yFrom < 0)
-                yFrom = 0;
-
-            if (xTo > map.Width)
-                xTo = map.Width;
-
-            if (yTo > map.Width)
-                yTo = map.Width;
+            int x,y;
 
-            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..ca30e9e 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/RevertSphere.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/RevertSphere.cs
@@ -41,23 +41,23 @@ 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
- 
+
             if (duration > 1.0)
                 duration = 1.0;
             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..0342962 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/SmoothSphere.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/SmoothSphere.cs
@@ -34,23 +34,27 @@ 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;
             double[,] tweak = new double[map.Width,map.Height];
 
-            double area = strength; 
+            double area = strength;
             double step = strength / 4.0;
             duration = 0.03; //MCP Should be read from ini file
- 
+
 
             // 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/TerrainModifier.cs b/OpenSim/Region/CoreModules/World/Terrain/TerrainModifier.cs
index 7ebd08e..c6e992f 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/TerrainModifier.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/TerrainModifier.cs
@@ -370,9 +370,6 @@ namespace OpenSim.Region.CoreModules.World.Terrain
             }
             return mask;
         }
-
-
     }
-
 }
 
diff --git a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
index 932652c..6df0075 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
@@ -29,6 +29,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Reflection;
 using System.Net;
+using System.Threading;
 
 using log4net;
 using Nini.Config;
@@ -36,7 +37,6 @@ using Nini.Config;
 using OpenMetaverse;
 using Mono.Addins;
 
-using OpenSim.Data;
 using OpenSim.Framework;
 using OpenSim.Framework.Console;
 using OpenSim.Region.CoreModules.Framework.InterfaceCommander;
@@ -86,14 +86,14 @@ 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>();
+             new Dictionary<string, ITerrainModifier>();
+        private Dictionary<string, ITerrainEffect> m_plugineffects;
         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 +107,16 @@ 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 bool sendAll;
+            public int sendAllcurrentX;
+            public int sendAllcurrentY;
+
+
             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 +149,16 @@ 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);
+                sendAllcurrentX = 0;
+                sendAllcurrentY = 0;
+                sendAll = true;
             }
+
             // Logically OR's the terrain data's patch taint map into this client's update map.
             public void SetAll(TerrainData terrData)
             {
@@ -164,9 +171,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))
@@ -210,7 +218,9 @@ namespace OpenSim.Region.CoreModules.World.Terrain
             if (terrainConfig != null)
             {
                 m_InitialTerrain = terrainConfig.GetString("InitialTerrain", m_InitialTerrain);
-                m_sendTerrainUpdatesByViewDistance = terrainConfig.GetBoolean("SendTerrainUpdatesByViewDistance", m_sendTerrainUpdatesByViewDistance);
+                m_sendTerrainUpdatesByViewDistance =
+                    terrainConfig.GetBoolean(
+                        "SendTerrainUpdatesByViewDistance",m_sendTerrainUpdatesByViewDistance);
             }
         }
 
@@ -221,26 +231,34 @@ namespace OpenSim.Region.CoreModules.World.Terrain
             // Install terrain module in the simulator
             lock(m_scene)
             {
+                if(m_scene.Bakedmap != null)
+                {
+                    m_baked = m_scene.Bakedmap;
+                }
                 if (m_scene.Heightmap == null)
                 {
-                    m_channel = new TerrainChannel(m_InitialTerrain, (int)m_scene.RegionInfo.RegionSizeX,
-                                                                     (int)m_scene.RegionInfo.RegionSizeY,
-                                                                     (int)m_scene.RegionInfo.RegionSizeZ);
+                    if(m_baked != null)
+                        m_channel = m_baked.MakeCopy();
+                    else
+                        m_channel = new TerrainChannel(m_InitialTerrain,
+                                                (int)m_scene.RegionInfo.RegionSizeX,
+                                                (int)m_scene.RegionInfo.RegionSizeY,
+                                                (int)m_scene.RegionInfo.RegionSizeZ);
                     m_scene.Heightmap = m_channel;
-                    UpdateRevertMap();
                 }
                 else
                 {
                     m_channel = m_scene.Heightmap;
-                    UpdateRevertMap();
                 }
+                if(m_baked == null)
+                    UpdateBakedMap();
 
                 m_scene.RegisterModuleInterface<ITerrainModule>(this);
                 m_scene.EventManager.OnNewClient += EventManager_OnNewClient;
                 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 +297,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 +353,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 +445,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
                         {
                             ITerrainChannel channel = loader.Value.LoadStream(stream);
                             m_channel.Merge(channel, displacement, radianRotation, rotationDisplacement);
-                            UpdateRevertMap();
+                            UpdateBakedMap();
                         }
                         catch(NotImplementedException)
                         {
@@ -444,6 +463,37 @@ namespace OpenSim.Region.CoreModules.World.Terrain
             throw new TerrainException(String.Format("unable to load heightmap from file {0}: no loader available for that format", filename));
         }
 
+        public void LoadFromStream(string filename, Vector3 displacement,
+                                    float rotationDegrees, Vector2 boundingOrigin, Vector2 boundingSize, Stream stream)
+        {
+            foreach (KeyValuePair<string, ITerrainLoader> loader in m_loaders)
+            {
+                if (filename.EndsWith(loader.Key))
+                {
+                    lock (m_scene)
+                    {
+                        try
+                        {
+                            ITerrainChannel channel = loader.Value.LoadStream(stream);
+                            m_channel.MergeWithBounding(channel, displacement, rotationDegrees, boundingOrigin, boundingSize);
+                            UpdateBakedMap();
+                        }
+                        catch (NotImplementedException)
+                        {
+                            m_log.Error("[TERRAIN]: Unable to load heightmap, the " + loader.Value +
+                                        " parser does not support file loading. (May be save only)");
+                            throw new TerrainException(String.Format("unable to load heightmap: parser {0} does not support loading", loader.Value));
+                        }
+                    }
+
+                    m_log.Info("[TERRAIN]: File (" + filename + ") loaded successfully");
+                    return;
+                }
+            }
+            m_log.Error("[TERRAIN]: Unable to load heightmap, no file loader available for that format.");
+            throw new TerrainException(String.Format("unable to load heightmap from file {0}: no loader available for that format", filename));
+        }
+
         private static Stream URIFetch(Uri uri)
         {
             HttpWebRequest request = (HttpWebRequest)WebRequest.Create(uri);
@@ -506,12 +556,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,13 +571,12 @@ 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)
                 {
-                    lock(m_perClientPatchUpdates)
+                    lock (m_perClientPatchUpdates)
                     {
                         PatchUpdates pups;
                         if (!m_perClientPatchUpdates.TryGetValue(pClient.AgentId, out pups))
@@ -536,7 +585,6 @@ namespace OpenSim.Region.CoreModules.World.Terrain
                             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);
                     }
                 }
@@ -547,6 +595,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
                 pClient.SendLayerData(new float[10]);
             }
         }
+
         #region Plugin Loading Methods
 
         private void LoadPlugins()
@@ -595,7 +644,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
                     {
                         ITerrainLoader terLoader = (ITerrainLoader)Activator.CreateInstance(library.GetType(pluginType.ToString()));
                         m_loaders[terLoader.FileExtension] = terLoader;
-                        m_log.Info("L ... " + typeName);
+                        m_log.Debug("L ... " + typeName);
                     }
                 }
                 catch(AmbiguousMatchException)
@@ -611,12 +660,12 @@ namespace OpenSim.Region.CoreModules.World.Terrain
                 if (!m_plugineffects.ContainsKey(pluginName))
                 {
                     m_plugineffects.Add(pluginName, effect);
-                    m_log.Info("E ... " + pluginName);
+                    m_log.Debug("E ... " + pluginName);
                 }
                 else
                 {
                     m_plugineffects[pluginName] = effect;
-                    m_log.Info("E ... " + pluginName + " (Replaced)");
+                    m_log.Debug("E ... " + pluginName + " (Replaced)");
                 }
             }
         }
@@ -636,7 +685,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 +696,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);
@@ -673,22 +723,16 @@ 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);
+            m_scene.Bakedmap = m_baked;
+            m_scene.SaveBakedTerrain();
         }
 
         /// <summary>
@@ -715,11 +759,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;
@@ -781,39 +825,54 @@ namespace OpenSim.Region.CoreModules.World.Terrain
                 m_scene.RegionInfo.RegionName, filename, m_supportFileExtensionsForTileSave);
         }
 
+
         /// <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()
+        /// doing it async, since currently this is 2 heavy for heartbeat
+        private void EventManager_TerrainCheckUpdates()
         {
-            TerrainData terrData = m_channel.GetTerrainData();
+            Util.FireAndForget(
+                EventManager_TerrainCheckUpdatesAsync);
+        }
+
+        object TerrainCheckUpdatesLock = new object();
 
-            bool shouldTaint = false;
-            for(int x = 0; x < terrData.SizeX; x += Constants.TerrainPatchSize)
+        private void EventManager_TerrainCheckUpdatesAsync(object o)
+        {
+            // dont overlap execution
+            if(Monitor.TryEnter(TerrainCheckUpdatesLock))
             {
-                for(int y = 0; y < terrData.SizeY; y += Constants.TerrainPatchSize)
+                // this needs fixing
+                TerrainData terrData = m_channel.GetTerrainData();
+
+                bool shouldTaint = false;
+                for (int x = 0; x < terrData.SizeX; x += Constants.TerrainPatchSize)
                 {
-                    if (terrData.IsTaintedAt(x, y))
+                    for (int y = 0; y < terrData.SizeY; y += Constants.TerrainPatchSize)
                     {
-                        // Found a patch that was modified. Push this flag into the clients.
-                        SendToClients(terrData, x, y);
-                        shouldTaint = true;
+                        if (terrData.IsTaintedAt(x, y,true))
+                        {
+                            // Found a patch that was modified. Push this flag into the clients.
+                            SendToClients(terrData, x, y);
+                            shouldTaint = true;
+                        }
                     }
                 }
-            }
 
-            // This event also causes changes to be sent to the clients
-            CheckSendingPatchesToClients();
+                // This event also causes changes to be sent to the clients
+                CheckSendingPatchesToClients();
 
-            // If things changes, generate some events
-            if (shouldTaint)
-            {
-                m_scene.EventManager.TriggerTerrainTainted();
-                m_tainted = true;
+                // If things changes, generate some events
+                if (shouldTaint)
+                {
+                    m_scene.EventManager.TriggerTerrainTainted();
+                    m_tainted = true;
+                }
+                Monitor.Exit(TerrainCheckUpdatesLock);
             }
         }
 
@@ -883,8 +942,7 @@ 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);
         }
 
@@ -898,12 +956,33 @@ 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.
+                        wasLimited |= LimitChannelChanges(terrData, x, y);
+                    }
+                }
+            }
+            return wasLimited;
+        }
+
+        private bool EnforceEstateLimits(int startX, int startY, int endX, int endY)
+        {
+            TerrainData terrData = m_channel.GetTerrainData();
+
+            bool wasLimited = false;
+            for (int x = startX; x <= endX; x += Constants.TerrainPatchSize)
+            {
+                for (int y = startX; y <= endY; 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 +1005,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 +1032,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>
@@ -975,19 +1045,19 @@ namespace OpenSim.Region.CoreModules.World.Terrain
             if (m_sendTerrainUpdatesByViewDistance)
             {
                 // Add that this patch needs to be sent to the accounting for each client.
-                lock(m_perClientPatchUpdates)
+                lock (m_perClientPatchUpdates)
                 {
                     m_scene.ForEachScenePresence(presence =>
-                    {
-                        PatchUpdates thisClientUpdates;
-                        if (!m_perClientPatchUpdates.TryGetValue(presence.UUID, out thisClientUpdates))
                         {
-                            // There is a ScenePresence without a send patch map. Create one.
-                            thisClientUpdates = new PatchUpdates(terrData, presence);
-                            m_perClientPatchUpdates.Add(presence.UUID, thisClientUpdates);
+                            PatchUpdates thisClientUpdates;
+                            if (!m_perClientPatchUpdates.TryGetValue(presence.UUID, out thisClientUpdates))
+                            {
+                                // There is a ScenePresence without a send patch map. Create one.
+                                thisClientUpdates = new PatchUpdates(terrData, presence);
+                                m_perClientPatchUpdates.Add(presence.UUID, thisClientUpdates);
+                            }
+                            thisClientUpdates.SetByXY(x, y, true);
                         }
-                        thisClientUpdates.SetByXY(x, y, true);
-                    }
                     );
                 }
             }
@@ -998,7 +1068,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
                 //float[] heightMap = terrData.GetFloatsSerialized();
                 float[] heightMap = new float[10];
                 m_scene.ForEachClient(
-                    delegate(IClientAPI controller)
+                    delegate (IClientAPI controller)
                     {
                         controller.SendLayerData(x / Constants.TerrainPatchSize,
                                                  y / Constants.TerrainPatchSize,
@@ -1013,14 +1083,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,113 +1097,216 @@ 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)
                 {
+                    if(pups.Presence.IsDeleted)
+                        continue;
+
+                    // limit rate acording to udp land queue state
+                    if (!pups.Presence.ControllingClient.CanSendLayerData())
+                        continue;
+
                     if (pups.HasUpdates())
                     {
-                        // There is something that could be sent to this client.
-                        List<PatchesToSend> toSend = GetModifiedPatchesInViewDistance(pups);
-                        if (toSend.Count > 0)
+                        if (m_sendTerrainUpdatesByViewDistance)
                         {
-                            // m_log.DebugFormat("{0} CheckSendingPatchesToClient: sending {1} patches to {2} in region {3}",
-                            //                     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);
-                                // presence.ControllingClient.SendLayerData(xs.ToArray(), ys.ToArray(), null, TerrainPatch.LayerType.Land);
-                            }
-                            */
-
-                            // 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)
+                            // There is something that could be sent to this client.
+                            List<PatchesToSend> toSend = GetModifiedPatchesInViewDistance(pups);
+                            if (toSend.Count > 0)
                             {
-                                patchPieces[pieceIndex++] = pts.PatchX;
-                                patchPieces[pieceIndex++] = pts.PatchY;
+                                // m_log.DebugFormat("{0} CheckSendingPatchesToClient: sending {1} patches to {2} in region {3}",
+                                //                     LogHeader, toSend.Count, pups.Presence.Name, m_scene.RegionInfo.RegionName);
+                                // Sort the patches to send by the distance from the presence
+                                toSend.Sort();
+                                /*
+                                foreach (PatchesToSend pts in toSend)
+                                {
+                                    pups.Presence.ControllingClient.SendLayerData(pts.PatchX, pts.PatchY, null);
+                                    // presence.ControllingClient.SendLayerData(xs.ToArray(), ys.ToArray(), null, TerrainPatch.LayerType.Land);
+                                }
+                                */
+
+                                float[] patchPieces = new float[toSend.Count * 2];
+                                int pieceIndex = 0;
+                                foreach (PatchesToSend pts in toSend)
+                                {
+                                    patchPieces[pieceIndex++] = pts.PatchX;
+                                    patchPieces[pieceIndex++] = pts.PatchY;
+                                }
+                                pups.Presence.ControllingClient.SendLayerData(-toSend.Count, 0, patchPieces);
                             }
-                            pups.Presence.ControllingClient.SendLayerData(-toSend.Count, 0, patchPieces);
+                            if (pups.sendAll && toSend.Count < 1024)
+                                SendAllModifiedPatchs(pups);
+                        }
+                        else
+                            SendAllModifiedPatchs(pups);
+                    }
+                }
+            }
+        }
+        private void SendAllModifiedPatchs(PatchUpdates pups)
+        {
+            if (!pups.sendAll) // sanity
+                return;
+
+            int limitX = (int)m_scene.RegionInfo.RegionSizeX / Constants.TerrainPatchSize;
+            int limitY = (int)m_scene.RegionInfo.RegionSizeY / Constants.TerrainPatchSize;
+
+            if (pups.sendAllcurrentX >= limitX && pups.sendAllcurrentY >= limitY)
+            {
+                pups.sendAll = false;
+                pups.sendAllcurrentX = 0;
+                pups.sendAllcurrentY = 0;
+                return;
+            }
+
+            int npatchs = 0;
+            List<PatchesToSend> patchs = new List<PatchesToSend>();
+            int x = pups.sendAllcurrentX;
+            int y = pups.sendAllcurrentY;
+            // send it in the order viewer draws it
+            // even if not best for memory scan
+            for (; y < limitY; y++)
+            {
+                for (; x < limitX; x++)
+                {
+                    if (pups.GetByPatch(x, y))
+                    {
+                        pups.SetByPatch(x, y, false);
+                        patchs.Add(new PatchesToSend(x, y, 0));
+                        if (++npatchs >= 128)
+                        {
+                            x++;
+                            break;
                         }
                     }
                 }
+                if (npatchs >= 128)
+                    break;
+                x = 0;
+            }
+
+            if (x >= limitX && y >= limitY)
+            {
+                pups.sendAll = false;
+                pups.sendAllcurrentX = 0;
+                pups.sendAllcurrentY = 0;
+            }
+            else
+            {
+                pups.sendAllcurrentX = x;
+                pups.sendAllcurrentY = y;
+            }
+
+            npatchs = patchs.Count;
+            if (npatchs > 0)
+            {
+                int[] xPieces = new int[npatchs];
+                int[] yPieces = new int[npatchs];
+                float[] patchPieces = new float[npatchs * 2];
+                int pieceIndex = 0;
+                foreach (PatchesToSend pts in patchs)
+                {
+                    patchPieces[pieceIndex++] = pts.PatchX;
+                    patchPieces[pieceIndex++] = pts.PatchY;
+                }
+                pups.Presence.ControllingClient.SendLayerData(-npatchs, 0, patchPieces);
             }
         }
 
-        // 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;
-
-            // 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;
-
-            int startX = 0;
-            int endX = (int)m_scene.RegionInfo.RegionSizeX / Constants.TerrainPatchSize;
-            int startY = 0;
-            int endY = (int)m_scene.RegionInfo.RegionSizeY / Constants.TerrainPatchSize;
-
-            // The following only reduces the size of area scanned for updates. Only significant for very large varregions.
-            if (shouldCheckViewDistance)
-            {
-                // 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);
-            }
-
-            // 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++)
-            {
-                for(int y = startY; y < endY; y++)
+            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;
+
+            DrawDistance = DrawDistance / Constants.TerrainPatchSize;
+
+            int testposX;
+            int testposY;
+
+            if (Math.Abs(presence.AbsolutePosition.X - presence.CameraPosition.X) > 30
+                || Math.Abs(presence.AbsolutePosition.Y - presence.CameraPosition.Y) > 30)
+            {
+                testposX = (int)presence.CameraPosition.X / Constants.TerrainPatchSize;
+                testposY = (int)presence.CameraPosition.Y / Constants.TerrainPatchSize;
+            }
+            else
+            {
+                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 - 1;
+
+            int startY = testposY - DrawDistance;
+            if (startY < 0)
+                startY = 0;
+            else if (startY >= limitY)
+                startY = limitY - 1;
+
+            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++ > 1024)
+                            {
+                                y = endY;
+                                x = endX;
+                            }
                         }
                     }
                 }
@@ -1161,33 +1332,44 @@ 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();
+                            EnforceEstateLimits(startX, endX, startY, endY);
                     }
                 }
                 else
@@ -1202,22 +1384,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,11 +1427,12 @@ 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();
+                            EnforceEstateLimits(startX, endX, startY, endY);
                     }
                 }
                 else
@@ -1260,37 +1463,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 +1497,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 +1515,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 +1529,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];
@@ -1415,50 +1603,57 @@ 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 +1661,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 +1816,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");
diff --git a/OpenSim/Region/CoreModules/World/Terrain/Tests/TerrainModuleTests.cs b/OpenSim/Region/CoreModules/World/Terrain/Tests/TerrainModuleTests.cs
index 0563ad0..6a832bc 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/Tests/TerrainModuleTests.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/Tests/TerrainModuleTests.cs
@@ -45,8 +45,8 @@ namespace OpenSim.Region.CoreModules.Terrain.Tests
             //UUID userId = TestHelpers.ParseTail(0x1);
 
             TerrainModule tm = new TerrainModule();
-            Scene scene = new SceneHelpers().SetupScene();            
-            SceneHelpers.SetupSceneModules(scene, tm);             
+            Scene scene = new SceneHelpers().SetupScene();
+            SceneHelpers.SetupSceneModules(scene, tm);
 
             // Fillheight of 30
             {
diff --git a/OpenSim/Region/CoreModules/World/Terrain/Tests/TerrainTest.cs b/OpenSim/Region/CoreModules/World/Terrain/Tests/TerrainTest.cs
index 29e80ef..8e77962 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/Tests/TerrainTest.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/Tests/TerrainTest.cs
@@ -60,12 +60,13 @@ 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).");
             Assert.That(map[128, midRegion] == 0.0, "Raise brush should not change value at this point (128,128).");
-            Assert.That(map[0, midRegion] == 0.0, "Raise brush should not change value at this point (0,128).");
+//            Assert.That(map[0, midRegion] == 0.0, "Raise brush should not change value at this point (0,128).");
             //
             // Test LowerSphere
             //
@@ -79,13 +80,14 @@ 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).");
             Assert.That(map[120, midRegion] == 1.0, "Lower brush should not change value at this point (120,128).");
             Assert.That(map[128, midRegion] == 1.0, "Lower brush should not change value at this point (128,128).");
-            Assert.That(map[0, midRegion] == 1.0, "Lower brush should not change value at this point (0,128).");
+//            Assert.That(map[0, midRegion] == 1.0, "Lower brush should not change value at this point (0,128).");
         }
 
         [Test]
diff --git a/OpenSim/Region/CoreModules/World/Vegetation/VegetationModule.cs b/OpenSim/Region/CoreModules/World/Vegetation/VegetationModule.cs
index 3f5d375..4cee7a5 100644
--- a/OpenSim/Region/CoreModules/World/Vegetation/VegetationModule.cs
+++ b/OpenSim/Region/CoreModules/World/Vegetation/VegetationModule.cs
@@ -39,14 +39,14 @@ namespace OpenSim.Region.CoreModules.World.Vegetation
 {
     [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "VegetationModule")]
     public class VegetationModule : INonSharedRegionModule, IVegetationModule
-    { 
+    {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
+
         protected Scene m_scene;
-        
+
         protected static readonly PCode[] creationCapabilities = new PCode[] { PCode.Grass, PCode.NewTree, PCode.Tree };
         public PCode[] CreationCapabilities { get { return creationCapabilities; } }
-        
+
         public void Initialise(IConfigSource source)
         {
         }
@@ -83,10 +83,10 @@ namespace OpenSim.Region.CoreModules.World.Vegetation
             treeShape.PCode = newTree ? (byte)PCode.NewTree : (byte)PCode.Tree;
             treeShape.Scale = scale;
             treeShape.State = (byte)treeType;
-            
+
             return m_scene.AddNewPrim(uuid, groupID, position, rotation, treeShape);
         }
-        
+
         public SceneObjectGroup CreateEntity(
             UUID ownerID, UUID groupID, Vector3 pos, Quaternion rot, PrimitiveBaseShape shape)
         {
@@ -95,22 +95,23 @@ namespace OpenSim.Region.CoreModules.World.Vegetation
                 m_log.DebugFormat("[VEGETATION]: PCode {0} not handled by {1}", shape.PCode, Name);
                 return null;
             }
-            
+
             SceneObjectGroup sceneObject = new SceneObjectGroup(ownerID, pos, rot, shape);
             SceneObjectPart rootPart = sceneObject.GetPart(sceneObject.UUID);
-            
+
             // if grass or tree, make phantom
             //rootPart.TrimPermissions();
             rootPart.AddFlag(PrimFlags.Phantom);
             if (rootPart.Shape.PCode != (byte)PCode.Grass)
                 AdaptTree(ref shape);
-            
-            m_scene.AddNewSceneObject(sceneObject, true);
+
             sceneObject.SetGroup(groupID, null);
-            
+            m_scene.AddNewSceneObject(sceneObject, true);
+            sceneObject.InvalidateDeepEffectivePerms();
+
             return sceneObject;
         }
-        
+
         protected void AdaptTree(ref PrimitiveBaseShape tree)
         {
             // Tree size has to be adapted depending on its type
diff --git a/OpenSim/Region/CoreModules/World/Warp3DMap/TerrainSplat.cs b/OpenSim/Region/CoreModules/World/Warp3DMap/TerrainSplat.cs
index 9534ad3..226b330 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)
                                 {
@@ -225,7 +226,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
                     float pctX = (float)x / 255f;
                     float pctY = (float)y / 255f;
 
-                    // Use bilinear interpolation between the four corners of start height and 
+                    // Use bilinear interpolation between the four corners of start height and
                     // height range to select the current values at this position
                     float startHeight = ImageUtils.Bilinear(
                         startHeights[0],
@@ -256,7 +257,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
                     float highFreq = Perlin.turbulence2(vec.X, vec.Y, 2f) * 2.25f;
                     float noise = (lowFreq + highFreq) * 2f;
 
-                    // Combine the current height, generated noise, start height, and height range parameters, then scale all of it 
+                    // Combine the current height, generated noise, start height, and height range parameters, then scale all of it
                     float layer = ((height + noise - startHeight) / heightRange) * 4f;
                     if (Single.IsNaN(layer))
                         layer = 0f;
@@ -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 383a67f..d094bee 100644
--- a/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs
+++ b/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs
@@ -35,14 +35,14 @@ using System.Reflection;
 using CSJ2K;
 using Nini.Config;
 using log4net;
-using Rednettle.Warp3D;
+using Warp3D;
 using Mono.Addins;
 
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.PhysicsModules.SharedBase;
-using OpenSim.Services.Interfaces;
+//using OpenSim.Region.PhysicsModules.SharedBase;
+//using OpenSim.Services.Interfaces;
 
 using OpenMetaverse;
 using OpenMetaverse.Assets;
@@ -51,6 +51,7 @@ using OpenMetaverse.Rendering;
 using OpenMetaverse.StructuredData;
 
 using WarpRenderer = global::Warp3D.Warp3D;
+using System.Drawing.Drawing2D;
 
 namespace OpenSim.Region.CoreModules.World.Warp3DMap
 {
@@ -76,10 +77,19 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
         private bool m_texturePrims = true;     // true if should texture the rendered prims
         private float m_texturePrimSize = 48f;  // size of prim before we consider texturing it
         private bool m_renderMeshes = false;    // true if to render meshes rather than just bounding boxes
-        private bool m_useAntiAliasing = false; // true if to anti-alias the rendered image
-
+        private String m_cacheDirectory = "";
         private bool m_Enabled = false;
 
+//        private bool m_enable_date = false;
+//        private bool m_enable_regionName = false;
+        private bool m_enable_regionPosition = false;
+        private bool m_enable_refreshEveryMonth = false;
+//        private bool m_enable_HostedBy = false;
+//        private String m_enable_HostedByText = "";
+
+        //        private Bitmap lastImage = null;
+        private DateTime lastImageTime = DateTime.MinValue;
+
         #region Region Module interface
 
         public void Initialise(IConfigSource source)
@@ -94,9 +104,9 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
 
             m_Enabled = true;
 
-            m_drawPrimVolume 
+            m_drawPrimVolume
                 = Util.GetConfigVarFromSections<bool>(m_config, "DrawPrimOnMapTile", configSections, m_drawPrimVolume);
-            m_textureTerrain 
+            m_textureTerrain
                 = Util.GetConfigVarFromSections<bool>(m_config, "TextureOnMapTile", configSections, m_textureTerrain);
             m_texturePrims
                 = Util.GetConfigVarFromSections<bool>(m_config, "TexturePrims", configSections, m_texturePrims);
@@ -104,9 +114,19 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
                 = Util.GetConfigVarFromSections<float>(m_config, "TexturePrimSize", configSections, m_texturePrimSize);
             m_renderMeshes
                 = Util.GetConfigVarFromSections<bool>(m_config, "RenderMeshes", configSections, m_renderMeshes);
-            m_useAntiAliasing
-                = Util.GetConfigVarFromSections<bool>(m_config, "UseAntiAliasing", configSections, m_useAntiAliasing);
+            m_cacheDirectory
+                = Util.GetConfigVarFromSections<string>(m_config, "CacheDirectory", configSections, System.IO.Path.Combine(Util.cacheDir(), "MapImageCache"));
 
+
+//            m_enable_date = Util.GetConfigVarFromSections<bool>(m_config, "enableDate", configSections, false);
+//            m_enable_regionName = Util.GetConfigVarFromSections<bool>(m_config, "enableName", configSections, false);
+            m_enable_regionPosition = Util.GetConfigVarFromSections<bool>(m_config, "enablePosition", configSections, false);
+            m_enable_refreshEveryMonth = Util.GetConfigVarFromSections<bool>(m_config, "RefreshEveryMonth", configSections, true);
+//            m_enable_HostedBy = Util.GetConfigVarFromSections<bool>(m_config, "enableHostedBy", configSections, false);
+//            m_enable_HostedByText = Util.GetConfigVarFromSections<String>(m_config, "HosterText", configSections, String.Empty);
+
+            if (!Directory.Exists(m_cacheDirectory))
+                Directory.CreateDirectory(m_cacheDirectory);
         }
 
         public void AddRegion(Scene scene)
@@ -118,14 +138,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);
         }
@@ -155,21 +170,149 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
         #endregion
 
         #region IMapImageGenerator Members
+/*
+        public static string fillInt(int _i, int _l)
+        {
+            String _return = _i.ToString();
+
+            while(_return.Length < _l)
+            {
+                _return = 0 + _return;
+            }
+
+            return _return;
+        }
+
+        public static int getCurrentUnixTime()
+        {
+            return (Int32)(DateTime.UtcNow.Subtract(new DateTime(1970, 1, 1))).TotalSeconds;
+        }
+
+        public static String unixTimeToDateString(int unixTime)
+        {
+            DateTime unixStart = new DateTime(1970, 1, 1, 0, 0, 0, 0, System.DateTimeKind.Utc);
+            long unixTimeStampInTicks = (long)(unixTime * TimeSpan.TicksPerSecond);
+            DateTime _date = new DateTime(unixStart.Ticks + unixTimeStampInTicks, System.DateTimeKind.Utc);
 
+            return fillInt(_date.Day, 2) + "." + fillInt(_date.Month, 2) + "." + fillInt(_date.Year, 4) + " " + fillInt(_date.Hour, 2) + ":" + fillInt(_date.Minute, 2);
+        }
+
+        private void writeDateOnMap(ref Bitmap _map)
+        {
+            RectangleF rectf = new RectangleF(2, 1, 200, 25);
+
+            Graphics g = Graphics.FromImage(_map);
+            g.SmoothingMode = SmoothingMode.AntiAlias;
+            g.InterpolationMode = InterpolationMode.HighQualityBicubic;
+            g.PixelOffsetMode = PixelOffsetMode.HighQuality;
+            g.DrawString(unixTimeToDateString(getCurrentUnixTime()), new Font("Arial", 8), Brushes.White, rectf);
+            g.Flush();
+        }
+
+        private void writeNameOnMap(ref Bitmap _map)
+        {
+            RectangleF rectf = new RectangleF(2, m_scene.RegionInfo.RegionSizeX - 15, 200, 25);
+
+            Graphics g = Graphics.FromImage(_map);
+            g.SmoothingMode = SmoothingMode.AntiAlias;
+            g.InterpolationMode = InterpolationMode.HighQualityBicubic;
+            g.PixelOffsetMode = PixelOffsetMode.HighQuality;
+            g.DrawString(m_scene.Name, new Font("Arial", 8), Brushes.White, rectf);
+            g.Flush();
+        }
+*/
+        private void writePositionOnMap(ref Bitmap _map)
+        {
+            RectangleF rectf = new RectangleF(m_scene.RegionInfo.RegionSizeY - 75, m_scene.RegionInfo.RegionSizeX - 15, 80, 25);
+
+            Graphics g = Graphics.FromImage(_map);
+            g.SmoothingMode = SmoothingMode.AntiAlias;
+            g.InterpolationMode = InterpolationMode.HighQualityBicubic;
+            g.PixelOffsetMode = PixelOffsetMode.HighQuality;
+            g.DrawString("<" + m_scene.RegionInfo.RegionLocX + " " + m_scene.RegionInfo.RegionLocY + ">", new Font("Arial", 8), Brushes.White, rectf);
+            g.Flush();
+        }
+/*
+        private void writeHostedByOnMap(ref Bitmap _map)
+        {
+            RectangleF rectf = new RectangleF(2, m_scene.RegionInfo.RegionSizeX - 15, 200, 25);
+
+            Graphics g = Graphics.FromImage(_map);
+            g.SmoothingMode = SmoothingMode.AntiAlias;
+            g.InterpolationMode = InterpolationMode.HighQualityBicubic;
+            g.PixelOffsetMode = PixelOffsetMode.HighQuality;
+            g.DrawString(m_enable_HostedByText, new Font("Arial", 8), Brushes.Gray, rectf);
+            g.Flush();
+        }
+*/
+        public Bitmap CreateMapTileForce()
+        {
+            m_log.Info("[MAPTILE]: Forcing a map tile regenerate.");
+            File.Delete(System.IO.Path.Combine(m_cacheDirectory, m_scene.RegionInfo.RegionID + ".bmp"));
+            return CreateMapTile();
+        }
         public Bitmap CreateMapTile()
         {
-            // Vector3 camPos = new Vector3(127.5f, 127.5f, 221.7025033688163f);
-            // Camera above the middle of the region
-            Vector3 camPos = new Vector3(
-                            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);
+            if ((File.GetCreationTime(System.IO.Path.Combine(m_cacheDirectory, m_scene.RegionInfo.RegionID + ".bmp")).Month != DateTime.Now.Month) && (m_enable_refreshEveryMonth == true))
+            {
+                m_log.InfoFormat("[MAPTILE]: Clearing old map tile out of cache {0} {1}.", 
+                    File.GetCreationTime(System.IO.Path.Combine(m_cacheDirectory, m_scene.RegionInfo.RegionID + ".bmp")).Month, DateTime.Now.Month);
+                File.Delete(System.IO.Path.Combine(m_cacheDirectory, m_scene.RegionInfo.RegionID + ".bmp"));
+            }
+
+            if(File.Exists(System.IO.Path.Combine(m_cacheDirectory, m_scene.RegionInfo.RegionID + ".bmp")))
+            {
+                return new Bitmap(System.IO.Path.Combine(m_cacheDirectory, m_scene.RegionInfo.RegionID + ".bmp"));
+            }
+            else
+            {
+                m_log.Info("[MAPTILE]: Actually generating a map tile.");
+                /* 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,
+                                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);
+
+                Bitmap tile = CreateMapTile(viewport, false);
+
+//                if (m_enable_date)
+//                    writeDateOnMap(ref tile);
+
+//                if (m_enable_regionName)
+//                    writeNameOnMap(ref tile);
+
+                if (m_enable_regionPosition)
+                    writePositionOnMap(ref tile);
+
+//                if (m_enable_HostedBy)
+//                    writeHostedByOnMap(ref tile);
+
+                tile.Save(System.IO.Path.Combine(m_cacheDirectory, m_scene.RegionInfo.RegionID + ".bmp"));
+                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)
@@ -185,21 +328,14 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
             int width = viewport.Width;
             int height = viewport.Height;
 
-            if (m_useAntiAliasing)
-            {
-                width *= 2;
-                height *= 2;
-            }
-
             WarpRenderer renderer = new WarpRenderer();
 
-            renderer.CreateScene(width, height);
-            renderer.Scene.autoCalcNormals = false;
+            if(!renderer.CreateScene(width, height))
+                return new Bitmap(width,height);
 
             #region Camera
 
             warp_Vector pos = ConvertVector(viewport.Position);
-            pos.z -= 0.001f; // Works around an issue with the Warp3D camera
             warp_Vector lookat = warp_Vector.add(ConvertVector(viewport.Position), ConvertVector(viewport.LookDirection));
 
             renderer.Scene.defaultCamera.setPos(pos);
@@ -207,9 +343,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
 
             if (viewport.Orthographic)
             {
-                renderer.Scene.defaultCamera.isOrthographic = true;
-                renderer.Scene.defaultCamera.orthoViewWidth = viewport.OrthoWindowWidth;
-                renderer.Scene.defaultCamera.orthoViewHeight = viewport.OrthoWindowHeight;
+                renderer.Scene.defaultCamera.setOrthographic(true,viewport.OrthoWindowWidth, viewport.OrthoWindowHeight);
             }
             else
             {
@@ -231,24 +365,8 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
             renderer.Render();
             Bitmap bitmap = renderer.Scene.getImage();
 
-            if (m_useAntiAliasing)
-            {
-                using (Bitmap origBitmap = bitmap)
-                    bitmap = ImageUtils.ResizeImage(origBitmap, viewport.Width, viewport.Height);
-            }
-
-            // XXX: It shouldn't really be necesary to force a GC here as one should occur anyway pretty shortly
-            // afterwards.  It's generally regarded as a bad idea to manually GC.  If Warp3D is using lots of memory
-            // then this may be some issue with the Warp3D code itself, though it's also quite possible that generating
-            // this map tile simply takes a lot of memory.
-            foreach (var o in renderer.Scene.objectData.Values)
-            {
-                warp_Object obj = (warp_Object)o;
-                obj.vertexData = null;
-                obj.triangleData = null;
-            }
-
-            renderer.Scene.removeAllObjects();
+            renderer.Scene.destroy();
+            renderer.Reset();
             renderer = null;
             viewport = null;
 
@@ -284,16 +402,20 @@ 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,
-                                                       waterHeight,
-                                                       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
+            waterColorMaterial.setReflectivity(0);  // match water color with standard map module thanks lkalif
             waterColorMaterial.setTransparency((byte)((1f - WATER_COLOR.A) * 255f));
             renderer.Scene.addMaterial("WaterColor", waterColorMaterial);
-            renderer.SetObjectMaterial("Water", "WaterColor");
+
+            for (int x = 0; x < m_scene.RegionInfo.RegionSizeX / 256; x++)
+            {
+                for (int y = 0; y < m_scene.RegionInfo.RegionSizeY / 256; y++)
+                {
+                    renderer.AddPlane("Water-" + x + "-" + y, 256);
+                    renderer.Scene.sceneobject("Water-" + x + "-" + y).setPos(256 * x, waterHeight, 256 * y);
+                    renderer.SetObjectMaterial("Water-" + x + "-" + y, "WaterColor");
+                }
+            }
         }
 
         // Add a terrain to the renderer.
@@ -303,53 +425,53 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
         {
             ITerrainChannel terrain = m_scene.Heightmap;
 
+            float regionsx = m_scene.RegionInfo.RegionSizeX;
+            float regionsy = m_scene.RegionInfo.RegionSizeY;
+
             // 'diff' is the difference in scale between the real region size and the size of terrain we're buiding
-            float diff = (float)m_scene.RegionInfo.RegionSizeX / 256f;
+            float diff = regionsx / 256f;
+
+            int npointsx =(int)(regionsx / diff);
+            int npointsy =(int)(regionsy / diff);
 
-            warp_Object obj = new warp_Object(256 * 256, 255 * 255 * 2);
+            float invsx = 1.0f / regionsx;
+            float invsy = 1.0f / (float)m_scene.RegionInfo.RegionSizeY;
 
             // Create all the vertices for the terrain
-            for (float y = 0; y < m_scene.RegionInfo.RegionSizeY; y += diff)
+            warp_Object obj = new warp_Object();
+            for (float y = 0; y < regionsy; y += diff)
             {
-                for (float x = 0; x < m_scene.RegionInfo.RegionSizeX; x += diff)
+                for (float x = 0; x < regionsx; x += diff)
                 {
-                    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) );
+                    warp_Vector pos = ConvertVector(x , y , (float)terrain[(int)x, (int)y]);
+                    obj.addVertex(new warp_Vertex(pos, x *  invsx, 1.0f - y * invsy));
                 }
             }
 
-            // Now that we have all the vertices, make another pass and create
-            //     the normals for each of the surface triangles and
-            //     create the list of triangle indices.
-            for (float y = 0; y < m_scene.RegionInfo.RegionSizeY; y += diff)
+            // Now that we have all the vertices, make another pass and
+            // create the list of triangle indices.
+            float invdiff = 1.0f / diff;
+            int limx = npointsx - 1;
+            int limy = npointsy - 1;
+            for (float y = 0; y < regionsy; y += diff)
             {
-                for (float x = 0; x < m_scene.RegionInfo.RegionSizeX; x += diff)
+                for (float x = 0; x < regionsx; x += diff)
                 {
-                    float newX = x / diff;
-                    float newY = y / diff;
-                    if (newX < 255 && newY < 255)
+                    float newX = x * invdiff;
+                    float newY = y * invdiff;
+                    if (newX < limx && newY < limy)
                     {
-                        int v = (int)newY * 256 + (int)newX;
-
-                        // Normal for a triangle made up of three adjacent vertices
-                        Vector3 v1 = new Vector3(newX, newY, (float)terrain[(int)x, (int)y]);
-                        Vector3 v2 = new Vector3(newX + 1, newY, (float)terrain[(int)(x + 1), (int)y]);
-                        Vector3 v3 = new Vector3(newX, newY + 1, (float)terrain[(int)x, ((int)(y + 1))]);
-                        warp_Vector norm = ConvertVector(SurfaceNormal(v1, v2, v3));
-                        norm = norm.reverse();
-                        obj.vertex(v).n = norm;
+                        int v = (int)newY * npointsx + (int)newX;
 
                         // Make two triangles for each of the squares in the grid of vertices
                         obj.addTriangle(
                             v,
                             v + 1,
-                            v + 256);
+                            v + npointsx);
 
                         obj.addTriangle(
-                            v + 256 + 1,
-                            v + 256,
+                            v + npointsx + 1,
+                            v + npointsx,
                             v + 1);
                     }
                 }
@@ -382,18 +504,15 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
             Util.RegionHandleToWorldLoc(m_scene.RegionInfo.RegionHandle, out globalX, out globalY);
 
             warp_Texture texture;
-            using (
-                Bitmap image
-                    = TerrainSplat.Splat(terrain, textureIDs, startHeights, heightRanges,
+            using (Bitmap image = TerrainSplat.Splat(
+                        terrain, textureIDs, startHeights, heightRanges,
                         new Vector3d(globalX, globalY, 0.0), m_scene.AssetService, textureTerrain))
-            {
                 texture = new warp_Texture(image);
-            }
 
             warp_Material material = new warp_Material(texture);
             material.setReflectivity(50);
             renderer.Scene.addMaterial("TerrainColor", material);
-                        renderer.Scene.material("TerrainColor").setReflectivity(0); // reduces tile seams a bit thanks lkalif
+            renderer.Scene.material("TerrainColor").setReflectivity(0); // reduces tile seams a bit thanks lkalif
             renderer.SetObjectMaterial("Terrain", "TerrainColor");
         }
 
@@ -414,11 +533,13 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
         private void CreatePrim(WarpRenderer renderer, SceneObjectPart prim,
                 bool useTextures)
         {
-            const float MIN_SIZE = 2f;
+            const float MIN_SIZE_SQUARE = 4f;
 
             if ((PCode)prim.Shape.PCode != PCode.Prim)
                 return;
-            if (prim.Scale.LengthSquared() < MIN_SIZE * MIN_SIZE)
+            float primScaleLenSquared = prim.Scale.LengthSquared();
+
+            if (primScaleLenSquared < MIN_SIZE_SQUARE)
                 return;
 
             FacetedMesh renderMesh = null;
@@ -454,11 +575,11 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
                                         sculpt.Dispose();
                                     }
                                 }
-                                catch (Exception e)
+                                catch /*(Exception e)*/
                                 {
                                     Vector3 objectPos = prim.ParentGroup.RootPart.AbsolutePosition;
 //// TODO - print out owner of SceneObjectPart prim.
-                                    m_log.Warn(string.Format("[WARP 3D IMAGE MODULE]: Failed to decode asset {0} @ {1},{2},{3} - {4}.",
+                                    m_log.Error(string.Format("[WARP 3D IMAGE MODULE]: Failed to decode asset {0} @ {1},{2},{3} - {4}.",
                                         omvPrim.Sculpt.SculptTexture, objectPos.X, objectPos.Y, objectPos.Z, 
                                         prim.ParentGroup.RootPart.Name));
                                 }
@@ -477,20 +598,6 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
             if (renderMesh == null)
                 return;
 
-            warp_Vector primPos = ConvertVector(prim.GetWorldPosition());
-            warp_Quaternion primRot = ConvertQuaternion(prim.RotationOffset);
-
-            warp_Matrix m = warp_Matrix.quaternionMatrix(primRot);
-
-            if (prim.ParentID != 0)
-            {
-                SceneObjectGroup group = m_scene.SceneGraph.GetGroupByPrim(prim.LocalId);
-                if (group != null)
-                    m.transform(warp_Matrix.quaternionMatrix(ConvertQuaternion(group.RootPart.RotationOffset)));
-            }
-
-            warp_Vector primScale = ConvertVector(prim.Scale);
-
             string primID = prim.UUID.ToString();
 
             // Create the prim faces
@@ -498,27 +605,18 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
             for (int i = 0; i < renderMesh.Faces.Count; i++)
             {
                 Face face = renderMesh.Faces[i];
-                string meshName = primID + "-Face-" + i.ToString();
+                string meshName = primID + i.ToString();
 
                 // Avoid adding duplicate meshes to the scene
                 if (renderer.Scene.objectData.ContainsKey(meshName))
-                {
                     continue;
-                }
-
-                warp_Object faceObj = new warp_Object(face.Vertices.Count, face.Indices.Count / 3);
 
+                warp_Object faceObj = new warp_Object();
                 for (int j = 0; j < face.Vertices.Count; j++)
                 {
                     Vertex v = face.Vertices[j];
-
                     warp_Vector pos = ConvertVector(v.Position);
-                    warp_Vector norm = ConvertVector(v.Normal);
-                    
-                    if (prim.Shape.SculptTexture == UUID.Zero)
-                        norm = norm.reverse();
-                    warp_Vertex vert = new warp_Vertex(pos, norm, v.TexCoord.X, v.TexCoord.Y);
-
+                    warp_Vertex vert = new warp_Vertex(pos, v.TexCoord.X, v.TexCoord.Y);
                     faceObj.addVertex(vert);
                 }
 
@@ -533,17 +631,19 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
                 Primitive.TextureEntryFace teFace = prim.Shape.Textures.GetFace((uint)i);
                 Color4 faceColor = GetFaceColor(teFace);
                 string materialName = String.Empty;
-                if (m_texturePrims && prim.Scale.LengthSquared() > m_texturePrimSize*m_texturePrimSize)
+                if (m_texturePrims && primScaleLenSquared > m_texturePrimSize*m_texturePrimSize)
                     materialName = GetOrCreateMaterial(renderer, faceColor, teFace.TextureID);
                 else
                     materialName = GetOrCreateMaterial(renderer, faceColor);
 
+                warp_Vector primPos = ConvertVector(prim.GetWorldPosition());
+                warp_Quaternion primRot = ConvertQuaternion(prim.GetWorldRotation());
+                warp_Matrix m = warp_Matrix.quaternionMatrix(primRot);
                 faceObj.transform(m);
                 faceObj.setPos(primPos);
-                faceObj.scaleSelf(primScale.x, primScale.y, primScale.z);
+                faceObj.scaleSelf(prim.Scale.X, prim.Scale.Z, prim.Scale.Y);
 
                 renderer.Scene.addObject(meshName, faceObj);
-
                 renderer.SetObjectMaterial(meshName, materialName);
             }
         }
@@ -576,7 +676,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
 
                 if (!fetched)
                 {
-                    // Fetch the texture, decode and get the average color, 
+                    // Fetch the texture, decode and get the average color,
                     // then save it to a temporary metadata asset
                     AssetBase textureAsset = m_scene.AssetService.Get(face.TextureID.ToString());
                     if (textureAsset != null)
@@ -659,9 +759,9 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
                     using (Bitmap img = (Bitmap)imgDecoder.DecodeToImage(asset))
                         ret = new warp_Texture(img);
                 }
-                catch (Exception e)
+                catch /*(Exception e)*/
                 {
-                    m_log.Warn(string.Format("[WARP 3D IMAGE MODULE]: Failed to decode asset {0}, exception  ", id), e);
+                    m_log.Debug(string.Format("[WARP 3D IMAGE MODULE]: Failed to decode asset {0}, exception  ", id));
                 }
             }
 
@@ -671,7 +771,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)
         {
@@ -725,10 +824,10 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
                     {
                         width = bitmap.Width;
                         height = bitmap.Height;
-    
+
                         BitmapData bitmapData = bitmap.LockBits(new Rectangle(0, 0, width, height), ImageLockMode.ReadOnly, bitmap.PixelFormat);
                         pixelBytes = (bitmap.PixelFormat == PixelFormat.Format24bppRgb) ? 3 : 4;
-    
+
                         // Sum up the individual channels
                         unsafe
                         {
@@ -737,7 +836,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
                                 for (int y = 0; y < height; y++)
                                 {
                                     byte* row = (byte*)bitmapData.Scan0 + (y * bitmapData.Stride);
-    
+
                                     for (int x = 0; x < width; x++)
                                     {
                                         b += row[x * pixelBytes + 0];
@@ -752,7 +851,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
                                 for (int y = 0; y < height; y++)
                                 {
                                     byte* row = (byte*)bitmapData.Scan0 + (y * bitmapData.Stride);
-    
+
                                     for (int x = 0; x < width; x++)
                                     {
                                         b += row[x * pixelBytes + 0];
@@ -780,7 +879,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
                 }
                 catch (Exception ex)
                 {
-                    m_log.WarnFormat(
+                    m_log.DebugFormat(
                         "[WARP 3D IMAGE MODULE]: Error decoding JPEG2000 texture {0} ({1} bytes): {2}",
                         textureID, j2kData.Length, ex.Message);
 
diff --git a/OpenSim/Region/CoreModules/World/Wind/Plugins/ConfigurableWind.cs b/OpenSim/Region/CoreModules/World/Wind/Plugins/ConfigurableWind.cs
index 6af4050..a2b44df 100644
--- a/OpenSim/Region/CoreModules/World/Wind/Plugins/ConfigurableWind.cs
+++ b/OpenSim/Region/CoreModules/World/Wind/Plugins/ConfigurableWind.cs
@@ -50,7 +50,7 @@ namespace OpenSim.Region.CoreModules.World.Wind.Plugins
         private float m_avgDirection = 0.0f; // Average direction of the wind in degrees
         private float m_varStrength = 5.0f; // Max Strength  Variance
         private float m_varDirection = 30.0f;// Max Direction Variance
-        private float m_rateChange = 1.0f; // 
+        private float m_rateChange = 1.0f; //
 
         private Vector2 m_curPredominateWind = new Vector2();
 
@@ -70,7 +70,7 @@ namespace OpenSim.Region.CoreModules.World.Wind.Plugins
 
         public void Initialise()
         {
-            
+
         }
 
         #endregion
@@ -103,7 +103,7 @@ namespace OpenSim.Region.CoreModules.World.Wind.Plugins
             }
         }
 
-        public void WindUpdate(uint frame)
+        public bool WindUpdate(uint frame)
         {
             double avgAng = m_avgDirection * (Math.PI/180.0f);
             double varDir = m_varDirection * (Math.PI/180.0f);
@@ -111,7 +111,7 @@ namespace OpenSim.Region.CoreModules.World.Wind.Plugins
             // Prevailing wind algorithm
             // Inspired by Kanker Greenacre
 
-            // TODO: 
+            // TODO:
             // * This should probably be based on in-world time.
             // * should probably move all these local variables to class members and constants
             double time = DateTime.Now.TimeOfDay.Seconds / 86400.0f;
@@ -125,10 +125,8 @@ namespace OpenSim.Region.CoreModules.World.Wind.Plugins
             offset = Math.Sin(theta) * Math.Sin(theta*4) + (Math.Sin(theta*13) / 3);
             double windSpeed = m_avgStrength + (m_varStrength * offset);
 
-            if (windSpeed<0) 
-                windSpeed=0;
-
-
+            if (windSpeed < 0)
+                windSpeed = -windSpeed;
 
             m_curPredominateWind.X = (float)Math.Cos(windDir);
             m_curPredominateWind.Y = (float)Math.Sin(windDir);
@@ -144,6 +142,7 @@ namespace OpenSim.Region.CoreModules.World.Wind.Plugins
                     m_windSpeeds[y * 16 + x] = m_curPredominateWind;
                 }
             }
+            return true;
         }
 
         public Vector3 WindSpeed(float fX, float fY, float fZ)
@@ -158,9 +157,9 @@ namespace OpenSim.Region.CoreModules.World.Wind.Plugins
 
         public string Description
         {
-            get 
+            get
             {
-                return "Provides a predominate wind direction that can change within configured variances for direction and speed."; 
+                return "Provides a predominate wind direction that can change within configured variances for direction and speed.";
             }
         }
 
diff --git a/OpenSim/Region/CoreModules/World/Wind/Plugins/SimpleRandomWind.cs b/OpenSim/Region/CoreModules/World/Wind/Plugins/SimpleRandomWind.cs
index fcb0c10..d2ff7b3 100644
--- a/OpenSim/Region/CoreModules/World/Wind/Plugins/SimpleRandomWind.cs
+++ b/OpenSim/Region/CoreModules/World/Wind/Plugins/SimpleRandomWind.cs
@@ -82,22 +82,23 @@ namespace OpenSim.Region.CoreModules.World.Wind.Plugins
             }
         }
 
-        public void WindUpdate(uint frame)
+        public bool WindUpdate(uint frame)
         {
             //Make sure our object is valid (we haven't been disposed of yet)
-            if (m_windSpeeds != null)
+            if (m_windSpeeds == null)
+                return false;
+
+            for (int y = 0; y < 16; y++)
             {
-                for (int y = 0; y < 16; y++)
+                for (int x = 0; x < 16; x++)
                 {
-                    for (int x = 0; x < 16; x++)
-                    {
-                        m_windSpeeds[y * 16 + x].X = (float)(m_rndnums.NextDouble() * 2d - 1d); // -1 to 1
-                        m_windSpeeds[y * 16 + x].Y = (float)(m_rndnums.NextDouble() * 2d - 1d); // -1 to 1
-                        m_windSpeeds[y * 16 + x].X *= m_strength;
-                        m_windSpeeds[y * 16 + x].Y *= m_strength;
-                    }
+                    m_windSpeeds[y * 16 + x].X = (float)(m_rndnums.NextDouble() * 2d - 1d); // -1 to 1
+                    m_windSpeeds[y * 16 + x].Y = (float)(m_rndnums.NextDouble() * 2d - 1d); // -1 to 1
+                    m_windSpeeds[y * 16 + x].X *= m_strength;
+                    m_windSpeeds[y * 16 + x].Y *= m_strength;
                 }
             }
+            return true;
         }
 
         public Vector3 WindSpeed(float fX, float fY, float fZ)
diff --git a/OpenSim/Region/CoreModules/World/Wind/WindModule.cs b/OpenSim/Region/CoreModules/World/Wind/WindModule.cs
index 35014f5..96ba003 100644
--- a/OpenSim/Region/CoreModules/World/Wind/WindModule.cs
+++ b/OpenSim/Region/CoreModules/World/Wind/WindModule.cs
@@ -46,11 +46,13 @@ namespace OpenSim.Region.CoreModules
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         private uint m_frame = 0;
-        private uint m_frameLastUpdateClientArray = 0;
+        private int m_dataVersion = 0;
+//        private int m_regionID = 0;
         private int m_frameUpdateRate = 150;
         //private Random m_rndnums = new Random(Environment.TickCount);
         private Scene m_scene = null;
         private bool m_ready = false;
+        private bool m_inUpdate = false;
 
         private bool m_enabled = false;
         private IConfig m_windConfig;
@@ -96,11 +98,10 @@ namespace OpenSim.Region.CoreModules
 
             m_scene = scene;
             m_frame = 0;
-
             // Register all the Wind Model Plug-ins
             foreach (IWindModelPlugin windPlugin in AddinManager.GetExtensionObjects("/OpenSim/WindModule", false))
             {
-                m_log.InfoFormat("[WIND] Found Plugin: {0}", windPlugin.Name);
+                m_log.DebugFormat("[WIND] Found Plugin: {0}", windPlugin.Name);
                 m_availableWindPlugins.Add(windPlugin.Name, windPlugin);
             }
 
@@ -109,7 +110,7 @@ namespace OpenSim.Region.CoreModules
             {
                 m_activeWindPlugin = m_availableWindPlugins[m_dWindPluginName];
 
-                m_log.InfoFormat("[WIND] {0} plugin found, initializing.", m_dWindPluginName);
+                m_log.DebugFormat("[WIND] {0} plugin found, initializing.", m_dWindPluginName);
 
                 if (m_windConfig != null)
                 {
@@ -118,7 +119,6 @@ namespace OpenSim.Region.CoreModules
                 }
             }
 
-
             // if the plug-in wasn't found, default to no wind.
             if (m_activeWindPlugin == null)
             {
@@ -154,14 +154,14 @@ namespace OpenSim.Region.CoreModules
 
             // Register event handlers for when Avatars enter the region, and frame ticks
             m_scene.EventManager.OnFrame += WindUpdate;
-            m_scene.EventManager.OnMakeRootAgent += OnAgentEnteredRegion;
 
-            // Register the wind module 
+            // Register the wind module
             m_scene.RegisterModuleInterface<IWindModule>(this);
 
             // Generate initial wind values
-            GenWindPos();
-
+            GenWind();
+            // hopefully this will not be the same for all regions on same instance
+            m_dataVersion = (int)m_scene.AllocateLocalId();
             // Mark Module Ready for duty
             m_ready = true;
         }
@@ -184,7 +184,7 @@ namespace OpenSim.Region.CoreModules
 
             //  Remove our hooks
             m_scene.EventManager.OnFrame -= WindUpdate;
-            m_scene.EventManager.OnMakeRootAgent -= OnAgentEnteredRegion;
+//            m_scene.EventManager.OnMakeRootAgent -= OnAgentEnteredRegion;
 
         }
 
@@ -351,7 +351,7 @@ namespace OpenSim.Region.CoreModules
         #region IWindModule Methods
 
         /// <summary>
-        /// Retrieve the wind speed at the given region coordinate.  This 
+        /// Retrieve the wind speed at the given region coordinate.  This
         /// implimentation ignores Z.
         /// </summary>
         /// <param name="x">0...255</param>
@@ -396,7 +396,7 @@ namespace OpenSim.Region.CoreModules
 
         public string WindActiveModelPluginName
         {
-            get 
+            get
             {
                 if (m_activeWindPlugin != null)
                 {
@@ -416,67 +416,43 @@ namespace OpenSim.Region.CoreModules
         /// </summary>
         public void WindUpdate()
         {
-            if (((m_frame++ % m_frameUpdateRate) != 0) || !m_ready)
-            {
+            if ((!m_ready || m_inUpdate || (m_frame++ % m_frameUpdateRate) != 0))
                 return;
-            }
-
-            GenWindPos();
-
-            SendWindAllClients();
-        }
 
-        public void OnAgentEnteredRegion(ScenePresence avatar)
-        {
-            if (m_ready)
+            m_inUpdate = true;
+            Util.FireAndForget(delegate
             {
-                if (m_activeWindPlugin != null)
+                try
                 {
-                    // Ask wind plugin to generate a LL wind array to be cached locally
-                    // Try not to update this too often, as it may involve array copies
-                    if (m_frame >= (m_frameLastUpdateClientArray + m_frameUpdateRate))
+                    GenWind();
+                    m_scene.ForEachClient(delegate(IClientAPI client)
                     {
-                        windSpeeds = m_activeWindPlugin.WindLLClientArray();
-                        m_frameLastUpdateClientArray = m_frame;
-                    }
-                }
-
-                avatar.ControllingClient.SendWindData(windSpeeds);
-            }
-        }
+                        client.SendWindData(m_dataVersion, windSpeeds);
+                    });
 
-        private void SendWindAllClients()
-        {
-            if (m_ready)
-            {
-                if (m_scene.GetRootAgentCount() > 0)
+                }
+                finally
                 {
-                    // Ask wind plugin to generate a LL wind array to be cached locally
-                    // Try not to update this too often, as it may involve array copies
-                    if (m_frame >= (m_frameLastUpdateClientArray + m_frameUpdateRate))
-                    {
-                        windSpeeds = m_activeWindPlugin.WindLLClientArray();
-                        m_frameLastUpdateClientArray = m_frame;
-                    }
-
-                    m_scene.ForEachRootClient(delegate(IClientAPI client)
-                    {
-                        client.SendWindData(windSpeeds);
-                    });
+                    m_inUpdate = false;
                 }
-            }
+            },
+            null, "WindModuleUpdate");
         }
+
         /// <summary>
-        /// Calculate the sun's orbital position and its velocity.
+        /// Calculate new wind
+        /// returns false if no change
         /// </summary>
 
-        private void GenWindPos()
+        private bool GenWind()
         {
-            if (m_activeWindPlugin != null)
+            if (m_activeWindPlugin != null && m_activeWindPlugin.WindUpdate(m_frame))
             {
-                // Tell Wind Plugin to update it's wind data
-                m_activeWindPlugin.WindUpdate(m_frame);
+                windSpeeds = m_activeWindPlugin.WindLLClientArray();
+                m_dataVersion++;
+                return true;
             }
+            return false;
         }
     }
 }
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
index d862f18..5876df3 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
@@ -128,109 +128,116 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                 m_Clients.Add(remoteClient.AgentId);
             }
 
-            try
-            {
-                OnMapNameRequest(remoteClient, mapName, flags);
-            }
-            finally
-            {
-                lock (m_Clients)
-                    m_Clients.Remove(remoteClient.AgentId);
-            }
+            OnMapNameRequest(remoteClient, mapName, flags);
         }
 
         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);
+                try
+                {
+                    List<MapBlockData> blocks = new List<MapBlockData>();
+                    if (mapName.Length < 3 || (mapName.EndsWith("#") && mapName.Length < 4))
+                    {
+                        // final block, closing the search result
+                        AddFinalBlock(blocks,mapName);
 
-                // 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
-                //
-                // Caller, use this magic form instead:
-                // secondlife://http|!!mygrid.com|8002|Region+Name/128/128
-                // or url encode if possible.
-                // the hacks we do with this viewer...
-                //
-                if (mapName.Contains("|"))
-                    mapName = mapName.Replace('|', ':');
-                if (mapName.Contains("+"))
-                    mapName = mapName.Replace('+', ' ');
-                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)
-                {
-                    if ((flags & 2) == 2) // V2 sends this
+                    // 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
+                    //
+                    // Caller, use this magic form instead:
+                    // secondlife://http|!!mygrid.com|8002|Region+Name/128/128
+                    // or url encode if possible.
+                    // the hacks we do with this viewer...
+                    //
+                    bool needOriginalName = false;
+                    string mapNameOrig = mapName;
+                    if (mapName.Contains("|"))
                     {
-                        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);
+                        mapName = mapName.Replace('|', ':');
+                        needOriginalName = true;
                     }
-                    else
+                    if (mapName.Contains("+"))
                     {
-                        MapBlockData data = WorldMap.MapBlockFromGridRegion(info, flags);
-                        blocks.Add(data);
+                        mapName = mapName.Replace('+', ' ');
+                        needOriginalName = true;
                     }
-                }
-            }
+                    if (mapName.Contains("!"))
+                    {
+                        mapName = mapName.Replace('!', '/');
+                        needOriginalName = true;
+                    }
+                    if (mapName.Contains("."))
+                        needOriginalName = true;
 
-            // final block, closing the search result
-            AddFinalBlock(blocks);
+                    // 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.");
 
-            // flags are agent flags sent from the viewer.
-            // they have different values depending on different viewers, apparently
-            remoteClient.SendMapBlock(blocks, flags);
+                    //m_log.DebugFormat("[MAPSEARCHMODULE]: search {0} returned {1} regions", mapName, regionInfos.Count);
 
-            // 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!");
-            }
+                    MapBlockData data;
+                    if (regionInfos != null && regionInfos.Count > 0)
+                    {
+                        foreach (GridRegion info in regionInfos)
+                        {
+                            data = new MapBlockData();
+                            data.Agents = 0;
+                            data.Access = info.Access;
+                            MapBlockData block = new MapBlockData();
+                            WorldMap.MapBlockFromGridRegion(block, info, flags);
+
+                            if (flags == 2 &&  regionInfos.Count == 1 && needOriginalName)
+                                    block.Name = mapNameOrig;
+                            blocks.Add(block);
+                        }
+                    }
+
+                    // final block, closing the search result
+                    AddFinalBlock(blocks,mapNameOrig);
+
+                    // 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 == null || regionInfos.Count == 0)
+                            remoteClient.SendAgentAlertMessage("No regions found with that name.", true);
+    //                    else if (regionInfos.Count == 1)
+    //                        remoteClient.SendAgentAlertMessage("Region found!", false);
+                    }
+                }
+                finally
+                {
+                    lock (m_Clients)
+                        m_Clients.Remove(remoteClient.AgentId);
+                }
+            });
         }
 
-        private void AddFinalBlock(List<MapBlockData> blocks)
+        private void AddFinalBlock(List<MapBlockData> blocks,string name)
         {
                 // final block, closing the search result
                 MapBlockData data = new MapBlockData();
                 data.Agents = 0;
                 data.Access = (byte)SimAccess.NonExistent;
                 data.MapImageId = UUID.Zero;
-                data.Name = "";
+                data.Name = name;
                 data.RegionFlags = 0;
                 data.WaterHeight = 0; // not used
                 data.X = 0;
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
index db1187e..94072a5 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
@@ -66,32 +66,34 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
 
         private static readonly string DEFAULT_WORLD_MAP_EXPORT_PATH = "exportmap.jpg";
         private static readonly UUID STOP_UUID = UUID.Random();
-        private static readonly string m_mapLayerPath = "0001/";
+
+        private OpenSim.Framework.BlockingQueue<MapRequestState> requests = new OpenSim.Framework.BlockingQueue<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 ExpiringCache<string, int> m_blacklistedurls = new ExpiringCache<string, int>();
+        private ExpiringCache<ulong, int> m_blacklistedregions = new ExpiringCache<ulong, int>();
+        private ExpiringCache<ulong, string> m_cachedRegionMapItemsAddress = new ExpiringCache<ulong, string>();
+        private ExpiringCache<ulong, OSDMap> m_cachedRegionMapItemsResponses =
+                                        new ExpiringCache<ulong, OSDMap>();
         private List<UUID> m_rootAgents = new List<UUID>();
         private volatile bool threadrunning = false;
-
-        private IServiceThrottleModule m_ServiceThrottle;
-
+        // expire time for the blacklists in seconds
+        private double expireBlackListTime = 600.0; // 10 minutes
+        // expire mapItems responses time in seconds. Throttles requests to regions that do answer
+        private const double expireResponsesTime = 120.0; // 2 minutes ?
         //private int CacheRegionsDistance = 256;
 
         #region INonSharedRegionModule Members
-        public virtual void Initialise (IConfigSource config)
+        public virtual void Initialise(IConfigSource config)
         {
             string[] configSections = new string[] { "Map", "Startup" };
 
@@ -99,8 +101,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                 config, "WorldMapModule", configSections, "WorldMap") == "WorldMap")
                 m_Enabled = true;
 
-            blacklistTimeout 
-                = Util.GetConfigVarFromSections<int>(config, "BlacklistTimeout", configSections, 10 * 60) * 1000;
+            expireBlackListTime = (double)Util.GetConfigVarFromSections<int>(config, "BlacklistTimeout", configSections, 10 * 60);
         }
 
         public virtual void AddRegion(Scene scene)
@@ -128,7 +129,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
             }
         }
 
-        public virtual void RemoveRegion (Scene scene)
+        public virtual void RemoveRegion(Scene scene)
         {
             if (!m_Enabled)
                 return;
@@ -141,13 +142,11 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
             }
         }
 
-        public virtual void RegionLoaded (Scene scene)
+        public virtual void RegionLoaded(Scene scene)
         {
             if (!m_Enabled)
                 return;
 
-            m_ServiceThrottle = scene.RequestModuleInterface<IServiceThrottleModule>();
-
             m_mapImageGenerator = m_scene.RequestModuleInterface<IMapImageGenerator>();
             m_mapImageServiceModule = m_scene.RequestModuleInterface<IMapImageUploadModule>();
         }
@@ -177,16 +176,20 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
             regionimage = regionimage.Replace("-", "");
             m_log.Info("[WORLD MAP]: JPEG Map location: " + m_scene.RegionInfo.ServerURI + "index.php?method=" + regionimage);
 
+/*
             MainServer.Instance.AddHTTPHandler(regionimage,
                 new GenericHTTPDOSProtector(OnHTTPGetMapImage, OnHTTPThrottled, new BasicDosProtectorOptions()
-                    {
-                        AllowXForwardedFor = false,
-                        ForgetTimeSpan = TimeSpan.FromMinutes(2),
-                        MaxRequestsInTimeframe = 4,
-                        ReportingName = "MAPDOSPROTECTOR",
-                        RequestTimeSpan = TimeSpan.FromSeconds(10),
-                        ThrottledAction = BasicDOSProtector.ThrottleAction.DoThrottledMethod
-                    }).Process);
+                {
+                    AllowXForwardedFor = false,
+                    ForgetTimeSpan = TimeSpan.FromMinutes(2),
+                    MaxRequestsInTimeframe = 4,
+                    ReportingName = "MAPDOSPROTECTOR",
+                    RequestTimeSpan = TimeSpan.FromSeconds(10),
+                    ThrottledAction = BasicDOSProtector.ThrottleAction.DoThrottledMethod
+                }).Process);
+*/
+
+            MainServer.Instance.AddHTTPHandler(regionimage, OnHTTPGetMapImage);
             MainServer.Instance.AddLLSDHandler(
                 "/MAP/MapItems/" + m_scene.RegionInfo.RegionHandle.ToString(), HandleRemoteMapItemRequest);
 
@@ -197,13 +200,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;
@@ -212,6 +215,8 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
             m_scene.EventManager.OnNewClient -= OnNewClient;
             m_scene.EventManager.OnRegisterCaps -= OnRegisterCaps;
 
+            m_scene.UnregisterModuleInterface<IWorldMapModule>(this);
+
             string regionimage = "regionImage" + m_scene.RegionInfo.RegionID.ToString();
             regionimage = regionimage.Replace("-", "");
             MainServer.Instance.RemoveLLSDHandler("/MAP/MapItems/" + m_scene.RegionInfo.RegionHandle.ToString(),
@@ -222,12 +227,12 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
         public void OnRegisterCaps(UUID agentID, Caps caps)
         {
             //m_log.DebugFormat("[WORLD MAP]: OnRegisterCaps: agentID {0} caps {1}", agentID, caps);
-            string capsBase = "/CAPS/" + caps.CapsObjectPath;
+            string capspath =  "/CAPS/" + UUID.Random();
             caps.RegisterHandler(
                 "MapLayer",
                 new RestStreamHandler(
                     "POST",
-                    capsBase + m_mapLayerPath,
+                    capspath,
                     (request, path, param, httpRequest, httpResponse)
                         => MapLayerRequest(request, path, param, agentID, caps),
                     "MapLayer",
@@ -246,6 +251,8 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
         public string MapLayerRequest(string request, string path, string param,
                                       UUID agentID, Caps caps)
         {
+            // not sure about this....
+
             //try
             //
             //m_log.DebugFormat("[MAPLAYER]: path: {0}, param: {1}, agent:{2}",
@@ -261,54 +268,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());
@@ -334,9 +341,11 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
         /// <returns></returns>
         protected static OSDMapLayer GetOSDMapLayerResponse()
         {
+            // not sure about this.... 2048 or master 5000 and hack above?
+
             OSDMapLayer mapLayer = new OSDMapLayer();
-            mapLayer.Right = 5000;
-            mapLayer.Top = 5000;
+            mapLayer.Right = 2048;
+            mapLayer.Top = 2048;
             mapLayer.ImageID = new UUID("00000000-0000-1111-9999-000000000006");
 
             return mapLayer;
@@ -365,6 +374,11 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
             {
                 m_rootAgents.Remove(AgentId);
             }
+            lock (m_mapBlockRequestEvent)
+            {
+                if (m_mapBlockRequests.ContainsKey(AgentId))
+                    m_mapBlockRequests.Remove(AgentId);
+            }
         }
         #endregion
 
@@ -379,14 +393,20 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
             if (threadrunning) return;
             threadrunning = true;
 
-//            m_log.Debug("[WORLD MAP]: Starting remote MapItem request thread");
+            //            m_log.Debug("[WORLD MAP]: Starting remote MapItem request thread");
 
             WorkManager.StartThread(
                 process,
                 string.Format("MapItemRequestThread ({0})", m_scene.RegionInfo.RegionName),
                 ThreadPriority.BelowNormal,
                 true,
-                true);
+                false);
+            WorkManager.StartThread(
+                MapBlockSendThread,
+                string.Format("MapBlockSendThread ({0})", m_scene.RegionInfo.RegionName),
+                ThreadPriority.BelowNormal,
+                true,
+                false);
         }
 
         /// <summary>
@@ -396,13 +416,29 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
         {
             MapRequestState st = new MapRequestState();
             st.agentID = STOP_UUID;
-            st.EstateID=0;
-            st.flags=0;
-            st.godlike=false;
-            st.itemtype=0;
-            st.regionhandle=0;
+            st.EstateID = 0;
+            st.flags = 0;
+            st.godlike = false;
+            st.itemtype = 0;
+            st.regionhandle = 0;
 
             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,
@@ -415,315 +451,371 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                 if (!m_rootAgents.Contains(remoteClient.AgentId))
                     return;
             }
+
+            // local or remote request?
+            if (regionhandle != 0 && regionhandle != m_scene.RegionInfo.RegionHandle)
+            {
+                // its Remote Map Item Request
+                // ensures that the blockingqueue doesn't get borked if the GetAgents() timing changes.
+                RequestMapItems("", remoteClient.AgentId, flags, EstateID, godlike, itemtype, regionhandle);
+                return;
+            }
+
             uint xstart = 0;
             uint ystart = 0;
             Util.RegionHandleToWorldLoc(m_scene.RegionInfo.RegionHandle, out xstart, out ystart);
-            if (itemtype == (int)GridItemType.AgentLocations)
+
+            // its about this region...
+
+            List<mapItemReply> mapitems = new List<mapItemReply>();
+            mapItemReply mapitem = new mapItemReply();
+
+            // viewers only ask for green dots to each region now
+            // except at login with regionhandle 0
+            // possible on some other rare ocasions
+            // use previus hack of sending all items with the green dots
+
+            bool adultRegion;
+            if (regionhandle == 0)
             {
-                if (regionhandle == 0 || regionhandle == m_scene.RegionInfo.RegionHandle)
+                switch (itemtype)
                 {
-                    // Just requesting map info about the current, local region
-                    int tc = Environment.TickCount;
-                    List<mapItemReply> mapitems = new List<mapItemReply>();
-                    mapItemReply mapitem = new mapItemReply();
-                    if (m_scene.GetRootAgentCount() <= 1)
-                    {
-                        mapitem = new mapItemReply(
+                    case (int)GridItemType.AgentLocations:
+                        // Service 6 right now (MAP_ITEM_AGENTS_LOCATION; green dots)
+
+                        int tc = Environment.TickCount;
+                        if (m_scene.GetRootAgentCount() <= 1)
+                        {
+                            mapitem = new mapItemReply(
                                         xstart + 1,
                                         ystart + 1,
                                         UUID.Zero,
                                         Util.Md5Hash(m_scene.RegionInfo.RegionName + tc.ToString()),
                                         0, 0);
-                        mapitems.Add(mapitem);
-                    }
-                    else
-                    {
-                        m_scene.ForEachRootScenePresence(delegate(ScenePresence sp)
+                            mapitems.Add(mapitem);
+                        }
+                        else
                         {
+                            m_scene.ForEachRootScenePresence(delegate (ScenePresence sp)
+                            {
                             // Don't send a green dot for yourself
                             if (sp.UUID != remoteClient.AgentId)
-                            {
-                                mapitem = new mapItemReply(
+                                {
+                                    mapitem = new mapItemReply(
                                         xstart + (uint)sp.AbsolutePosition.X,
                                         ystart + (uint)sp.AbsolutePosition.Y,
                                         UUID.Zero,
                                         Util.Md5Hash(m_scene.RegionInfo.RegionName + tc.ToString()),
                                         1, 0);
-                                mapitems.Add(mapitem);
-                            }
-                        });
-                    }
-                    remoteClient.SendMapItemReply(mapitems.ToArray(), itemtype, flags);
-                }
-                else
-                {
-                    // Remote Map Item Request
+                                    mapitems.Add(mapitem);
+                                }
+                            });
+                        }
+                        remoteClient.SendMapItemReply(mapitems.ToArray(), itemtype, flags);
+                        break;
 
-                    // ensures that the blockingqueue doesn't get borked if the GetAgents() timing changes.
-                    RequestMapItems("",remoteClient.AgentId,flags,EstateID,godlike,itemtype,regionhandle);
-                }
-            }
-            else if (itemtype == (int)GridItemType.LandForSale) // Service 7 (MAP_ITEM_LAND_FOR_SALE)
-            {
-                if (regionhandle == 0 || regionhandle == m_scene.RegionInfo.RegionHandle)
-                {
-                    // Parcels
-                    ILandChannel landChannel = m_scene.LandChannel;
-                    List<ILandObject> parcels = landChannel.AllParcels();
-
-                    // Local Map Item Request
-                    List<mapItemReply> mapitems = new List<mapItemReply>();
-                    mapItemReply mapitem = new mapItemReply();
-                    if ((parcels != null) && (parcels.Count >= 1))
-                    {
-                        foreach (ILandObject parcel_interface in parcels)
+                    case (int)GridItemType.Telehub:
+                        // Service 1 (MAP_ITEM_TELEHUB)
+
+                        SceneObjectGroup sog = m_scene.GetSceneObjectGroup(m_scene.RegionInfo.RegionSettings.TelehubObject);
+                        if (sog != null)
                         {
-                            // Play it safe
-                            if (!(parcel_interface is LandObject))
-                                continue;
+                            mapitem = new mapItemReply(
+                                            xstart + (uint)sog.AbsolutePosition.X,
+                                            ystart + (uint)sog.AbsolutePosition.Y,
+                                            UUID.Zero,
+                                            sog.Name,
+                                            0,  // color (not used)
+                                            0   // 0 = telehub / 1 = infohub
+                                            );
+                            mapitems.Add(mapitem);
+                            remoteClient.SendMapItemReply(mapitems.ToArray(), itemtype, flags);
+                        }
+                        break;
 
-                            LandObject land = (LandObject)parcel_interface;
-                            LandData parcel = land.LandData;
+                    case (int)GridItemType.AdultLandForSale:
+                    case (int)GridItemType.LandForSale:
 
-                            // Show land for sale
-                            if ((parcel.Flags & (uint)ParcelFlags.ForSale) == (uint)ParcelFlags.ForSale)
-                            {
-                                Vector3 min = parcel.AABBMin;
-                                Vector3 max = parcel.AABBMax;
-                                float x = (min.X+max.X)/2;
-                                float y = (min.Y+max.Y)/2;
+                        // Service 7 (MAP_ITEM_LAND_FOR_SALE)
+                        adultRegion = m_scene.RegionInfo.RegionSettings.Maturity == 2;
+                        if (adultRegion)
+                        {
+                            if (itemtype == (int)GridItemType.LandForSale)
+                                break;
+                        }
+                        else
+                        {
+                            if (itemtype == (int)GridItemType.AdultLandForSale)
+                                break;
+                        }
 
-                                mapitem = new mapItemReply(
+                        // Parcels
+                        ILandChannel landChannel = m_scene.LandChannel;
+                        List<ILandObject> parcels = landChannel.AllParcels();
+
+                        if ((parcels != null) && (parcels.Count >= 1))
+                        {
+                            foreach (ILandObject parcel_interface in parcels)
+                            {
+                                // Play it safe
+                                if (!(parcel_interface is LandObject))
+                                    continue;
+
+                                LandObject land = (LandObject)parcel_interface;
+                                LandData parcel = land.LandData;
+
+                                // Show land for sale
+                                if ((parcel.Flags & (uint)ParcelFlags.ForSale) == (uint)ParcelFlags.ForSale)
+                                {
+                                    Vector3 min = parcel.AABBMin;
+                                    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,
                                                 parcel.GlobalID,
                                                 parcel.Name,
                                                 parcel.Area,
                                                 parcel.SalePrice
-                                );
-                                mapitems.Add(mapitem);
+                                    );
+                                    mapitems.Add(mapitem);
+                                }
                             }
                         }
-                    }
-                    remoteClient.SendMapItemReply(mapitems.ToArray(), itemtype, flags);
-                }
-                else
-                {
-                    // Remote Map Item Request
+                        remoteClient.SendMapItemReply(mapitems.ToArray(), itemtype, flags);
+                        break;
 
-                    // ensures that the blockingqueue doesn't get borked if the GetAgents() timing changes.
-                    RequestMapItems("",remoteClient.AgentId,flags,EstateID,godlike,itemtype,regionhandle);
+                    case (uint)GridItemType.PgEvent:
+                    case (uint)GridItemType.MatureEvent:
+                    case (uint)GridItemType.AdultEvent:
+                    case (uint)GridItemType.Classified:
+                    case (uint)GridItemType.Popular:
+                        // TODO
+                        // just dont not cry about them
+                        break;
+
+                    default:
+                        // unkown map item type
+                        m_log.DebugFormat("[WORLD MAP]: Unknown MapItem type {1}", itemtype);
+                        break;
                 }
             }
-            else if (itemtype == (int)GridItemType.Telehub) // Service 1 (MAP_ITEM_TELEHUB)
+            else
             {
-                if (regionhandle == 0 || regionhandle == m_scene.RegionInfo.RegionHandle)
-                {
-                    List<mapItemReply> mapitems = new List<mapItemReply>();
-                    mapItemReply mapitem = new mapItemReply();
+                // send all items till we get a better fix
 
-                    SceneObjectGroup sog = m_scene.GetSceneObjectGroup(m_scene.RegionInfo.RegionSettings.TelehubObject);
-                    if (sog != null)
-                    {
-                        mapitem = new mapItemReply(
-                                            xstart + (uint)sog.AbsolutePosition.X,
-                                            ystart + (uint)sog.AbsolutePosition.Y,
-                                            UUID.Zero,
-                                            sog.Name,
-                                            0,  // color (not used)
-                                            0   // 0 = telehub / 1 = infohub
-                        );
-                        mapitems.Add(mapitem);
+                // Service 6 right now (MAP_ITEM_AGENTS_LOCATION; green dots)
 
-                        remoteClient.SendMapItemReply(mapitems.ToArray(), itemtype, flags);
-                    }
+                int tc = Environment.TickCount;
+                if (m_scene.GetRootAgentCount() <= 1)
+                {
+                    mapitem = new mapItemReply(
+                                xstart + 1,
+                                ystart + 1,
+                                UUID.Zero,
+                                Util.Md5Hash(m_scene.RegionInfo.RegionName + tc.ToString()),
+                                0, 0);
+                    mapitems.Add(mapitem);
                 }
                 else
                 {
-                    // Remote Map Item Request
-                    RequestMapItems("",remoteClient.AgentId,flags,EstateID,godlike,itemtype,regionhandle);
+                    m_scene.ForEachRootScenePresence(delegate (ScenePresence sp)
+                    {
+                        // Don't send a green dot for yourself
+                        if (sp.UUID != remoteClient.AgentId)
+                        {
+                            mapitem = new mapItemReply(
+                                xstart + (uint)sp.AbsolutePosition.X,
+                                ystart + (uint)sp.AbsolutePosition.Y,
+                                UUID.Zero,
+                                Util.Md5Hash(m_scene.RegionInfo.RegionName + tc.ToString()),
+                                1, 0);
+                            mapitems.Add(mapitem);
+                        }
+                    });
                 }
-            }
-        }
+                remoteClient.SendMapItemReply(mapitems.ToArray(), 6, flags);
+                mapitems.Clear();
 
-        private int nAsyncRequests = 0;
-        /// <summary>
-        /// Processing thread main() loop for doing remote mapitem requests
-        /// </summary>
-        public void process()
-        {
-            //const int MAX_ASYNC_REQUESTS = 20;
-            try
-            {
-                while (true)
+                // Service 1 (MAP_ITEM_TELEHUB)
+
+                SceneObjectGroup sog = m_scene.GetSceneObjectGroup(m_scene.RegionInfo.RegionSettings.TelehubObject);
+                if (sog != null)
                 {
-                    MapRequestState st = requests.Dequeue(1000);
+                    mapitem = new mapItemReply(
+                                    xstart + (uint)sog.AbsolutePosition.X,
+                                    ystart + (uint)sog.AbsolutePosition.Y,
+                                    UUID.Zero,
+                                    sog.Name,
+                                    0,  // color (not used)
+                                    0   // 0 = telehub / 1 = infohub
+                                    );
+                    mapitems.Add(mapitem);
+                    remoteClient.SendMapItemReply(mapitems.ToArray(), 1, flags);
+                    mapitems.Clear();
+                }
 
-                    // end gracefully
-                    if (st.agentID == STOP_UUID)
-                        break;
+                // Service 7 (MAP_ITEM_LAND_FOR_SALE)
 
-                    if (st.agentID != UUID.Zero)
+                uint its = 7;
+                if (m_scene.RegionInfo.RegionSettings.Maturity == 2)
+                    its = 10;
+
+                // Parcels
+                ILandChannel landChannel = m_scene.LandChannel;
+                List<ILandObject> parcels = landChannel.AllParcels();
+
+                if ((parcels != null) && (parcels.Count >= 1))
+                {
+                    foreach (ILandObject parcel_interface in parcels)
                     {
-                        bool dorequest = true;
-                        lock (m_rootAgents)
-                        {
-                            if (!m_rootAgents.Contains(st.agentID))
-                                dorequest = false;
-                        }
+                        // Play it safe
+                        if (!(parcel_interface is LandObject))
+                            continue;
+
+                        LandObject land = (LandObject)parcel_interface;
+                        LandData parcel = land.LandData;
 
-                        if (dorequest &&  !m_blacklistedregions.ContainsKey(st.regionhandle))
+                        // Show land for sale
+                        if ((parcel.Flags & (uint)ParcelFlags.ForSale) == (uint)ParcelFlags.ForSale)
                         {
-                            while (nAsyncRequests >= MAX_ASYNC_REQUESTS) // hit the break
-                                Thread.Sleep(80);
-
-                            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);
+                            Vector3 min = parcel.AABBMin;
+                            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,
+                                        parcel.GlobalID,
+                                        parcel.Name,
+                                        parcel.Area,
+                                        parcel.SalePrice
+                            );
+                            mapitems.Add(mapitem);
                         }
                     }
-
-                    Watchdog.UpdateThread();
+                    if(mapitems.Count >0)
+                        remoteClient.SendMapItemReply(mapitems.ToArray(), its, flags);
+                    mapitems.Clear();
                 }
             }
-            catch (Exception e)
-            {
-                m_log.ErrorFormat("[WORLD MAP]: Map item request thread terminated abnormally with exception {0}", e);
-            }
-
-            threadrunning = false;
-            Watchdog.RemoveThread();
         }
 
-        const int MAX_ASYNC_REQUESTS = 20;
-
+        private int nAsyncRequests = 0;
         /// <summary>
-        /// Enqueues the map item request into the services throttle processing thread
+        /// Processing thread main() loop for doing remote mapitem requests
         /// </summary>
-        /// <param name="state"></param>
-        public void EnqueueMapItemRequest(MapRequestState st)
+        public void process()
         {
+            const int MAX_ASYNC_REQUESTS = 20;
+            ScenePresence av = null;
+            MapRequestState st = null;
 
-            m_ServiceThrottle.Enqueue("map-item", st.regionhandle.ToString() + st.agentID.ToString(), delegate
+            try
             {
-                if (st.agentID != UUID.Zero)
+                while (true)
                 {
-                    bool dorequest = true;
-                    lock (m_rootAgents)
-                    {
-                        if (!m_rootAgents.Contains(st.agentID))
-                            dorequest = false;
-                    }
+                    av = null;
+                    st = null;
 
-                    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;
-                        }
+                    st = requests.Dequeue(4500);
+                    Watchdog.UpdateThread();
 
-                        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);
-                    }
-                }
-            });
-        }
+                    if (st == null || st.agentID == UUID.Zero)
+                        continue;
 
-        /// <summary>
-        /// Sends the mapitem response to the IClientAPI
-        /// </summary>
-        /// <param name="response">The OSDMap Response for the mapitem</param>
-        private void RequestMapItemsCompleted(IAsyncResult iar)
-        {
-            AsyncResult result = (AsyncResult)iar;
-            RequestMapItemsDelegate icon = (RequestMapItemsDelegate)result.AsyncDelegate;
+                    // end gracefully
+                    if (st.agentID == STOP_UUID)
+                        break;
 
-            OSDMap response = (OSDMap)icon.EndInvoke(iar);
+                    // agent gone?
 
-            Interlocked.Decrement(ref nAsyncRequests);
+                    m_scene.TryGetScenePresence(st.agentID, out av);
+                    if (av == null || av.IsChildAgent || av.IsDeleted || av.IsInTransit)
+                        continue;
 
-            if (!response.ContainsKey("requestID"))
-                return;
+                    // region unreachable?
+                    if (m_blacklistedregions.Contains(st.regionhandle))
+                        continue;
 
-            UUID requestID = response["requestID"].AsUUID();
+                    bool dorequest = true;
+                    OSDMap responseMap = null;
 
-            if (requestID != UUID.Zero)
-            {
-                MapRequestState mrs = new MapRequestState();
-                mrs.agentID = UUID.Zero;
-                lock (m_openRequests)
-                {
-                    if (m_openRequests.ContainsKey(requestID))
+                    // check if we are already serving this region
+                    lock (m_cachedRegionMapItemsResponses)
                     {
-                        mrs = m_openRequests[requestID];
-                        m_openRequests.Remove(requestID);
+                        if (m_cachedRegionMapItemsResponses.Contains(st.regionhandle))
+                        {
+                            m_cachedRegionMapItemsResponses.TryGetValue(st.regionhandle, out responseMap);
+                            dorequest = false;
+                        }
+                        else
+                            m_cachedRegionMapItemsResponses.Add(st.regionhandle, null, expireResponsesTime); //  a bit more time for the access
                     }
-                }
 
-                if (mrs.agentID != UUID.Zero)
-                {
-                    ScenePresence av = null;
-                    m_scene.TryGetScenePresence(mrs.agentID, out av);
-                    if (av != null)
+                    if (dorequest)
                     {
-                        if (response.ContainsKey(mrs.itemtype.ToString()))
+                        // nothig for region, fire a request
+                        Interlocked.Increment(ref nAsyncRequests);
+                        MapRequestState rst = st;
+                        Util.FireAndForget(x =>
                         {
-                            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()))
+                            RequestMapItemsAsync(rst.agentID, rst.flags, rst.EstateID, rst.godlike, rst.itemtype, rst.regionhandle);
+                        });
+                    }
+                    else
+                    {
+                        // do we have the response?
+                        if (responseMap != null)
                         {
-                            List<mapItemReply> returnitems = new List<mapItemReply>();
-                            OSDArray itemarray = (OSDArray)response[itemtype.ToString()];
-                            for (int i = 0; i < itemarray.Count; i++)
+                            if(av!=null)
                             {
-                                OSDMap mapitem = (OSDMap)itemarray[i];
-                                mapItemReply mi = new mapItemReply();
-                                mi.FromOSD(mapitem);
-                                returnitems.Add(mi);
+                                // this will mainly only send green dots now
+                                if (responseMap.ContainsKey(st.itemtype.ToString()))
+                                {
+                                    List<mapItemReply> returnitems = new List<mapItemReply>();
+                                    OSDArray itemarray = (OSDArray)responseMap[st.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(), st.itemtype, st.flags & 0xffff);
+                                }
                             }
-                            av.ControllingClient.SendMapItemReply(returnitems.ToArray(), itemtype, mrs.flags);
                         }
-
-                        // Service 1 (MAP_ITEM_TELEHUB)
-                        itemtype = (uint)GridItemType.Telehub;
-
-                        if (response.ContainsKey(itemtype.ToString()))
+                        else
                         {
-                            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);
+                            // request still beeing processed, enqueue it back
+                            requests.Enqueue(st);
+                            if (requests.Count() < 3)
+                                Thread.Sleep(100);
                         }
                     }
+
+                    while (nAsyncRequests >= MAX_ASYNC_REQUESTS) // hit the break
+                    {
+                        Thread.Sleep(100);
+                        Watchdog.UpdateThread();
+                    }
                 }
             }
+
+            catch (Exception e)
+            {
+                m_log.ErrorFormat("[WORLD MAP]: Map item request thread terminated abnormally with exception {0}", e);
+            }
+
+            threadrunning = false;
+            Watchdog.RemoveThread();
         }
 
         /// <summary>
@@ -746,11 +838,12 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
             st.godlike = godlike;
             st.itemtype = itemtype;
             st.regionhandle = regionhandle;
-            EnqueueMapItemRequest(st);
+
+            requests.Enqueue(st);
         }
 
-        private delegate OSDMap RequestMapItemsDelegate(UUID id, uint flags,
-            uint EstateID, bool godlike, uint itemtype, ulong regionhandle);
+        uint[] itemTypesForcedSend = new uint[] { 6, 1, 7, 10 }; // green dots, infohub, land sells
+
         /// <summary>
         /// Does the actual remote mapitem request
         /// This should be called from an asynchronous thread
@@ -765,94 +858,55 @@ 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);
+            // m_log.DebugFormat("[WORLDMAP]: RequestMapItemsAsync; region handle: {0} {1}", regionhandle, itemtype);
 
             string httpserver = "";
             bool blacklisted = false;
-            lock (m_blacklistedregions)
-            {
-                if (m_blacklistedregions.ContainsKey(regionhandle))
-                {
-                    if (Environment.TickCount > (m_blacklistedregions[regionhandle] + blacklistTimeout))
-                    {
-                        m_log.DebugFormat("[WORLD MAP]: Unblock blacklisted region {0}", regionhandle);
 
-                        m_blacklistedregions.Remove(regionhandle);
-                    }
-                    else
-                        blacklisted = true;
-                }
-            }
+            lock (m_blacklistedregions)
+                blacklisted = m_blacklistedregions.Contains(regionhandle);
 
             if (blacklisted)
-                return new OSDMap();
+            {
+                Interlocked.Decrement(ref nAsyncRequests);
+                return;
+            }
 
             UUID requestID = UUID.Random();
             lock (m_cachedRegionMapItemsAddress)
-            {
-                if (m_cachedRegionMapItemsAddress.ContainsKey(regionhandle))
-                    httpserver = m_cachedRegionMapItemsAddress[regionhandle];
-            }
-            if (httpserver.Length == 0)
+                m_cachedRegionMapItemsAddress.TryGetValue(regionhandle, out httpserver);
+
+            if (httpserver == null || httpserver.Length == 0)
             {
                 uint x = 0, y = 0;
                 Util.RegionHandleToWorldLoc(regionhandle, out x, out y);
+
                 GridRegion mreg = m_scene.GridService.GetRegionByPosition(m_scene.RegionInfo.ScopeID, (int)x, (int)y);
 
                 if (mreg != null)
                 {
                     httpserver = mreg.ServerURI + "MAP/MapItems/" + regionhandle.ToString();
                     lock (m_cachedRegionMapItemsAddress)
-                    {
-                        if (!m_cachedRegionMapItemsAddress.ContainsKey(regionhandle))
-                            m_cachedRegionMapItemsAddress.Add(regionhandle, httpserver);
-                    }
-                }
-                else
-                {
-                    lock (m_blacklistedregions)
-                    {
-                        if (!m_blacklistedregions.ContainsKey(regionhandle))
-                            m_blacklistedregions.Add(regionhandle, Environment.TickCount);
-                    }
-                    //m_log.InfoFormat("[WORLD MAP]: Blacklisted region {0}", regionhandle.ToString());
+                        m_cachedRegionMapItemsAddress.AddOrUpdate(regionhandle, httpserver, 2.0 * expireBlackListTime);
                 }
             }
 
-            blacklisted = false;
             lock (m_blacklistedurls)
             {
-                if (m_blacklistedurls.ContainsKey(httpserver))
+                if (httpserver == null || httpserver.Length == 0 || m_blacklistedurls.Contains(httpserver))
                 {
-                    if (Environment.TickCount > (m_blacklistedurls[httpserver] + blacklistTimeout))
-                    {
-                        m_log.DebugFormat("[WORLD MAP]: Unblock blacklisted URL {0}", httpserver);
+                    // Can't find the http server or its blocked
+                    lock (m_blacklistedregions)
+                        m_blacklistedregions.AddOrUpdate(regionhandle, 0, expireBlackListTime);
 
-                        m_blacklistedurls.Remove(httpserver);
-                    }
-                    else
-                        blacklisted = true;
+                    Interlocked.Decrement(ref nAsyncRequests);
+                    return;
                 }
             }
 
-            // 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);
-
             WebRequest mapitemsrequest = null;
             try
             {
@@ -861,132 +915,144 @@ 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";
             mapitemsrequest.ContentType = "application/xml+llsd";
-            OSDMap RAMap = new OSDMap();
 
+            OSDMap RAMap = new OSDMap();
             // string RAMapString = RAMap.ToString();
             OSD LLSDofRAMap = RAMap; // RENAME if this works
 
             byte[] buffer = OSDParser.SerializeLLSDXmlBytes(LLSDofRAMap);
+
             OSDMap responseMap = new OSDMap();
-            responseMap["requestID"] = OSD.FromUUID(requestID);
 
-            Stream os = null;
             try
             { // send the Post
                 mapitemsrequest.ContentLength = buffer.Length;   //Count bytes to send
-                os = mapitemsrequest.GetRequestStream();
-                os.Write(buffer, 0, buffer.Length);         //Send it
-                //m_log.DebugFormat("[WORLD MAP]: Getting MapItems from {0}", httpserver);
+                using (Stream os = mapitemsrequest.GetRequestStream())
+                    os.Write(buffer, 0, buffer.Length);         //Send it
+              //m_log.DebugFormat("[WORLD MAP]: Getting MapItems from {0}", httpserver);
             }
             catch (WebException ex)
             {
                 m_log.WarnFormat("[WORLD MAP]: Bad send on GetMapItems {0}", ex.Message);
-                responseMap["connect"] = OSD.FromBoolean(false);
+                m_log.WarnFormat("[WORLD MAP]: Blacklisted url {0}", httpserver);
                 lock (m_blacklistedurls)
-                {
-                    if (!m_blacklistedurls.ContainsKey(httpserver))
-                        m_blacklistedurls.Add(httpserver, Environment.TickCount);
-                }
-
-                m_log.WarnFormat("[WORLD MAP]: Blacklisted {0}", httpserver);
+                    m_blacklistedurls.AddOrUpdate(httpserver, 0, expireBlackListTime);
+                lock (m_blacklistedregions)
+                    m_blacklistedregions.AddOrUpdate(regionhandle, 0, expireBlackListTime);
 
-                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;
-            }
-            finally
-            {
-                if (os != null)
-                    os.Dispose();
+                Interlocked.Decrement(ref nAsyncRequests);
+                return;
             }
 
             string response_mapItems_reply = null;
-            {
+            { // get the response
                 try
                 {
                     using (WebResponse webResponse = mapitemsrequest.GetResponse())
                     {
                         if (webResponse != null)
                         {
-                            using (Stream s = webResponse.GetResponseStream())
-                                using (StreamReader sr = new StreamReader(s))
-                                    response_mapItems_reply = sr.ReadToEnd().Trim();
+                            using (StreamReader sr = new StreamReader(webResponse.GetResponseStream()))
+                            {
+                                response_mapItems_reply = sr.ReadToEnd().Trim();
+                            }
                         }
                         else
                         {
-                            return new OSDMap();
-                        }
+                            Interlocked.Decrement(ref nAsyncRequests);
+                            return;
                         }
+                    }
                 }
                 catch (WebException)
                 {
-                    responseMap["connect"] = OSD.FromBoolean(false);
                     lock (m_blacklistedurls)
-                    {
-                        if (!m_blacklistedurls.ContainsKey(httpserver))
-                            m_blacklistedurls.Add(httpserver, Environment.TickCount);
-                    }
+                       m_blacklistedurls.AddOrUpdate(httpserver, 0, expireBlackListTime);
+                    lock (m_blacklistedregions)
+                        m_blacklistedregions.AddOrUpdate(regionhandle, 0, expireBlackListTime);
 
-                    m_log.WarnFormat("[WORLD MAP]: Blacklisted {0}", httpserver);
+                    m_log.WarnFormat("[WORLD MAP]: Blacklisted url {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);
-                    }
+                        m_blacklistedregions.AddOrUpdate(regionhandle, 0, expireBlackListTime);
 
-                    return responseMap;
+                    Interlocked.Decrement(ref nAsyncRequests);
+                    return;
                 }
 
-                OSD rezResponse = null;
                 try
                 {
-                    rezResponse = OSDParser.DeserializeLLSDXml(response_mapItems_reply);
-
-                    responseMap = (OSDMap)rezResponse;
-                    responseMap["requestID"] = OSD.FromUUID(requestID);
+                    responseMap = (OSDMap)OSDParser.DeserializeLLSDXml(response_mapItems_reply);
                 }
                 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);
-                    }
+                        m_blacklistedregions.AddOrUpdate(regionhandle, 0, expireBlackListTime);
 
-                    return responseMap;
+                    Interlocked.Decrement(ref nAsyncRequests);
+                    return;
                 }
             }
 
-            if (!responseMap.ContainsKey(itemtype.ToString())) // remote sim doesnt have the stated region handle
+            // cache the response that may include other valid items
+            lock (m_cachedRegionMapItemsResponses)
+                m_cachedRegionMapItemsResponses.AddOrUpdate(regionhandle, responseMap, expireResponsesTime);
+
+            flags &= 0xffff;
+
+            if (id != UUID.Zero)
             {
-                m_log.DebugFormat("[WORLD MAP]: Remote sim does not have the stated region. Blacklisting.");
-                lock (m_blacklistedregions)
+                ScenePresence av = null;
+                m_scene.TryGetScenePresence(id, out av);
+                if (av != null && !av.IsChildAgent && !av.IsDeleted && !av.IsInTransit)
                 {
-                    if (!m_blacklistedregions.ContainsKey(regionhandle))
-                        m_blacklistedregions.Add(regionhandle, Environment.TickCount);
+                    // send all the items or viewers will never ask for them, except green dots
+                    foreach (uint itfs in itemTypesForcedSend)
+                    {
+                        if (responseMap.ContainsKey(itfs.ToString()))
+                        {
+                            List<mapItemReply> returnitems = new List<mapItemReply>();
+//                            OSDArray itemarray = (OSDArray)responseMap[itemtype.ToString()];
+                            OSDArray itemarray = (OSDArray)responseMap[itfs.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);
+                            av.ControllingClient.SendMapItemReply(returnitems.ToArray(), itfs, flags);
+                        }
+                    }
                 }
             }
 
-            return responseMap;
+            Interlocked.Decrement(ref nAsyncRequests);
         }
 
         /// <summary>
@@ -996,87 +1062,196 @@ 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);
+
+            GetAndSendBlocks(remoteClient, minX, minY, maxX, maxY, flag);
+        }
+
+        private const double SPAMBLOCKTIMEms = 300000; // 5 minutes
+        private Dictionary<UUID,double> spamBlocked = new Dictionary<UUID,double>();
+
+        protected virtual List<MapBlockData> GetAndSendBlocks(IClientAPI remoteClient, int minX, int minY, int maxX, int maxY, uint flag)
         {
-            if ((flag & 0x10000) != 0)  // user clicked on qthe map a tile that isn't visible
+            // anti spam because of FireStorm 4.7.7 absurd request repeat rates
+            // possible others
+
+            double now = Util.GetTimeStampMS();
+            UUID agentID = remoteClient.AgentId;
+
+            lock (m_mapBlockRequestEvent)
             {
-                List<MapBlockData> response = new List<MapBlockData>();
-
-                // this should return one mapblock at most. It is triggered by a click
-                // 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);
-                if (regions != null)
+                if(spamBlocked.ContainsKey(agentID))
                 {
-                    foreach (GridRegion r in regions)
+                    if(spamBlocked[agentID] < now &&
+                            (!m_mapBlockRequests.ContainsKey(agentID) ||
+                            m_mapBlockRequests[agentID].Count == 0 ))
                     {
-                        if (r.RegionLocX == Util.RegionToWorldLoc((uint)minX)
-                            && r.RegionLocY == Util.RegionToWorldLoc((uint)minY) )
+                        spamBlocked.Remove(agentID);
+                        m_log.DebugFormat("[WoldMapModule] RequestMapBlocks release spammer {0}", agentID);
+                    }
+                    else
+                        return new List<MapBlockData>();
+                }
+                else
+                {
+                // ugly slow expire spammers
+                    if(spamBlocked.Count > 0)
+                    {
+                        UUID k = UUID.Zero;
+                        bool expireone = false;
+                        foreach(UUID k2 in spamBlocked.Keys)
                         {
-                            // found it => add it to response
-                            // Version 2 viewers can handle the larger regions
-                            if ((flag & 2) == 2)
-                                response.AddRange(Map2BlockFromGridRegion(r, flag));
-                            else
-                                response.Add(MapBlockFromGridRegion(r, flag));
-                            break;
+                            if(spamBlocked[k2] < now &&
+                                (!m_mapBlockRequests.ContainsKey(k2) ||
+                                m_mapBlockRequests[k2].Count == 0 ))
+                            {
+                                m_log.DebugFormat("[WoldMapModule] RequestMapBlocks release spammer {0}", k2);
+                                k = k2;
+                                expireone = true;
+                            }
+                        break; // doing one at a time
                         }
+                    if(expireone)
+                        spamBlocked.Remove(k);
                     }
                 }
 
-                if (response.Count == 0)
+//                m_log.DebugFormat("[WoldMapModule] RequestMapBlocks {0}={1}={2}={3} {4}", minX, minY, maxX, maxY, flag);
+
+                MapBlockRequestData req = new MapBlockRequestData();
+
+                req.client = remoteClient;
+                req.minX = minX;
+                req.maxX = maxX;
+                req.minY = minY;
+                req.maxY = maxY;
+                req.flags = flag;
+
+                if (!m_mapBlockRequests.ContainsKey(agentID))
+                    m_mapBlockRequests[agentID] = new Queue<MapBlockRequestData>();
+                if(m_mapBlockRequests[agentID].Count < 150 )
+                    m_mapBlockRequests[agentID].Enqueue(req);
+                else
                 {
-                    // response still empty => couldn't find the map-tile the user clicked on => tell the client
-                    MapBlockData block = new MapBlockData();
-                    block.X = (ushort)minX;
-                    block.Y = (ushort)minY;
-                    block.Access = (byte)SimAccess.Down; // means 'simulator is offline'
-                    // block.Access = (byte)SimAccess.NonExistent;
-                    response.Add(block);
+                    spamBlocked[agentID] = now + SPAMBLOCKTIMEms;
+                    m_log.DebugFormat("[WoldMapModule] RequestMapBlocks blocking spammer {0} for {1} s",agentID, SPAMBLOCKTIMEms/1000.0);
                 }
-                // The lower 16 bits are an unsigned int16
-                remoteClient.SendMapBlock(response, flag & 0xffff);
+                m_mapBlockRequestEvent.Set();
             }
-            else
+
+            return new List<MapBlockData>();
+        }
+
+        protected void MapBlockSendThread()
+        {
+            List<MapBlockRequestData> thisRunData = new List<MapBlockRequestData>();
+            while (true)
             {
-                // normal mapblock request. Use the provided values
-                GetAndSendBlocks(remoteClient, minX, minY, maxX, maxY, flag);
+                while(!m_mapBlockRequestEvent.WaitOne(4900))
+                {
+                    Watchdog.UpdateThread();
+                    if(m_scene == null)
+                        return;
+                }
+                Watchdog.UpdateThread();
+                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();
+                }
+
+                if(thisRunData.Count > 0)
+                {
+                    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);
+                    }
+
+                    thisRunData.Clear();
+                }
+
+                Thread.Sleep(50);
             }
         }
 
-        protected virtual List<MapBlockData> GetAndSendBlocks(IClientAPI remoteClient, int minX, int minY, int maxX, int maxY, uint flag)
+        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);
+
+            // only send a negative answer for a single region request
+            // corresponding to a click on the map. Current viewers
+            // keep displaying "loading.." without this
+            if (regions.Count == 0 && (flag & 0x10000) != 0 && minX == maxX && minY == maxY)
+            {
+                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;
+            }
+
+            flag &= 0xffff;
+
             foreach (GridRegion r in regions)
             {
-                // Version 2 viewers can handle the larger regions
-                if ((flag & 2) == 2)
-                    mapBlocks.AddRange(Map2BlockFromGridRegion(r, flag));
-                else
-                    mapBlocks.Add(MapBlockFromGridRegion(r, flag));
+                if (r == null)
+                    continue;
+                MapBlockData block = new MapBlockData();
+                MapBlockFromGridRegion(block, r, flag);
+                mapBlocks.Add(block);
+                allBlocks.Add(block);
+
+                if (mapBlocks.Count >= 10)
+                {
+                    remoteClient.SendMapBlock(mapBlocks, flag);
+                    mapBlocks.Clear();
+                    Thread.Sleep(50);
+                }
             }
-            remoteClient.SendMapBlock(mapBlocks, flag & 0xffff);
+            if (mapBlocks.Count > 0)
+                remoteClient.SendMapBlock(mapBlocks, flag);
 
-            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();
+            if (r == null)
+            {
+                // we should not get here ??
+//                block.Access = (byte)SimAccess.Down; this is for a grid reply on r
+                block.Access = (byte)SimAccess.NonExistent;
+                block.MapImageId = UUID.Zero;
+                return;
+            }
 
             block.Access = r.Access;
-            switch (flag & 0xffff)
+            switch (flag)
             {
                 case 0:
                     block.MapImageId = r.TerrainImage;
@@ -1089,50 +1264,13 @@ 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)
-        {
-            List<MapBlockData> blocks = new List<MapBlockData>();
-            MapBlockData block = new MapBlockData();
-            if (r == null)
-            {
-                block.Access = (byte)SimAccess.Down;
-                block.MapImageId = UUID.Zero;
-                blocks.Add(block);
-            }
-            else
-            {
-                block.Access = r.Access;
-                switch (flag & 0xffff)
-                {
-                    case 0:
-                        block.MapImageId = r.TerrainImage;
-                        break;
-                    case 2:
-                        block.MapImageId = r.ParcelImage;
-                        break;
-                    default:
-                        block.MapImageId = UUID.Zero;
-                        break;
-                }
-                block.Name = r.RegionName;
-                block.X = (ushort)(r.RegionLocX / Constants.RegionSize);
-                block.Y = (ushort)(r.RegionLocY / Constants.RegionSize);
-                block.SizeX = (ushort)r.RegionSizeX;
-                block.SizeY = (ushort)r.RegionSizeY;
-                blocks.Add(block);
-            }
-            return blocks;
         }
 
-
         public Hashtable OnHTTPThrottled(Hashtable keysvals)
         {
             Hashtable reply = new Hashtable();
@@ -1145,67 +1283,71 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
 
         public Hashtable OnHTTPGetMapImage(Hashtable keysvals)
         {
-            m_log.Debug("[WORLD MAP]: Sending map image jpeg");
             Hashtable reply = new Hashtable();
             int statuscode = 200;
             byte[] jpeg = new byte[0];
 
-            if (myMapImageJPEG.Length == 0)
+            if (m_scene.RegionInfo.RegionSettings.TerrainImageID != UUID.Zero)
             {
-                MemoryStream imgstream = null;
-                Bitmap mapTexture = new Bitmap(1,1);
-                ManagedImage managedImage;
-                Image image = (Image)mapTexture;
+                m_log.Debug("[WORLD MAP]: Sending map image jpeg");
 
-                try
+                if (myMapImageJPEG.Length == 0)
                 {
-                    // Taking our jpeg2000 data, decoding it, then saving it to a byte array with regular jpeg data
+                    MemoryStream imgstream = null;
+                    Bitmap mapTexture = new Bitmap(1, 1);
+                    ManagedImage managedImage;
+                    Image image = (Image)mapTexture;
 
-                    imgstream = new MemoryStream();
+                    try
+                    {
+                        // Taking our jpeg2000 data, decoding it, then saving it to a byte array with regular jpeg data
 
-                    // non-async because we know we have the asset immediately.
-                    AssetBase mapasset = m_scene.AssetService.Get(m_scene.RegionInfo.RegionSettings.TerrainImageID.ToString());
+                        imgstream = new MemoryStream();
 
-                    // Decode image to System.Drawing.Image
-                    if (OpenJPEG.DecodeToImage(mapasset.Data, out managedImage, out image))
-                    {
-                        // Save to bitmap
-                        mapTexture = new Bitmap(image);
+                        // non-async because we know we have the asset immediately.
+                        AssetBase mapasset = m_scene.AssetService.Get(m_scene.RegionInfo.RegionSettings.TerrainImageID.ToString());
 
-                        EncoderParameters myEncoderParameters = new EncoderParameters();
-                        myEncoderParameters.Param[0] = new EncoderParameter(Encoder.Quality, 95L);
+                        // Decode image to System.Drawing.Image
+                        if (OpenJPEG.DecodeToImage(mapasset.Data, out managedImage, out image))
+                        {
+                            // Save to bitmap
+                            mapTexture = new Bitmap(image);
 
-                        // Save bitmap to stream
-                        mapTexture.Save(imgstream, GetEncoderInfo("image/jpeg"), myEncoderParameters);
+                            EncoderParameters myEncoderParameters = new EncoderParameters();
+                            myEncoderParameters.Param[0] = new EncoderParameter(Encoder.Quality, 95L);
 
-                        // Write the stream to a byte array for output
-                        jpeg = imgstream.ToArray();
-                        myMapImageJPEG = jpeg;
+                            // Save bitmap to stream
+                            mapTexture.Save(imgstream, GetEncoderInfo("image/jpeg"), myEncoderParameters);
+
+                            // Write the stream to a byte array for output
+                            jpeg = imgstream.ToArray();
+                            myMapImageJPEG = jpeg;
+                        }
                     }
-                }
-                catch (Exception)
-                {
-                    // Dummy!
-                    m_log.Warn("[WORLD MAP]: Unable to generate Map image");
-                }
-                finally
-                {
-                    // Reclaim memory, these are unmanaged resources
-                    // If we encountered an exception, one or more of these will be null
-                    if (mapTexture != null)
-                        mapTexture.Dispose();
+                    catch (Exception)
+                    {
+                        // Dummy!
+                        m_log.Warn("[WORLD MAP]: Unable to generate Map image");
+                    }
+                    finally
+                    {
+                        // Reclaim memory, these are unmanaged resources
+                        // If we encountered an exception, one or more of these will be null
+                        if (mapTexture != null)
+                            mapTexture.Dispose();
 
-                    if (image != null)
-                        image.Dispose();
+                        if (image != null)
+                            image.Dispose();
 
-                    if (imgstream != null)
-                        imgstream.Dispose();
+                        if (imgstream != null)
+                            imgstream.Dispose();
+                    }
+                }
+                else
+                {
+                    // Use cached version so we don't have to loose our mind
+                    jpeg = myMapImageJPEG;
                 }
-            }
-            else
-            {
-                // Use cached version so we don't have to loose our mind
-                jpeg = myMapImageJPEG;
             }
 
             reply["str_response_string"] = Convert.ToBase64String(jpeg);
@@ -1267,22 +1409,14 @@ 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)
                 {
                     textures.Add(texAsset);
                 }
-                //else
-                //{
-                //    // WHAT?!? This doesn't seem right. Commenting (diva)
-                //    texAsset = m_scene.AssetService.Get(mapBlock.MapImageId.ToString());
-                //    if (texAsset != null)
-                //    {
-                //        textures.Add(texAsset);
-                //    }
-                //}
             }
 
             foreach (AssetBase asset in textures)
@@ -1308,6 +1442,10 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
 
             mapTexture.Save(exportPath, ImageFormat.Jpeg);
 
+            g.Dispose();
+            mapTexture.Dispose();
+            sea.Dispose();
+
             m_log.InfoFormat(
                 "[WORLD MAP]: Successfully exported world map for {0} to {1}",
                 m_scene.RegionInfo.RegionName, exportPath);
@@ -1320,17 +1458,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
             if (consoleScene != null && consoleScene != m_scene)
                 return;
 
-            if (m_mapImageGenerator == null)
-            {
-                Console.WriteLine("No map image generator available for {0}", m_scene.Name);
-                return;
-            }
-
-            using (Bitmap mapbmp = m_mapImageGenerator.CreateMapTile())
-            {
-                GenerateMaptile(mapbmp);
-                m_mapImageServiceModule.UploadMapTile(m_scene, mapbmp);
-            }
+            GenerateMaptileForce();
         }
 
         public OSD HandleRemoteMapItemRequest(string path, OSD request, string endpoint)
@@ -1338,9 +1466,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
             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,8 +1488,8 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
             }
             else
             {
-                OSDArray responsearr = new OSDArray(m_scene.GetRootAgentCount());
-                m_scene.ForEachRootScenePresence(delegate(ScenePresence sp)
+                OSDArray responsearr = new OSDArray(); // Don't preallocate. MT (m_scene.GetRootAgentCount());
+                m_scene.ForEachRootScenePresence(delegate (ScenePresence sp)
                 {
                     OSDMap responsemapdata = new OSDMap();
                     responsemapdata["X"] = OSD.FromInteger((int)(xstart + sp.AbsolutePosition.X));
@@ -1377,28 +1503,14 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                 responsemap["6"] = responsearr;
             }
 
-            // Service 7 (MAP_ITEM_LAND_FOR_SALE)
+            // Service 7/10 (MAP_ITEM_LAND_FOR_SALE/ADULT)
 
             ILandChannel landChannel = m_scene.LandChannel;
             List<ILandObject> parcels = landChannel.AllParcels();
 
-            if ((parcels == null) || (parcels.Count == 0))
-            {
-                OSDMap responsemapdata = new OSDMap();
-                responsemapdata["X"] = OSD.FromInteger((int)(xstart + 1));
-                responsemapdata["Y"] = OSD.FromInteger((int)(ystart + 1));
-                responsemapdata["ID"] = OSD.FromUUID(UUID.Zero);
-                responsemapdata["Name"] = OSD.FromString("");
-                responsemapdata["Extra"] = OSD.FromInteger(0);
-                responsemapdata["Extra2"] = OSD.FromInteger(0);
-                OSDArray responsearr = new OSDArray();
-                responsearr.Add(responsemapdata);
-
-                responsemap["7"] = responsearr;
-            }
-            else
+            if ((parcels != null) && (parcels.Count >= 0))
             {
-                OSDArray responsearr = new OSDArray(m_scene.GetRootAgentCount());
+                OSDArray responsearr = new OSDArray(parcels.Count);
                 foreach (ILandObject parcel_interface in parcels)
                 {
                     // Play it safe
@@ -1413,8 +1525,8 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                     {
                         Vector3 min = parcel.AABBMin;
                         Vector3 max = parcel.AABBMax;
-                        float x = (min.X+max.X)/2;
-                        float y = (min.Y+max.Y)/2;
+                        float x = (min.X + max.X) / 2;
+                        float y = (min.Y + max.Y) / 2;
 
                         OSDMap responsemapdata = new OSDMap();
                         responsemapdata["X"] = OSD.FromInteger((int)(xstart + x));
@@ -1427,7 +1539,14 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                         responsearr.Add(responsemapdata);
                     }
                 }
-                responsemap["7"] = responsearr;
+
+                if(responsearr.Count > 0)
+                {
+                    if(m_scene.RegionInfo.RegionSettings.Maturity == 2)
+                        responsemap["10"] = responsearr;
+                    else
+                    responsemap["7"] = responsearr;
+                }
             }
 
             if (m_scene.RegionInfo.RegionSettings.TelehubObject != UUID.Zero)
@@ -1453,61 +1572,138 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
             return responsemap;
         }
 
+        private void GenerateMaptileForce()
+        {
+            // Cannot create a map for a nonexistent heightmap
+            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.CreateMapTileForce())
+            {
+                GenerateMaptile(mapbmp);
+
+                if (m_mapImageServiceModule != null)
+                    m_mapImageServiceModule.UploadMapTile(m_scene, mapbmp);
+            }
+        }
+
         public void GenerateMaptile()
         {
             // Cannot create a map for a nonexistent heightmap
             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);
 
-                // v2/3 (MapImageServiceModule)
-                m_mapImageServiceModule.UploadMapTile(m_scene, mapbmp);
+                if (m_mapImageServiceModule != null)
+                    m_mapImageServiceModule.UploadMapTile(m_scene, mapbmp);
             }
         }
 
         private void GenerateMaptile(Bitmap mapbmp)
         {
-            byte[] data;
+            bool needRegionSave = false;
 
-            try
+            // remove old assets
+            UUID lastID = m_scene.RegionInfo.RegionSettings.TerrainImageID;
+            if (lastID != UUID.Zero)
             {
-                data = OpenJPEG.EncodeFromImage(mapbmp, true);
+                m_scene.AssetService.Delete(lastID.ToString());
+                m_scene.RegionInfo.RegionSettings.TerrainImageID = UUID.Zero;
+                myMapImageJPEG = new byte[0];
+                needRegionSave = true;
             }
-            catch (Exception e) // LEGIT: Catching problems caused by OpenJPEG p/invoke
+
+            lastID = m_scene.RegionInfo.RegionSettings.ParcelImageID;
+            if (lastID != UUID.Zero)
             {
-                m_log.Error("[WORLD MAP]: Failed generating terrain map: " + e);
-                return;
+                m_scene.AssetService.Delete(lastID.ToString());
+                m_scene.RegionInfo.RegionSettings.ParcelImageID = UUID.Zero;
+                needRegionSave = true;
             }
 
-            byte[] overlay = GenerateOverlay();
+            if(mapbmp != null)
+            {
+                try
+                {
+                    byte[] data;
 
-            UUID terrainImageID = UUID.Random();
-            UUID parcelImageID = UUID.Zero;
+                    // if large region limit its size since new viewers will not use it
+                    // but it is still usable for ossl
+                    if(m_scene.RegionInfo.RegionSizeX > Constants.RegionSize ||
+                            m_scene.RegionInfo.RegionSizeY > Constants.RegionSize)
+                    {
+                        int bx = mapbmp.Width;
+                        int by = mapbmp.Height;
+                        int mb = bx;
+                        if(mb < by)
+                            mb = by;
+                        if(mb > Constants.RegionSize && mb > 0)
+                        {
+                            float scale = (float)Constants.RegionSize/(float)mb;
+                            Size newsize = new Size();
+                            newsize.Width = (int)(bx * scale);
+                            newsize.Height = (int)(by * scale);
 
-            AssetBase asset = new AssetBase(
-                terrainImageID,
-                "terrainImage_" + m_scene.RegionInfo.RegionID.ToString(),
-                (sbyte)AssetType.Texture,
-                m_scene.RegionInfo.RegionID.ToString());
-            asset.Data = data;
-            asset.Description = m_scene.RegionInfo.RegionName;
-            asset.Temporary = false;
-            asset.Flags = AssetFlags.Maptile;
+                            using(Bitmap scaledbmp = new Bitmap(mapbmp,newsize))
+                                data = OpenJPEG.EncodeFromImage(scaledbmp, true);
+                        }
+                        else
+                            data = OpenJPEG.EncodeFromImage(mapbmp, true);
+                    }
+                    else
+                        data = OpenJPEG.EncodeFromImage(mapbmp, true);
 
-            // Store the new one
-            m_log.DebugFormat("[WORLD MAP]: Storing map tile {0} for {1}", asset.ID, m_scene.RegionInfo.RegionName);
-            
-            m_scene.AssetService.Store(asset);
+                    if (data != null && data.Length > 0)
+                    {
+                        UUID terrainImageID = UUID.Random();
+
+                        AssetBase asset = new AssetBase(
+                            terrainImageID,
+                            "terrainImage_" + m_scene.RegionInfo.RegionID.ToString(),
+                            (sbyte)AssetType.Texture,
+                            m_scene.RegionInfo.RegionID.ToString());
+                        asset.Data = data;
+                        asset.Description = m_scene.RegionInfo.RegionName;
+                        asset.Temporary = false;
+                        asset.Flags = AssetFlags.Maptile;
+
+                        // Store the new one
+                        m_log.DebugFormat("[WORLD MAP]: Storing map image {0} for {1}", asset.ID, m_scene.RegionInfo.RegionName);
+
+                        m_scene.AssetService.Store(asset);
+
+                        m_scene.RegionInfo.RegionSettings.TerrainImageID = terrainImageID;
+                        needRegionSave = true;
+                    }
+                }
+                catch (Exception e)
+                {
+                    m_log.Error("[WORLD MAP]: Failed generating terrain map: " + e);
+                }
+            }
 
+            // V2/3 still seem to need this, or we are missing something somewhere
+            byte[] overlay = GenerateOverlay();
             if (overlay != null)
             {
-                parcelImageID = UUID.Random();
+                UUID parcelImageID = UUID.Random();
 
                 AssetBase parcels = new AssetBase(
                     parcelImageID,
@@ -1520,20 +1716,13 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                 parcels.Flags = AssetFlags.Maptile;
 
                 m_scene.AssetService.Store(parcels);
+
+                m_scene.RegionInfo.RegionSettings.ParcelImageID = parcelImageID;
+                needRegionSave = true;
             }
 
-            // Switch to the new one
-            UUID lastTerrainImageID = m_scene.RegionInfo.RegionSettings.TerrainImageID;
-            UUID lastParcelImageID = m_scene.RegionInfo.RegionSettings.ParcelImageID;
-            m_scene.RegionInfo.RegionSettings.TerrainImageID = terrainImageID;
-            m_scene.RegionInfo.RegionSettings.ParcelImageID = parcelImageID;
-            m_scene.RegionInfo.RegionSettings.Save();
-
-            // Delete the old one
-            // m_log.DebugFormat("[WORLDMAP]: Deleting old map tile {0}", lastTerrainImageID);
-            m_scene.AssetService.Delete(lastTerrainImageID.ToString());
-            if (lastParcelImageID != UUID.Zero)
-                m_scene.AssetService.Delete(lastParcelImageID.ToString());
+            if (needRegionSave)
+                m_scene.RegionInfo.RegionSettings.Save();
         }
 
         private void MakeRootAgent(ScenePresence avatar)
@@ -1553,6 +1742,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)
@@ -1562,46 +1757,67 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
 
             lock (m_blacklistedregions)
             {
-                if (!m_blacklistedregions.ContainsKey(regionhandle))
+                if (m_blacklistedregions.Contains(regionhandle))
                     m_blacklistedregions.Remove(regionhandle);
             }
 
             lock (m_blacklistedurls)
             {
-                if (m_blacklistedurls.ContainsKey(httpserver))
+                if (m_blacklistedurls.Contains(httpserver))
                     m_blacklistedurls.Remove(httpserver);
             }
 
             lock (m_cachedRegionMapItemsAddress)
             {
-                if (!m_cachedRegionMapItemsAddress.ContainsKey(regionhandle))
-                    m_cachedRegionMapItemsAddress.Remove(regionhandle);
+                    m_cachedRegionMapItemsAddress.AddOrUpdate(regionhandle,
+                        httpserver, 5.0 * expireBlackListTime);
             }
         }
 
         private Byte[] GenerateOverlay()
         {
+            int landTileSize = LandManagementModule.LandUnit;
+
             // These need to be ints for bitmap generation
             int regionSizeX = (int)m_scene.RegionInfo.RegionSizeX;
-            int regionSizeY = (int)m_scene.RegionInfo.RegionSizeY;
-
-            int landTileSize = LandManagementModule.LandUnit;
             int regionLandTilesX = regionSizeX / landTileSize;
+
+            int regionSizeY = (int)m_scene.RegionInfo.RegionSizeY;
             int regionLandTilesY = regionSizeY / landTileSize;
 
-            using (Bitmap overlay = new Bitmap(regionSizeX, regionSizeY))
+            bool landForSale = false;
+            ILandObject land;
+
+            // scan terrain avoiding potencial merges of large bitmaps
+            //TODO  create the sell bitmap at landchannel / landmaster ?
+            // and auction also, still not suported
+
+            bool[,] saleBitmap = new bool[regionLandTilesX, regionLandTilesY];
+            for (int x = 0, xx = 0; x < regionLandTilesX; x++ ,xx += landTileSize)
             {
-                bool[,] saleBitmap = new bool[regionLandTilesX, regionLandTilesY];
-                for (int x = 0; x < regionLandTilesX; x++)
+                for (int y = 0, yy = 0; y < regionLandTilesY; y++, yy += landTileSize)
                 {
-                    for (int y = 0; y < regionLandTilesY; y++)
+                    land = m_scene.LandChannel.GetLandObject(xx, yy);
+                    if (land != null && (land.LandData.Flags & (uint)ParcelFlags.ForSale) != 0)
+                    {
+                        saleBitmap[x, y] = true;
+                        landForSale = true;
+                    }
+                    else
                         saleBitmap[x, y] = false;
                 }
+            }
 
-                bool landForSale = false;
+            if (!landForSale)
+            {
+                m_log.DebugFormat("[WORLD MAP]: Region {0} has no parcels for sale, not generating overlay", m_scene.RegionInfo.RegionName);
+                return null;
+            }
 
-                List<ILandObject> parcels = m_scene.LandChannel.AllParcels();
+            m_log.DebugFormat("[WORLD MAP]: Region {0} has parcels for sale, generating overlay", m_scene.RegionInfo.RegionName);
 
+            using (Bitmap overlay = new Bitmap(regionSizeX, regionSizeY))
+            {
                 Color background = Color.FromArgb(0, 0, 0, 0);
 
                 using (Graphics g = Graphics.FromImage(overlay))
@@ -1609,36 +1825,19 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                     using (SolidBrush transparent = new SolidBrush(background))
                         g.FillRectangle(transparent, 0, 0, regionSizeX, regionSizeY);
 
-                    foreach (ILandObject land in parcels)
-                    {
-                        // m_log.DebugFormat("[WORLD MAP]: Parcel {0} flags {1}", land.LandData.Name, land.LandData.Flags);
-                        if ((land.LandData.Flags & (uint)ParcelFlags.ForSale) != 0)
-                        {
-                            landForSale = true;
-
-                            saleBitmap = land.MergeLandBitmaps(saleBitmap, land.GetLandBitmap());
-                        }
-                    }
-
-                    if (!landForSale)
+                    // make it a bit transparent
+                    using (SolidBrush yellow = new SolidBrush(Color.FromArgb(192, 249, 223, 9)))
                     {
-                        m_log.DebugFormat("[WORLD MAP]: Region {0} has no parcels for sale, not generating overlay", m_scene.RegionInfo.RegionName);
-                        return null;
-                    }
-
-                    m_log.DebugFormat("[WORLD MAP]: Region {0} has parcels for sale, generating overlay", m_scene.RegionInfo.RegionName);
-
-                    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);
                             }
                         }
@@ -1659,7 +1858,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
         }
     }
 
-    public struct MapRequestState
+    public class MapRequestState
     {
         public UUID agentID;
         public uint flags;
@@ -1668,4 +1867,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;
+    }
 }