23 files changed, 1436 insertions, 1255 deletions

diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index c802490..38152cc 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -427,7 +427,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
             if (m_scene.TryGetScenePresence(remoteClient.AgentId, out presence))
             {
                 if (!m_scene.Permissions.CanRezObject(
-                        part.ParentGroup.Children.Count, remoteClient.AgentId, presence.AbsolutePosition))
+                    part.ParentGroup.PrimCount, remoteClient.AgentId, presence.AbsolutePosition))
                     return;
 
                 presence.Appearance.DetachAttachment(itemID);
@@ -471,12 +471,86 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                         SceneObjectSerializer.ToOriginalXmlFormat(group);
                         group.DetachToInventoryPrep();
                         m_log.Debug("[ATTACHMENTS MODULE]: Saving attachpoint: " + ((uint)group.GetAttachmentPoint()).ToString());
-                        m_scene.UpdateKnownItem(remoteClient, group,group.GetFromItemID(), group.OwnerID);
+                        UpdateKnownItem(remoteClient, group, group.GetFromItemID(), group.OwnerID);
                         m_scene.DeleteSceneObject(group, false);
                         return;
                     }
                 }
             }
         }
+        
+        public void UpdateAttachmentPosition(IClientAPI client, SceneObjectGroup sog, Vector3 pos)
+        {
+            // If this is an attachment, then we need to save the modified
+            // object back into the avatar's inventory. First we save the
+            // attachment point information, then we update the relative 
+            // positioning (which caused this method to get driven in the
+            // first place. Then we have to mark the object as NOT an
+            // attachment. This is necessary in order to correctly save
+            // and retrieve GroupPosition information for the attachment.
+            // Then we save the asset back into the appropriate inventory
+            // entry. Finally, we restore the object's attachment status.
+            byte attachmentPoint = sog.GetAttachmentPoint();
+            sog.UpdateGroupPosition(pos);
+            sog.RootPart.IsAttachment = false;
+            sog.AbsolutePosition = sog.RootPart.AttachedPos;
+            UpdateKnownItem(client, sog, sog.GetFromItemID(), sog.OwnerID);
+            sog.SetAttachmentPoint(attachmentPoint);            
+        }
+        
+        /// <summary>
+        /// Update the attachment asset for the new sog details if they have changed.
+        /// </summary>
+        /// 
+        /// This is essential for preserving attachment attributes such as permission.  Unlike normal scene objects,
+        /// these details are not stored on the region.
+        /// 
+        /// <param name="remoteClient"></param>
+        /// <param name="grp"></param>
+        /// <param name="itemID"></param>
+        /// <param name="agentID"></param>
+        protected void UpdateKnownItem(IClientAPI remoteClient, SceneObjectGroup grp, UUID itemID, UUID agentID)
+        {
+            if (grp != null)
+            {
+                if (!grp.HasGroupChanged)
+                {
+                    m_log.WarnFormat("[ATTACHMENTS MODULE]: Save request for {0} which is unchanged", grp.UUID);
+                    return;
+                }
+
+                m_log.DebugFormat(
+                    "[ATTACHMENTS MODULE]: Updating asset for attachment {0}, attachpoint {1}",
+                    grp.UUID, grp.GetAttachmentPoint());
+
+                string sceneObjectXml = SceneObjectSerializer.ToOriginalXmlFormat(grp);
+
+                InventoryItemBase item = new InventoryItemBase(itemID, remoteClient.AgentId);
+                item = m_scene.InventoryService.GetItem(item);
+
+                if (item != null)
+                {
+                    AssetBase asset = m_scene.CreateAsset(
+                        grp.GetPartName(grp.LocalId),
+                        grp.GetPartDescription(grp.LocalId),
+                        (sbyte)AssetType.Object,
+                        Utils.StringToBytes(sceneObjectXml),
+                        remoteClient.AgentId);
+                    m_scene.AssetService.Store(asset);
+
+                    item.AssetID = asset.FullID;
+                    item.Description = asset.Description;
+                    item.Name = asset.Name;
+                    item.AssetType = asset.Type;
+                    item.InvType = (int)InventoryType.Object;
+
+                    m_scene.InventoryService.UpdateItem(item);
+
+                    // this gets called when the agent logs off!
+                    if (remoteClient != null)
+                        remoteClient.SendInventoryItemCreateUpdate(item, 0);
+                }
+            }
+        }        
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
index 1603c07..fc1afaf 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
@@ -223,4 +223,4 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
             OnInstantMessage(null, msg);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
index e1ee0b1..a49faec 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
@@ -132,8 +132,6 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
         {
             UUID toAgentID = new UUID(im.toAgentID);
 
-            //m_log.DebugFormat("[INSTANT MESSAGE]: Attempting delivery of IM from {0} to {1}", im.fromAgentName, toAgentID.ToString());
-
             // Try root avatar only first
             foreach (Scene scene in m_Scenes)
             {
@@ -176,6 +174,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
                 }
             }
 
+            m_log.DebugFormat("[INSTANT MESSAGE]: Delivering IM to {0} via XMLRPC", im.toAgentID);
             SendGridInstantMessageViaXMLRPC(im, result);
 
             return;
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
index 7683288..22c84e9 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
@@ -261,7 +261,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
 
             while (archivePath.Length > 0)
             {
-                m_log.DebugFormat("[INVENTORY ARCHIVER]: Trying to resolve destination folder {0}", archivePath);
+//                m_log.DebugFormat("[INVENTORY ARCHIVER]: Trying to resolve destination folder {0}", archivePath);
                 
                 if (resolvedFolders.ContainsKey(archivePath))
                 {
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveUtils.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveUtils.cs
index 84afb40..8343091 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveUtils.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveUtils.cs
@@ -41,7 +41,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
     /// </summary>
     public static class InventoryArchiveUtils
     {
-//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         // Character used for escaping the path delimter ("\/") and itself ("\\") in human escaped strings
         public static readonly char ESCAPE_CHARACTER = '\\';
@@ -120,6 +120,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                 foundFolders.Add(startFolder);
                 return foundFolders;
             }
+                        
+            // If the path isn't just / then trim any starting extraneous slashes
+            path = path.TrimStart(new char[] { PATH_DELIMITER });
+            
+//            m_log.DebugFormat("[INVENTORY ARCHIVE UTILS]: Adjusted path in FindFolderByPath() is [{0}]", path);
 
             string[] components = SplitEscapedPath(path);
             components[0] = UnescapePath(components[0]);
@@ -199,6 +204,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         public static InventoryItemBase FindItemByPath(
             IInventoryService inventoryService, InventoryFolderBase startFolder, string path)
         {
+            // If the path isn't just / then trim any starting extraneous slashes
+            path = path.TrimStart(new char[] { PATH_DELIMITER });
+            
             string[] components = SplitEscapedPath(path);
             components[0] = UnescapePath(components[0]);
                             
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
index 25a78ff..9908018 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
@@ -221,7 +221,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                 InventoryItemBase inventoryItem = null;
                 InventoryFolderBase rootFolder = m_scene.InventoryService.GetRootFolder(m_userInfo.PrincipalID);
     
-                bool foundStar = false;
+                bool saveFolderContentsOnly = false;
     
                 // Eliminate double slashes and any leading / on the path.
                 string[] components
@@ -234,7 +234,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                 // folder itself.  This may get more sophisicated later on
                 if (maxComponentIndex >= 0 && components[maxComponentIndex] == STAR_WILDCARD)
                 {
-                    foundStar = true;
+                    saveFolderContentsOnly = true;
                     maxComponentIndex--;
                 }
     
@@ -281,10 +281,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                 {
                     m_log.DebugFormat(
                         "[INVENTORY ARCHIVER]: Found folder {0} {1} at {2}",
-                        inventoryFolder.Name, inventoryFolder.ID, m_invPath);
+                        inventoryFolder.Name, 
+                        inventoryFolder.ID, 
+                        m_invPath == String.Empty ? InventoryFolderImpl.PATH_DELIMITER : m_invPath );
     
                     //recurse through all dirs getting dirs and files
-                    SaveInvFolder(inventoryFolder, ArchiveConstants.INVENTORY_PATH, !foundStar);
+                    SaveInvFolder(inventoryFolder, ArchiveConstants.INVENTORY_PATH, !saveFolderContentsOnly);
                 }
                 else if (inventoryItem != null)
                 {
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
index 3fb2c8c..0218f86 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
@@ -55,12 +55,58 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
     {
         protected ManualResetEvent mre = new ManualResetEvent(false);
         
+        /// <summary>
+        /// Stream of data representing a common IAR that can be reused in load tests.
+        /// </summary>
+        protected MemoryStream m_iarStream;       
+        
+        protected UserAccount m_ua1 
+            = new UserAccount { 
+                PrincipalID = UUID.Parse("00000000-0000-0000-0000-000000000555"),
+                FirstName = "Mr",
+                LastName = "Tiddles" };        
+        protected UserAccount m_ua2
+            = new UserAccount { 
+                PrincipalID = UUID.Parse("00000000-0000-0000-0000-000000000666"),
+                FirstName = "Lord",
+                LastName = "Lucan" };  
+        string m_item1Name = "b.lsl";
+        
         private void SaveCompleted(
             Guid id, bool succeeded, UserAccount userInfo, string invPath, Stream saveStream, 
             Exception reportedException)
         {
             mre.Set();
         }
+        
+        [SetUp]
+        public void Init()
+        {
+            ConstructDefaultIarForTestLoad();
+        }
+        
+        protected void ConstructDefaultIarForTestLoad()
+        {            
+            string archiveItemName = InventoryArchiveWriteRequest.CreateArchiveItemName(m_item1Name, UUID.Random());
+
+            MemoryStream archiveWriteStream = new MemoryStream();
+            TarArchiveWriter tar = new TarArchiveWriter(archiveWriteStream);
+
+            InventoryItemBase item1 = new InventoryItemBase();
+            item1.Name = m_item1Name;
+            item1.AssetID = UUID.Random();
+            item1.GroupID = UUID.Random();
+            item1.CreatorId = OspResolver.MakeOspa(m_ua2.FirstName, m_ua2.LastName);
+            //item1.CreatorId = userUuid.ToString();
+            //item1.CreatorId = "00000000-0000-0000-0000-000000000444";
+            item1.Owner = UUID.Zero;
+            
+            string item1FileName 
+                = string.Format("{0}{1}", ArchiveConstants.INVENTORY_PATH, archiveItemName);
+            tar.WriteFile(item1FileName, UserInventoryItemSerializer.Serialize(item1));
+            tar.Close();   
+            m_iarStream = new MemoryStream(archiveWriteStream.ToArray());
+        }
 
         /// <summary>
         /// Test saving an inventory path to a V0.1 OpenSim Inventory Archive 
@@ -122,6 +168,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
             MemoryStream archiveWriteStream = new MemoryStream();
             archiverModule.OnInventoryArchiveSaved += SaveCompleted;
 
+            // Test saving a particular path
             mre.Reset();
             archiverModule.ArchiveInventory(
                 Guid.NewGuid(), userFirstName, userLastName, "Objects", userPassword, archiveWriteStream);
@@ -148,7 +195,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
             
             while (tar.ReadEntry(out filePath, out tarEntryType) != null)
             {
-                Console.WriteLine("Got {0}", filePath);
+//                Console.WriteLine("Got {0}", filePath);
 
 //                if (ArchiveConstants.CONTROL_FILE_PATH == filePath)
 //                {
@@ -297,6 +344,30 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
         }        
         
         /// <summary>
+        /// Test that things work when the load path specified starts with a slash
+        /// </summary>
+        [Test]
+        public void TestLoadIarPathStartsWithSlash()
+        {
+            TestHelper.InMethod();            
+//            log4net.Config.XmlConfigurator.Configure();
+            
+            SerialiserModule serialiserModule = new SerialiserModule();
+            InventoryArchiverModule archiverModule = new InventoryArchiverModule(true);           
+            Scene scene = SceneSetupHelpers.SetupScene("inventory");            
+            SceneSetupHelpers.SetupSceneModules(scene, serialiserModule, archiverModule);
+            
+            UserProfileTestUtils.CreateUserWithInventory(scene, m_ua1, "password");               
+            archiverModule.DearchiveInventory(m_ua1.FirstName, m_ua1.LastName, "/Objects", "password", m_iarStream);
+
+            InventoryItemBase foundItem1
+                = InventoryArchiveUtils.FindItemByPath(
+                    scene.InventoryService, m_ua1.PrincipalID, "/Objects/" + m_item1Name);
+            
+            Assert.That(foundItem1, Is.Not.Null, "Didn't find loaded item 1 in TestLoadIarFolderStartsWithSlash()");            
+        }
+        
+        /// <summary>
         /// Test loading a V0.1 OpenSim Inventory Archive (subject to change since there is no fixed format yet) where
         /// an account exists with the creator name.
         /// </summary>
@@ -308,34 +379,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
             TestHelper.InMethod();            
             //log4net.Config.XmlConfigurator.Configure();
             
-            string userFirstName = "Mr";
-            string userLastName = "Tiddles";
-            UUID userUuid = UUID.Parse("00000000-0000-0000-0000-000000000555");
-            string userItemCreatorFirstName = "Lord";
-            string userItemCreatorLastName = "Lucan";
-            UUID userItemCreatorUuid = UUID.Parse("00000000-0000-0000-0000-000000000666");
-            
-            string item1Name = "b.lsl";
-            string archiveItemName = InventoryArchiveWriteRequest.CreateArchiveItemName(item1Name, UUID.Random());
-
-            MemoryStream archiveWriteStream = new MemoryStream();
-            TarArchiveWriter tar = new TarArchiveWriter(archiveWriteStream);
-
-            InventoryItemBase item1 = new InventoryItemBase();
-            item1.Name = item1Name;
-            item1.AssetID = UUID.Random();
-            item1.GroupID = UUID.Random();
-            item1.CreatorId = OspResolver.MakeOspa(userItemCreatorFirstName, userItemCreatorLastName);
-            //item1.CreatorId = userUuid.ToString();
-            //item1.CreatorId = "00000000-0000-0000-0000-000000000444";
-            item1.Owner = UUID.Zero;
-            
-            string item1FileName 
-                = string.Format("{0}{1}", ArchiveConstants.INVENTORY_PATH, archiveItemName);
-            tar.WriteFile(item1FileName, UserInventoryItemSerializer.Serialize(item1));
-            tar.Close();
-
-            MemoryStream archiveReadStream = new MemoryStream(archiveWriteStream.ToArray());
             SerialiserModule serialiserModule = new SerialiserModule();
             InventoryArchiverModule archiverModule = new InventoryArchiverModule(true);
             
@@ -344,15 +387,13 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
             
             SceneSetupHelpers.SetupSceneModules(scene, serialiserModule, archiverModule);
                         
-                        UserProfileTestUtils.CreateUserWithInventory(
-                            scene, userFirstName, userLastName, userUuid, "meowfood");                  
-                        UserProfileTestUtils.CreateUserWithInventory(
-                            scene, userItemCreatorFirstName, userItemCreatorLastName, userItemCreatorUuid, "hampshire");
+                        UserProfileTestUtils.CreateUserWithInventory(scene, m_ua1, "meowfood");                 
+                        UserProfileTestUtils.CreateUserWithInventory(scene, m_ua2, "hampshire");
             
-            archiverModule.DearchiveInventory(userFirstName, userLastName, "/", "meowfood", archiveReadStream);
+            archiverModule.DearchiveInventory(m_ua1.FirstName, m_ua1.LastName, "/", "meowfood", m_iarStream);
 
             InventoryItemBase foundItem1
-                = InventoryArchiveUtils.FindItemByPath(scene.InventoryService, userUuid, item1Name);
+                = InventoryArchiveUtils.FindItemByPath(scene.InventoryService, m_ua1.PrincipalID, m_item1Name);
             
             Assert.That(foundItem1, Is.Not.Null, "Didn't find loaded item 1");
 
@@ -362,31 +403,31 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
 //                foundItem1.CreatorId, Is.EqualTo(item1.CreatorId), 
 //                "Loaded item non-uuid creator doesn't match original");
             Assert.That(
-                foundItem1.CreatorId, Is.EqualTo(userItemCreatorUuid.ToString()), 
+                foundItem1.CreatorId, Is.EqualTo(m_ua2.PrincipalID.ToString()), 
                 "Loaded item non-uuid creator doesn't match original");
             
             Assert.That(
-                foundItem1.CreatorIdAsUuid, Is.EqualTo(userItemCreatorUuid), 
+                foundItem1.CreatorIdAsUuid, Is.EqualTo(m_ua2.PrincipalID), 
                 "Loaded item uuid creator doesn't match original");
-            Assert.That(foundItem1.Owner, Is.EqualTo(userUuid),
+            Assert.That(foundItem1.Owner, Is.EqualTo(m_ua1.PrincipalID),
                 "Loaded item owner doesn't match inventory reciever");
 
             // Now try loading to a root child folder
-            UserInventoryTestUtils.CreateInventoryFolder(scene.InventoryService, userUuid, "xA");
-            archiveReadStream = new MemoryStream(archiveReadStream.ToArray());
-            archiverModule.DearchiveInventory(userFirstName, userLastName, "xA", "meowfood", archiveReadStream);
+            UserInventoryTestUtils.CreateInventoryFolder(scene.InventoryService, m_ua1.PrincipalID, "xA");
+            MemoryStream archiveReadStream = new MemoryStream(m_iarStream.ToArray());
+            archiverModule.DearchiveInventory(m_ua1.FirstName, m_ua1.LastName, "xA", "meowfood", archiveReadStream);
 
             InventoryItemBase foundItem2
-                = InventoryArchiveUtils.FindItemByPath(scene.InventoryService, userUuid, "xA/" + item1Name);
+                = InventoryArchiveUtils.FindItemByPath(scene.InventoryService, m_ua1.PrincipalID, "xA/" + m_item1Name);
             Assert.That(foundItem2, Is.Not.Null, "Didn't find loaded item 2");
 
             // Now try loading to a more deeply nested folder
-            UserInventoryTestUtils.CreateInventoryFolder(scene.InventoryService, userUuid, "xB/xC");
+            UserInventoryTestUtils.CreateInventoryFolder(scene.InventoryService, m_ua1.PrincipalID, "xB/xC");
             archiveReadStream = new MemoryStream(archiveReadStream.ToArray());
-            archiverModule.DearchiveInventory(userFirstName, userLastName, "xB/xC", "meowfood", archiveReadStream);
+            archiverModule.DearchiveInventory(m_ua1.FirstName, m_ua1.LastName, "xB/xC", "meowfood", archiveReadStream);
 
             InventoryItemBase foundItem3
-                = InventoryArchiveUtils.FindItemByPath(scene.InventoryService, userUuid, "xB/xC/" + item1Name);
+                = InventoryArchiveUtils.FindItemByPath(scene.InventoryService, m_ua1.PrincipalID, "xB/xC/" + m_item1Name);
             Assert.That(foundItem3, Is.Not.Null, "Didn't find loaded item 3");
         }
 
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
index 4465e8a..a08a628 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
@@ -32,7 +32,6 @@ using log4net;
 using Nini.Config;
 using OpenMetaverse;
 using OpenSim.Framework;
-
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Services.Interfaces;
@@ -92,7 +91,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
                 m_TransferModule = m_Scenelist[0].RequestModuleInterface<IMessageTransferModule>();
                 if (m_TransferModule == null)
                 {
-                    m_log.Error("[INVENTORY TRANSFER] No Message transfer module found, transfers will be local only");
+                    m_log.Error("[INVENTORY TRANSFER]: No Message transfer module found, transfers will be local only");
                     m_Enabled = false;
 
                     m_Scenelist.Clear();
@@ -185,7 +184,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
                 {
                     UUID folderID = new UUID(im.binaryBucket, 1);
                     
-                    m_log.DebugFormat("[AGENT INVENTORY]: Inserting original folder {0} "+
+                    m_log.DebugFormat("[INVENTORY TRANSFER]: Inserting original folder {0} "+
                             "into agent {1}'s inventory",
                             folderID, new UUID(im.toAgentID));
                     
@@ -221,7 +220,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
 
                     UUID itemID = new UUID(im.binaryBucket, 1);
 
-                    m_log.DebugFormat("[AGENT INVENTORY]: (giving) Inserting item {0} "+
+                    m_log.DebugFormat("[INVENTORY TRANSFER]: (giving) Inserting item {0} "+
                             "into agent {1}'s inventory",
                             itemID, new UUID(im.toAgentID));
 
@@ -288,10 +287,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
                 // inventory is loaded. Courtesy of the above bulk update,
                 // It will have been pushed to the client, too
                 //
-                
-                //CachedUserInfo userInfo =
-                //        scene.CommsManager.UserProfileCacheService.
-                //        GetUserDetails(client.AgentId);
                 IInventoryService invService = scene.InventoryService;
 
                 InventoryFolderBase trashFolder =
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index d6f37ae..1cd2ff4 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -200,6 +200,15 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                         m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Final destination is x={0} y={1} uuid={2}",
                             finalDestination.RegionLocX / Constants.RegionSize, finalDestination.RegionLocY / Constants.RegionSize, finalDestination.RegionID);
 
+                        // Check that these are not the same coordinates
+                        if (finalDestination.RegionLocX == sp.Scene.RegionInfo.RegionLocX &&
+                            finalDestination.RegionLocY == sp.Scene.RegionInfo.RegionLocY)
+                        {
+                            // Can't do. Viewer crashes
+                            sp.ControllingClient.SendTeleportFailed("Space warp! You would crash. Move to a different region and try again.");
+                            return;
+                        }
+
                         //
                         // This is it
                         //
@@ -446,6 +455,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 // Now let's make it officially a child agent
                 sp.MakeChildAgent();
 
+                sp.Scene.CleanDroppedAttachments();
+
                 // Finally, let's close this previously-known-as-root agent, when the jump is outside the view zone
 
                 if (NeedsClosing(oldRegionX, newRegionX, oldRegionY, newRegionY, reg))
diff --git a/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs
index 0c6cb1b..35b70de 100644
--- a/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs
@@ -34,6 +34,7 @@ using System.Threading;
 using log4net;
 using Nini.Config;
 using OpenMetaverse;
+using OpenMetaverse.Messages.Linden;
 using OpenMetaverse.Packets;
 using OpenMetaverse.StructuredData;
 using OpenSim.Framework;
@@ -137,10 +138,11 @@ namespace OpenSim.Region.CoreModules.Framework.EventQueue
             {
                 if (!queues.ContainsKey(agentId))
                 {
+                                        /*
                     m_log.DebugFormat(
                         "[EVENTQUEUE]: Adding new queue for agent {0} in region {1}", 
                         agentId, m_scene.RegionInfo.RegionName);
-                    
+                    */
                     queues[agentId] = new Queue<OSD>();
                 }
                 
@@ -200,7 +202,7 @@ namespace OpenSim.Region.CoreModules.Framework.EventQueue
 
         private void ClientClosed(UUID AgentID, Scene scene)
         {
-            m_log.DebugFormat("[EVENTQUEUE]: Closed client {0} in region {1}", AgentID, m_scene.RegionInfo.RegionName);
+            //m_log.DebugFormat("[EVENTQUEUE]: Closed client {0} in region {1}", AgentID, m_scene.RegionInfo.RegionName);
 
             int count = 0;
             while (queues.ContainsKey(AgentID) && queues[AgentID].Count > 0 && count++ < 5)
@@ -284,7 +286,7 @@ namespace OpenSim.Region.CoreModules.Framework.EventQueue
                 // Reuse open queues.  The client does!
                 if (m_AvatarQueueUUIDMapping.ContainsKey(agentID))
                 {
-                    m_log.DebugFormat("[EVENTQUEUE]: Found Existing UUID!");
+                    //m_log.DebugFormat("[EVENTQUEUE]: Found Existing UUID!");
                     EventQueueGetUUID = m_AvatarQueueUUIDMapping[agentID];
                 }
                 else
@@ -365,7 +367,7 @@ namespace OpenSim.Region.CoreModules.Framework.EventQueue
             {
                 // Send it a fake event to keep the client polling!   It doesn't like 502s like the proxys say!
                 array.Add(EventQueueHelper.KeepAliveEvent());
-                m_log.DebugFormat("[EVENTQUEUE]: adding fake event for {0} in region {1}", pAgentId, m_scene.RegionInfo.RegionName);
+                //m_log.DebugFormat("[EVENTQUEUE]: adding fake event for {0} in region {1}", pAgentId, m_scene.RegionInfo.RegionName);
             }
             else
             {
@@ -394,8 +396,8 @@ namespace OpenSim.Region.CoreModules.Framework.EventQueue
             responsedata["keepalive"] = false;
             responsedata["reusecontext"] = false;
             responsedata["str_response_string"] = OSDParser.SerializeLLSDXmlString(events);
+            //m_log.DebugFormat("[EVENTQUEUE]: sending response for {0} in region {1}: {2}", pAgentId, m_scene.RegionInfo.RegionName, responsedata["str_response_string"]);
             return responsedata;
-            //m_log.DebugFormat("[EVENTQUEUE]: sending response for {0} in region {1}: {2}", agentID, m_scene.RegionInfo.RegionName, responsedata["str_response_string"]);
         }
 
         public Hashtable NoEvents(UUID requestID, UUID agentID)
@@ -461,7 +463,7 @@ namespace OpenSim.Region.CoreModules.Framework.EventQueue
             {
                 // Send it a fake event to keep the client polling!   It doesn't like 502s like the proxys say!
                 array.Add(EventQueueHelper.KeepAliveEvent());
-                m_log.DebugFormat("[EVENTQUEUE]: adding fake event for {0} in region {1}", agentID, m_scene.RegionInfo.RegionName);
+                //m_log.DebugFormat("[EVENTQUEUE]: adding fake event for {0} in region {1}", agentID, m_scene.RegionInfo.RegionName);
             }
             else
             {
@@ -697,9 +699,9 @@ namespace OpenSim.Region.CoreModules.Framework.EventQueue
             //m_log.InfoFormat("########### eq ChatterBoxSessionAgentListUpdates #############\n{0}", item);
         }
 
-        public void ParcelProperties(ParcelPropertiesPacket parcelPropertiesPacket, UUID avatarID)
+        public void ParcelProperties(ParcelPropertiesMessage parcelPropertiesMessage, UUID avatarID)
         {
-            OSD item = EventQueueHelper.ParcelProperties(parcelPropertiesPacket);
+                        OSD item = EventQueueHelper.ParcelProperties(parcelPropertiesMessage);
             Enqueue(item, avatarID);
         }
 
diff --git a/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueHelper.cs b/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueHelper.cs
index e9bcae3..6294935 100644
--- a/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueHelper.cs
+++ b/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueHelper.cs
@@ -30,6 +30,7 @@ using System.Net;
 using OpenMetaverse;
 using OpenMetaverse.Packets;
 using OpenMetaverse.StructuredData;
+using OpenMetaverse.Messages.Linden;
 
 namespace OpenSim.Region.CoreModules.Framework.EventQueue
 {
@@ -309,116 +310,6 @@ namespace OpenSim.Region.CoreModules.Framework.EventQueue
             return chatterBoxSessionAgentListUpdates;
         }
 
-        public static OSD ParcelProperties(ParcelPropertiesPacket parcelPropertiesPacket)
-        {
-            OSDMap parcelProperties = new OSDMap();
-            OSDMap body = new OSDMap();
-
-            OSDArray ageVerificationBlock = new OSDArray();
-            OSDMap ageVerificationMap = new OSDMap();
-            ageVerificationMap.Add("RegionDenyAgeUnverified",
-                OSD.FromBoolean(parcelPropertiesPacket.AgeVerificationBlock.RegionDenyAgeUnverified));
-            ageVerificationBlock.Add(ageVerificationMap);
-            body.Add("AgeVerificationBlock", ageVerificationBlock);
-
-            // LL sims send media info in this event queue message but it's not in the UDP
-            // packet we construct this event queue message from. This should be refactored in
-            // other areas of the code so it can all be send in the same message. Until then we will
-            // still send the media info via UDP
-
-            //OSDArray mediaData = new OSDArray();
-            //OSDMap mediaDataMap = new OSDMap();
-            //mediaDataMap.Add("MediaDesc", OSD.FromString(""));
-            //mediaDataMap.Add("MediaHeight", OSD.FromInteger(0));
-            //mediaDataMap.Add("MediaLoop", OSD.FromInteger(0));
-            //mediaDataMap.Add("MediaType", OSD.FromString("type/type"));
-            //mediaDataMap.Add("MediaWidth", OSD.FromInteger(0));
-            //mediaDataMap.Add("ObscureMedia", OSD.FromInteger(0));
-            //mediaDataMap.Add("ObscureMusic", OSD.FromInteger(0));
-            //mediaData.Add(mediaDataMap);
-            //body.Add("MediaData", mediaData);
-
-            OSDArray parcelData = new OSDArray();
-            OSDMap parcelDataMap = new OSDMap();
-            OSDArray AABBMax = new OSDArray(3);
-            AABBMax.Add(OSD.FromReal(parcelPropertiesPacket.ParcelData.AABBMax.X));
-            AABBMax.Add(OSD.FromReal(parcelPropertiesPacket.ParcelData.AABBMax.Y));
-            AABBMax.Add(OSD.FromReal(parcelPropertiesPacket.ParcelData.AABBMax.Z));
-            parcelDataMap.Add("AABBMax", AABBMax);
-
-            OSDArray AABBMin = new OSDArray(3);
-            AABBMin.Add(OSD.FromReal(parcelPropertiesPacket.ParcelData.AABBMin.X));
-            AABBMin.Add(OSD.FromReal(parcelPropertiesPacket.ParcelData.AABBMin.Y));
-            AABBMin.Add(OSD.FromReal(parcelPropertiesPacket.ParcelData.AABBMin.Z));
-            parcelDataMap.Add("AABBMin", AABBMin);
-
-            parcelDataMap.Add("Area", OSD.FromInteger(parcelPropertiesPacket.ParcelData.Area));
-            parcelDataMap.Add("AuctionID", OSD.FromBinary(uintToByteArray(parcelPropertiesPacket.ParcelData.AuctionID)));
-            parcelDataMap.Add("AuthBuyerID", OSD.FromUUID(parcelPropertiesPacket.ParcelData.AuthBuyerID));
-            parcelDataMap.Add("Bitmap", OSD.FromBinary(parcelPropertiesPacket.ParcelData.Bitmap));
-            parcelDataMap.Add("Category", OSD.FromInteger((int)parcelPropertiesPacket.ParcelData.Category));
-            parcelDataMap.Add("ClaimDate", OSD.FromInteger(parcelPropertiesPacket.ParcelData.ClaimDate));
-            parcelDataMap.Add("ClaimPrice", OSD.FromInteger(parcelPropertiesPacket.ParcelData.ClaimPrice));
-            parcelDataMap.Add("Desc", OSD.FromString(Utils.BytesToString(parcelPropertiesPacket.ParcelData.Desc)));
-            parcelDataMap.Add("GroupID", OSD.FromUUID(parcelPropertiesPacket.ParcelData.GroupID));
-            parcelDataMap.Add("GroupPrims", OSD.FromInteger(parcelPropertiesPacket.ParcelData.GroupPrims));
-            parcelDataMap.Add("IsGroupOwned", OSD.FromBoolean(parcelPropertiesPacket.ParcelData.IsGroupOwned));
-            parcelDataMap.Add("LandingType", OSD.FromInteger(parcelPropertiesPacket.ParcelData.LandingType));
-            parcelDataMap.Add("LocalID", OSD.FromInteger(parcelPropertiesPacket.ParcelData.LocalID));
-            parcelDataMap.Add("MaxPrims", OSD.FromInteger(parcelPropertiesPacket.ParcelData.MaxPrims));
-            parcelDataMap.Add("MediaAutoScale", OSD.FromInteger((int)parcelPropertiesPacket.ParcelData.MediaAutoScale));
-            parcelDataMap.Add("MediaID", OSD.FromUUID(parcelPropertiesPacket.ParcelData.MediaID));
-            parcelDataMap.Add("MediaURL", OSD.FromString(Utils.BytesToString(parcelPropertiesPacket.ParcelData.MediaURL)));
-            parcelDataMap.Add("MusicURL", OSD.FromString(Utils.BytesToString(parcelPropertiesPacket.ParcelData.MusicURL)));
-            parcelDataMap.Add("Name", OSD.FromString(Utils.BytesToString(parcelPropertiesPacket.ParcelData.Name)));
-            parcelDataMap.Add("OtherCleanTime", OSD.FromInteger(parcelPropertiesPacket.ParcelData.OtherCleanTime));
-            parcelDataMap.Add("OtherCount", OSD.FromInteger(parcelPropertiesPacket.ParcelData.OtherCount));
-            parcelDataMap.Add("OtherPrims", OSD.FromInteger(parcelPropertiesPacket.ParcelData.OtherPrims));
-            parcelDataMap.Add("OwnerID", OSD.FromUUID(parcelPropertiesPacket.ParcelData.OwnerID));
-            parcelDataMap.Add("OwnerPrims", OSD.FromInteger(parcelPropertiesPacket.ParcelData.OwnerPrims));
-            parcelDataMap.Add("ParcelFlags", OSD.FromBinary(uintToByteArray(parcelPropertiesPacket.ParcelData.ParcelFlags)));
-            parcelDataMap.Add("ParcelPrimBonus", OSD.FromReal(parcelPropertiesPacket.ParcelData.ParcelPrimBonus));
-            parcelDataMap.Add("PassHours", OSD.FromReal(parcelPropertiesPacket.ParcelData.PassHours));
-            parcelDataMap.Add("PassPrice", OSD.FromInteger(parcelPropertiesPacket.ParcelData.PassPrice));
-            parcelDataMap.Add("PublicCount", OSD.FromInteger(parcelPropertiesPacket.ParcelData.PublicCount));
-            parcelDataMap.Add("RegionDenyAnonymous", OSD.FromBoolean(parcelPropertiesPacket.ParcelData.RegionDenyAnonymous));
-            parcelDataMap.Add("RegionDenyIdentified", OSD.FromBoolean(parcelPropertiesPacket.ParcelData.RegionDenyIdentified));
-            parcelDataMap.Add("RegionDenyTransacted", OSD.FromBoolean(parcelPropertiesPacket.ParcelData.RegionDenyTransacted));
-
-            parcelDataMap.Add("RegionPushOverride", OSD.FromBoolean(parcelPropertiesPacket.ParcelData.RegionPushOverride));
-            parcelDataMap.Add("RentPrice", OSD.FromInteger(parcelPropertiesPacket.ParcelData.RentPrice));
-            parcelDataMap.Add("RequestResult", OSD.FromInteger(parcelPropertiesPacket.ParcelData.RequestResult));
-            parcelDataMap.Add("SalePrice", OSD.FromInteger(parcelPropertiesPacket.ParcelData.SalePrice));
-            parcelDataMap.Add("SelectedPrims", OSD.FromInteger(parcelPropertiesPacket.ParcelData.SelectedPrims));
-            parcelDataMap.Add("SelfCount", OSD.FromInteger(parcelPropertiesPacket.ParcelData.SelfCount));
-            parcelDataMap.Add("SequenceID", OSD.FromInteger(parcelPropertiesPacket.ParcelData.SequenceID));
-            parcelDataMap.Add("SimWideMaxPrims", OSD.FromInteger(parcelPropertiesPacket.ParcelData.SimWideMaxPrims));
-            parcelDataMap.Add("SimWideTotalPrims", OSD.FromInteger(parcelPropertiesPacket.ParcelData.SimWideTotalPrims));
-            parcelDataMap.Add("SnapSelection", OSD.FromBoolean(parcelPropertiesPacket.ParcelData.SnapSelection));
-            parcelDataMap.Add("SnapshotID", OSD.FromUUID(parcelPropertiesPacket.ParcelData.SnapshotID));
-            parcelDataMap.Add("Status", OSD.FromInteger((int)parcelPropertiesPacket.ParcelData.Status));
-            parcelDataMap.Add("TotalPrims", OSD.FromInteger(parcelPropertiesPacket.ParcelData.TotalPrims));
-
-            OSDArray UserLocation = new OSDArray(3);
-            UserLocation.Add(OSD.FromReal(parcelPropertiesPacket.ParcelData.UserLocation.X));
-            UserLocation.Add(OSD.FromReal(parcelPropertiesPacket.ParcelData.UserLocation.Y));
-            UserLocation.Add(OSD.FromReal(parcelPropertiesPacket.ParcelData.UserLocation.Z));
-            parcelDataMap.Add("UserLocation", UserLocation);
-
-            OSDArray UserLookAt = new OSDArray(3);
-            UserLookAt.Add(OSD.FromReal(parcelPropertiesPacket.ParcelData.UserLookAt.X));
-            UserLookAt.Add(OSD.FromReal(parcelPropertiesPacket.ParcelData.UserLookAt.Y));
-            UserLookAt.Add(OSD.FromReal(parcelPropertiesPacket.ParcelData.UserLookAt.Z));
-            parcelDataMap.Add("UserLookAt", UserLookAt);
-
-            parcelData.Add(parcelDataMap);
-            body.Add("ParcelData", parcelData);
-            parcelProperties.Add("body", body);
-            parcelProperties.Add("message", OSD.FromString("ParcelProperties"));
-
-            return parcelProperties;
-        }
-
         public static OSD GroupMembership(AgentGroupDataUpdatePacket groupUpdatePacket)
         {
             OSDMap groupUpdate = new OSDMap();
@@ -495,5 +386,14 @@ namespace OpenSim.Region.CoreModules.Framework.EventQueue
             return placesReply;
         }
 
+                public static OSD ParcelProperties(ParcelPropertiesMessage parcelPropertiesMessage)
+                {
+                        OSDMap message = new OSDMap();
+                        message.Add("message", OSD.FromString("ParcelProperties"));
+                        OSD message_body = parcelPropertiesMessage.Serialize();
+                        message.Add("body", message_body);
+                        return message;
+                }
+
     }
 }
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
index cc12df0..2a36362 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
@@ -549,7 +549,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                     }
 
                     if (!m_Scene.Permissions.CanRezObject(
-                        group.Children.Count, remoteClient.AgentId, pos)
+                        group.PrimCount, remoteClient.AgentId, pos)
                         && !attachment)
                     {
                         // The client operates in no fail mode. It will
@@ -629,7 +629,9 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                     rootPart.Name = item.Name;
                     rootPart.Description = item.Description;
 
-                    List<SceneObjectPart> partList = new List<SceneObjectPart>(group.Children.Values);
+                    List<SceneObjectPart> partList = null;                    
+                    lock (group.Children)
+                        partList = new List<SceneObjectPart>(group.Children.Values);
 
                     group.SetGroup(remoteClient.ActiveGroupId, remoteClient);
                     if ((rootPart.OwnerID != item.Owner) || (item.CurrentPermissions & 16) != 0)
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/BaseInventoryConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/BaseInventoryConnector.cs
index 1e51187..dcf08e3 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/BaseInventoryConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/BaseInventoryConnector.cs
@@ -27,15 +27,12 @@
 
 using System;
 using System.Collections.Generic;
-
 using OpenMetaverse;
 using Nini.Config;
 using log4net;
-
 using OpenSim.Framework;
 using OpenSim.Services.Interfaces;
 
-
 namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
 {
     public abstract class BaseInventoryConnector : IInventoryService
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/InventoryCache.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/InventoryCache.cs
index c97ab9e..4e2f602 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/InventoryCache.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/InventoryCache.cs
@@ -161,6 +161,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
         /// <returns></returns>
         public InventoryFolderBase GetFolderForType(UUID userID, AssetType type)
         {
+            m_log.DebugFormat("[INVENTORY CACHE]: Getting folder for asset type {0} for user {1}", type, userID);
+            
             Dictionary<AssetType, InventoryFolderBase> folders = null;
             
             lock (m_InventoryCache)
@@ -177,8 +179,13 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
             
             if ((folders != null) && folders.ContainsKey(type))
             {
+                m_log.DebugFormat(
+                    "[INVENTORY CACHE]: Returning folder {0} as type {1} for {2}", folders[type], type, userID);
+                
                 return folders[type];
             }
+            
+            m_log.WarnFormat("[INVENTORY CACHE]: Could not find folder for system type {0} for {1}", type, userID);            
 
             return null;
         }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs
index 22bd04c..915b59e 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs
@@ -216,13 +216,40 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
             return m_InventoryService.PurgeFolder(folder);
         }
 
-        /// <summary>
-        /// Add a new item to the user's inventory
-        /// </summary>
-        /// <param name="item"></param>
-        /// <returns>true if the item was successfully added</returns>
         public bool AddItem(InventoryItemBase item)
         {
+//            m_log.DebugFormat(
+//                "[LOCAL INVENTORY SERVICES CONNECTOR]: Adding inventory item {0} to user {1} folder {2}", 
+//                item.Name, item.Owner, item.Folder);            
+
+            if (UUID.Zero == item.Folder)
+            {
+                InventoryFolderBase f = m_InventoryService.GetFolderForType(item.Owner, (AssetType)item.AssetType);
+                if (f != null)
+                {
+//                    m_log.DebugFormat(
+//                        "[LOCAL INVENTORY SERVICES CONNECTOR]: Found folder {0} type {1} for item {2}", 
+//                        f.Name, (AssetType)f.Type, item.Name);
+                    
+                    item.Folder = f.ID;
+                }
+                else
+                {
+                    f = m_InventoryService.GetRootFolder(item.Owner);
+                    if (f != null)
+                    {
+                        item.Folder = f.ID;
+                    }
+                    else
+                    {
+//                        m_log.WarnFormat(
+//                            "[LOCAL INVENTORY SERVICES CONNECTOR]: Could not find root folder for {0} when trying to add item {1} with no parent folder specified",
+//                            item.Owner, item.Name);
+                        return false;
+                    }
+                }
+            }
+            
             return m_InventoryService.AddItem(item);
         }
 
@@ -236,7 +263,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
             return m_InventoryService.UpdateItem(item);
         }
 
-
         public bool MoveItems(UUID ownerID, List<InventoryItemBase> items)
         {
             return m_InventoryService.MoveItems(ownerID, items);
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs
index 153aeec..17d80c7 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs
@@ -75,7 +75,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
             base.Init(source);
         }
 
-
         #region ISharedRegionModule
 
         public void Initialise(IConfigSource source)
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs
index ada26cc..4211fa9 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs
@@ -228,6 +228,30 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
         {
             if (item == null)
                 return false;
+            
+            if (UUID.Zero == item.Folder)
+            {
+                InventoryFolderBase f = m_RemoteConnector.GetFolderForType(item.Owner, (AssetType)item.AssetType);
+                if (f != null)
+                {
+                    item.Folder = f.ID;
+                }
+                else
+                {
+                    f = m_RemoteConnector.GetRootFolder(item.Owner);
+                    if (f != null)
+                    {
+                        item.Folder = f.ID;
+                    }
+                    else
+                    {
+                        m_log.WarnFormat(
+                            "[LOCAL INVENTORY SERVICES CONNECTOR]: Could not find root folder for {0} when trying to add item {1} with no parent folder specified",
+                            item.Owner, item.Name);                        
+                        return false;
+                    }
+                }
+            }            
 
             return m_RemoteConnector.AddItem(item);
         }
@@ -294,9 +318,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
             return m_RemoteConnector.GetAssetPermissions(userID, assetID);
         }
 
-
         #endregion
-
-
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
index 57b7672..e51f118 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
@@ -243,7 +243,11 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                 // to the same scene (when this is possible).
                 sceneObject.ResetIDs();
 
-                foreach (SceneObjectPart part in sceneObject.Children.Values)
+                List<SceneObjectPart> partList = null;
+                lock (sceneObject.Children)
+                    partList = new List<SceneObjectPart>(sceneObject.Children.Values);
+                
+                foreach (SceneObjectPart part in partList)
                 {
                     if (!ResolveUserUuid(part.CreatorID))
                         part.CreatorID = m_scene.RegionInfo.EstateSettings.EstateOwner;
@@ -261,11 +265,27 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                     // Fix ownership/creator of inventory items
                     // Not doing so results in inventory items
                     // being no copy/no mod for everyone
-                    part.TaskInventory.LockItemsForRead(true);
-                    TaskInventoryDictionary inv = part.TaskInventory;
-                    foreach (KeyValuePair<UUID, TaskInventoryItem> kvp in inv)
+                    lock (part.TaskInventory)
                     {
-                        if (!ResolveUserUuid(kvp.Value.OwnerID))
+                        if (!ResolveUserUuid(part.CreatorID))
+                            part.CreatorID = m_scene.RegionInfo.EstateSettings.EstateOwner;
+    
+                        if (!ResolveUserUuid(part.OwnerID))
+                            part.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner;
+    
+                        if (!ResolveUserUuid(part.LastOwnerID))
+                            part.LastOwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner;
+    
+                        // And zap any troublesome sit target information
+                        part.SitTargetOrientation = new Quaternion(0, 0, 0, 1);
+                        part.SitTargetPosition    = new Vector3(0, 0, 0);
+    
+                        // Fix ownership/creator of inventory items
+                        // Not doing so results in inventory items
+                        // being no copy/no mod for everyone
+                        part.TaskInventory.LockItemsForRead(true);
+                        TaskInventoryDictionary inv = part.TaskInventory;
+                        foreach (KeyValuePair<UUID, TaskInventoryItem> kvp in inv)
                         {
                             if (!ResolveUserUuid(kvp.Value.OwnerID))
                             {
@@ -276,8 +296,8 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                                 kvp.Value.CreatorID = m_scene.RegionInfo.EstateSettings.EstateOwner;
                             }
                         }
+                        part.TaskInventory.LockItemsForRead(false);
                     }
-                    part.TaskInventory.LockItemsForRead(false);
                 }
 
                 if (m_scene.AddRestoredSceneObject(sceneObject, true, false))
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
index 8411d04..fb15d91 100644
--- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
@@ -684,6 +684,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
            args.useEstateSun = m_scene.RegionInfo.RegionSettings.UseEstateSun;
            args.waterHeight = (float)m_scene.RegionInfo.RegionSettings.WaterHeight;
            args.simName = m_scene.RegionInfo.RegionName;
+           args.regionType = m_scene.RegionInfo.RegionType;
 
            remote_client.SendRegionInfoToEstateMenu(args);
         }
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
index d00cb07..776fe30 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
@@ -33,6 +33,8 @@ using System.Reflection;
 using log4net;
 using Nini.Config;
 using OpenMetaverse;
+using OpenMetaverse.StructuredData;
+using OpenMetaverse.Messages.Linden;
 using OpenSim.Framework;
 using OpenSim.Framework.Capabilities;
 using OpenSim.Framework.Servers;
@@ -1078,7 +1080,6 @@ namespace OpenSim.Region.CoreModules.World.Land
             {
                 for (int y = 0; y < inc_y; y++)
                 {
-                    
                     ILandObject currentParcel = GetLandObject(start_x + x, start_y + y);
 
                     if (currentParcel != null)
@@ -1378,8 +1379,68 @@ namespace OpenSim.Region.CoreModules.World.Land
                                                            {
                                                                return RemoteParcelRequest(request, path, param, agentID, caps);
                                                            }));
-        }
+                        UUID parcelCapID = UUID.Random();
+                    caps.RegisterHandler("ParcelPropertiesUpdate",
+                                         new RestStreamHandler("POST", "/CAPS/" + parcelCapID,
+                                                               delegate(string request, string path, string param,
+                                                                        OSHttpRequest httpRequest, OSHttpResponse httpResponse)
+                                                                   {
+                                                                       return ProcessPropertiesUpdate(request, path, param, agentID, caps);
+                                                                   }));
+        }
+                private string ProcessPropertiesUpdate(string request, string path, string param, UUID agentID, Caps caps)
+                {
+                        IClientAPI client;
+                        if ( ! m_scene.TryGetClient(agentID, out client) ) {
+                                m_log.WarnFormat("[LAND] unable to retrieve IClientAPI for {0}", agentID.ToString() );
+                                return LLSDHelpers.SerialiseLLSDReply(new LLSDEmpty());
+                        }
+                        
+                        ParcelPropertiesUpdateMessage properties = new ParcelPropertiesUpdateMessage();
+                        OpenMetaverse.StructuredData.OSDMap args = (OpenMetaverse.StructuredData.OSDMap) OSDParser.DeserializeLLSDXml(request);
+
+                        properties.Deserialize(args);
+                        
+                        LandUpdateArgs land_update = new LandUpdateArgs();
+                        int parcelID = properties.LocalID;
+                        land_update.AuthBuyerID = properties.AuthBuyerID;
+            land_update.Category = properties.Category;
+            land_update.Desc = properties.Desc;
+            land_update.GroupID = properties.GroupID;
+            land_update.LandingType = (byte) properties.Landing;
+            land_update.MediaAutoScale = (byte) Convert.ToInt32(properties.MediaAutoScale);
+            land_update.MediaID = properties.MediaID;
+            land_update.MediaURL = properties.MediaURL;
+            land_update.MusicURL = properties.MusicURL;
+            land_update.Name = properties.Name;
+            land_update.ParcelFlags = (uint) properties.ParcelFlags;
+            land_update.PassHours = (int) properties.PassHours;
+            land_update.PassPrice = (int) properties.PassPrice;
+            land_update.SalePrice = (int) properties.SalePrice;
+            land_update.SnapshotID = properties.SnapshotID;
+            land_update.UserLocation = properties.UserLocation;
+            land_update.UserLookAt = properties.UserLookAt;
+                        land_update.MediaDescription = properties.MediaDesc;
+                        land_update.MediaType = properties.MediaType;
+                        land_update.MediaWidth = properties.MediaWidth;
+                        land_update.MediaHeight = properties.MediaHeight;
+                        land_update.MediaLoop = properties.MediaLoop;
+                        land_update.ObscureMusic = properties.ObscureMusic;
+                        land_update.ObscureMedia = properties.ObscureMedia;
+                        
+                    ILandObject land;
+            lock (m_landList)
+            {
+                m_landList.TryGetValue(parcelID, out land);
+            }
 
+            if (land != null) {
+                                land.UpdateLandProperties(land_update, client);
+                        } else {
+                                m_log.WarnFormat("[LAND] 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
         // "real" parcelID, because we wouldn't be able to map that to the region the parcel belongs to.
         // So, we create a "fake" parcelID by using the regionHandle (64 bit), and the local (integer) x
diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
index fcd993c..1b2cabb 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
@@ -1,1045 +1,1052 @@
-/*

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

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

- *

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

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

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

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

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

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

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

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

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

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

- *

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

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

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

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

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

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

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

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

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

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

- */

-

-using System;

-using System.Collections.Generic;

-using System.Reflection;

-using log4net;

-using OpenMetaverse;

-using OpenSim.Framework;

-using OpenSim.Region.Framework.Interfaces;

-using OpenSim.Region.Framework.Scenes;

-

-namespace OpenSim.Region.CoreModules.World.Land

-{

-    /// <summary>

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

-    /// </summary>

-    public class LandObject : ILandObject

-    {

-        #region Member Variables

-

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

-        #pragma warning disable 0429

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

-        #pragma warning restore 0429

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

-

-        private int m_lastSeqId = 0;

-

-        protected LandData m_landData = new LandData();

-        protected Scene m_scene;

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

-

-        public bool[,] LandBitmap

-        {

-            get { return m_landBitmap; }

-            set { m_landBitmap = value; }

-        }

-

-        #endregion

-

-        #region ILandObject Members

-

-        public LandData LandData

-        {

-            get { return m_landData; }

-

-            set { m_landData = value; }

-        }

-

-        public UUID RegionUUID

-        {

-            get { return m_scene.RegionInfo.RegionID; }

-        }

-

-        #region Constructors

-

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

-        {

-            m_scene = scene;

-            LandData.OwnerID = owner_id;

-            if (is_group_owned)

-                LandData.GroupID = owner_id;

-            else

-                LandData.GroupID = UUID.Zero;

-            LandData.IsGroupOwned = is_group_owned;

-        }

-

-        #endregion

-

-        #region Member Functions

-

-        #region General Functions

-

-        /// <summary>

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

-        /// </summary>

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

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

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

-        public bool ContainsPoint(int x, int y)

-        {

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

-            {

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

-            }

-            else

-            {

-                return false;

-            }

-        }

-

-        public ILandObject Copy()

-        {

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

-

-            //Place all new variables here!

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

-            newLand.LandData = LandData.Copy();

-

-            return newLand;

-        }

-

-        static overrideParcelMaxPrimCountDelegate overrideParcelMaxPrimCount;

-        static overrideSimulatorMaxPrimCountDelegate overrideSimulatorMaxPrimCount;

-

-        public void SetParcelObjectMaxOverride(overrideParcelMaxPrimCountDelegate overrideDel)

-        {

-            overrideParcelMaxPrimCount = overrideDel;

-        }

-        public void SetSimulatorObjectMaxOverride(overrideSimulatorMaxPrimCountDelegate overrideDel)

-        {

-            overrideSimulatorMaxPrimCount = overrideDel;

-        }

-

-        public int GetParcelMaxPrimCount(ILandObject thisObject)

-        {

-            if (overrideParcelMaxPrimCount != null)

-            {

-                return overrideParcelMaxPrimCount(thisObject);

-            }

-            else

-            {

-                // Normal Calculations

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

-            }

-        }

-        public int GetSimulatorMaxPrimCount(ILandObject thisObject)

-        {

-            if (overrideSimulatorMaxPrimCount != null)

-            {

-                return overrideSimulatorMaxPrimCount(thisObject);

-            }

-            else

-            {

-                //Normal Calculations

-                return m_scene.RegionInfo.ObjectCapacity;

-            }

-        }

-        #endregion

-

-        #region Packet Request Handling

-

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

-        {

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

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

-            if (estateModule != null)

-                regionFlags = estateModule.GetRegionFlags();

-

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

-            //

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

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

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

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

-

-            int seq_id;

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

-            {

-                seq_id = m_lastSeqId;

-            }

-            else

-            {

-                seq_id = sequence_id;

-                m_lastSeqId = seq_id;

-            }

-

-            remote_client.SendLandProperties(seq_id,

-                    snap_selection, request_result, LandData,

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

-                    GetParcelMaxPrimCount(this),

-                    GetSimulatorMaxPrimCount(this), regionFlags);

-        }

-

-        public void UpdateLandProperties(LandUpdateArgs args, IClientAPI remote_client)

-        {

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

-            {

-                //Needs later group support

-                bool snap_selection = false;

-                LandData newData = LandData.Copy();

-

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

-                {

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

-                    {

-                        newData.AuthBuyerID = args.AuthBuyerID;

-                        newData.SalePrice = args.SalePrice;

-                        snap_selection = true;

-                    }

-                }

-                newData.Category = args.Category;

-                newData.Description = args.Desc;

-                newData.GroupID = args.GroupID;

-                newData.LandingType = args.LandingType;

-                newData.MediaAutoScale = args.MediaAutoScale;

-                newData.MediaID = args.MediaID;

-                newData.MediaURL = args.MediaURL;

-                newData.MusicURL = args.MusicURL;

-                newData.Name = args.Name;

-                newData.Flags = args.ParcelFlags;

-                newData.PassHours = args.PassHours;

-                newData.PassPrice = args.PassPrice;

-                newData.SnapshotID = args.SnapshotID;

-                newData.UserLocation = args.UserLocation;

-                newData.UserLookAt = args.UserLookAt;

-

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

-

-                SendLandUpdateToAvatarsOverMe(snap_selection);

-            }

-        }

-

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

-        {

-            LandData newData = LandData.Copy();

-            newData.OwnerID = avatarID;

-            newData.GroupID = groupID;

-            newData.IsGroupOwned = groupOwned;

-            //newData.auctionID = AuctionID;

-            newData.ClaimDate = Util.UnixTimeSinceEpoch();

-            newData.ClaimPrice = claimprice;

-            newData.SalePrice = 0;

-            newData.AuthBuyerID = UUID.Zero;

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

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

-

-            SendLandUpdateToAvatarsOverMe(true);

-        }

-

-        public void DeedToGroup(UUID groupID)

-        {

-            LandData newData = LandData.Copy();

-            newData.OwnerID = groupID;

-            newData.GroupID = groupID;

-            newData.IsGroupOwned = true;

-

-            // Reset show in directory flag on deed

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

-

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

-

-            SendLandUpdateToAvatarsOverMe(true);

-        }

-

-        public bool IsEitherBannedOrRestricted(UUID avatar)

-        {

-            if (IsBannedFromLand(avatar))

-            {

-                return true;

-            }

-            else if (IsRestrictedFromLand(avatar))

-            {

-                return true;

-            }

-            return false;

-        }

-

-        public bool HasGroupAccess(UUID avatar)

-        {

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

-            {

-                IGroupsModule groupsModule =

-                        m_scene.RequestModuleInterface<IGroupsModule>();

-

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

-                if (groupsModule != null)

-                {

-                    GroupMembershipData[] GroupMembership =

-                            groupsModule.GetMembershipData(avatar);

-

-                    if (GroupMembership != null)

-                    {

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

-                        {

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

-                            {

-                                return true;

-                            }

-                        }

-                    }

-                }

-            }

-            return false;

-        }

-

-        public bool IsBannedFromLand(UUID avatar)

-        {

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

-                return false;

-

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

-            {

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

-                entry.AgentID = avatar;

-                entry.Flags = AccessList.Ban;

-                entry.Time = new DateTime();

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

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

-                {

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

-                    return true;

-                }

-            }

-            return false;

-        }

-

-        public bool IsRestrictedFromLand(UUID avatar)

-        {

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

-                return false;

-

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

-            {

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

-                entry.AgentID = avatar;

-                entry.Flags = AccessList.Access;

-                entry.Time = new DateTime();

-

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

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

-                {

-                    if (!HasGroupAccess(avatar))

-                    {

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

-                        return true;

-                    }

-                }

-            }

-

-            return false;

-        }

-

-        public void SendLandUpdateToClient(IClientAPI remote_client)

-        {

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

-        }

-

-        public void SendLandUpdateToClient(bool snap_selection, IClientAPI remote_client)

-        {

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

-        }

-

-        public void SendLandUpdateToAvatarsOverMe()

-        {

-            SendLandUpdateToAvatarsOverMe(false);

-        }

-

-        public void SendLandUpdateToAvatarsOverMe(bool snap_selection)

-        {

-            m_scene.ForEachScenePresence(delegate(ScenePresence avatar)

-            {

-                if (avatar.IsChildAgent)

-                    return;

-

-                ILandObject over = null;

-                try

-                {

-                    over =

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

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

-                }

-                catch (Exception)

-                {

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

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

-                }

-

-                if (over != null)

-                {

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

-                    {

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

-                            m_scene.RegionInfo.RegionSettings.AllowDamage)

-                            avatar.Invulnerable = false;

-                        else

-                            avatar.Invulnerable = true;

-

-                        SendLandUpdateToClient(snap_selection, avatar.ControllingClient);

-                    }

-                }

-            });

-        }

-

-        #endregion

-

-        #region AccessList Functions

-

-        public List<UUID>  CreateAccessListArrayByFlag(AccessList flag)

-        {

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

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

-            {

-                if (entry.Flags == flag)

-                {

-                   list.Add(entry.AgentID);

-                }

-            }

-            if (list.Count == 0)

-            {

-                list.Add(UUID.Zero);

-            }

-

-            return list;

-        }

-

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

-                                   IClientAPI remote_client)

-        {

-

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

-            {

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

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

-            }

-

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

-            {

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

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

-            }

-        }

-

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

-        {

-            LandData newData = LandData.Copy();

-

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

-            {

-                entries.Clear();

-            }

-

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

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

-            {

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

-                {

-                    toRemove.Add(entry);

-                }

-            }

-

-            foreach (ParcelManager.ParcelAccessEntry entry in toRemove)

-            {

-                newData.ParcelAccessList.Remove(entry);

-            }

-            foreach (ParcelManager.ParcelAccessEntry entry in entries)

-            {

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

-                temp.AgentID = entry.AgentID;

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

-                temp.Flags = (AccessList)flags;

-

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

-                {

-                    newData.ParcelAccessList.Add(temp);

-                }

-            }

-

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

-        }

-

-        #endregion

-

-        #region Update Functions

-

-        public void UpdateLandBitmapByteArray()

-        {

-            LandData.Bitmap = ConvertLandBitmapToBytes();

-        }

-

-        /// <summary>

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

-        /// </summary>

-        public void ForceUpdateLandInfo()

-        {

-            UpdateAABBAndAreaValues();

-            UpdateLandBitmapByteArray();

-        }

-

-        public void SetLandBitmapFromByteArray()

-        {

-            LandBitmap = ConvertBytesToLandBitmap();

-        }

-

-        /// <summary>

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

-        /// </summary>

-        private void UpdateAABBAndAreaValues()

-        {

-            int min_x = 64;

-            int min_y = 64;

-            int max_x = 0;

-            int max_y = 0;

-            int tempArea = 0;

-            int x, y;

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

-            {

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

-                {

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

-                    {

-                        if (min_x > x) min_x = x;

-                        if (min_y > y) min_y = y;

-                        if (max_x < x) max_x = x;

-                        if (max_y < y) max_y = y;

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

-                    }

-                }

-            }

-            int tx = min_x * 4;

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

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

-            int ty = min_y * 4;

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

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

-            LandData.AABBMin =

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

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

-

-            tx = max_x * 4;

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

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

-            ty = max_y * 4;

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

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

-            LandData.AABBMax =

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

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

-            LandData.Area = tempArea;

-        }

-

-        #endregion

-

-        #region Land Bitmap Functions

-

-        /// <summary>

-        /// Sets the land's bitmap manually

-        /// </summary>

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

-        public void SetLandBitmap(bool[,] bitmap)

-        {

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

-            {

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

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

-            }

-            else

-            {

-                //Valid: Lets set it

-                LandBitmap = bitmap;

-                ForceUpdateLandInfo();

-            }

-        }

-

-        /// <summary>

-        /// Gets the land's bitmap manually

-        /// </summary>

-        /// <returns></returns>

-        public bool[,] GetLandBitmap()

-        {

-            return LandBitmap;

-        }

-

-        /// <summary>

-        /// Full sim land object creation

-        /// </summary>

-        /// <returns></returns>

-        public bool[,] BasicFullRegionLandBitmap()

-        {

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

-        }

-

-        /// <summary>

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

-        /// </summary>

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

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

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

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

-        /// <returns></returns>

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

-        {

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

-            tempBitmap.Initialize();

-

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

-            return tempBitmap;

-        }

-

-        /// <summary>

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

-        /// </summary>

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

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

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

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

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

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

-        /// <returns></returns>

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

-                                              bool set_value)

-        {

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

-            {

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

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

-            }

-

-            int x, y;

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

-            {

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

-                {

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

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

-                    {

-                        land_bitmap[x, y] = set_value;

-                    }

-                }

-            }

-            return land_bitmap;

-        }

-

-        /// <summary>

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

-        /// </summary>

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

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

-        /// <returns></returns>

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

-        {

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

-            {

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

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

-            }

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

-            {

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

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

-            }

-

-            int x, y;

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

-            {

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

-                {

-                    if (bitmap_add[x, y])

-                    {

-                        bitmap_base[x, y] = true;

-                    }

-                }

-            }

-            return bitmap_base;

-        }

-

-        /// <summary>

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

-        /// </summary>

-        /// <returns></returns>

-        private byte[] ConvertLandBitmapToBytes()

-        {

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

-            byte tempByte = 0;

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

-            i = 0;

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

-            {

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

-                {

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

-                    if (i % 8 == 0)

-                    {

-                        tempConvertArr[byteNum] = tempByte;

-                        tempByte = (byte) 0;

-                        i = 0;

-                        byteNum++;

-                    }

-                }

-            }

-            return tempConvertArr;

-        }

-

-        private bool[,] ConvertBytesToLandBitmap()

-        {

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

-            tempConvertMap.Initialize();

-            byte tempByte = 0;

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

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

-            {

-                tempByte = LandData.Bitmap[i];

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

-                {

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

-                    tempConvertMap[x, y] = bit;

-                    x++;

-                    if (x > 63)

-                    {

-                        x = 0;

-                        y++;

-                    }

-                }

-            }

-            return tempConvertMap;

-        }

-

-        #endregion

-

-        #region Object Select and Object Owner Listing

-

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

-        {

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

-            {

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

-                try

-                {

-                    lock (primsOverMe)

-                    {

-                        foreach (SceneObjectGroup obj in primsOverMe)

-                        {

-                            if (obj.LocalId > 0)

-                            {

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

-                                {

-                                    resultLocalIDs.Add(obj.LocalId);

-                                }

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

-                                {

-                                    resultLocalIDs.Add(obj.LocalId);

-                                }

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

-                                         obj.OwnerID != remote_client.AgentId)

-                                {

-                                    resultLocalIDs.Add(obj.LocalId);

-                                }

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

-                                {

-                                    resultLocalIDs.Add(obj.LocalId);

-                                }

-                            }

-                        }

-                    }

-                } catch (InvalidOperationException)

-                {

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

-                }

-

-                remote_client.SendForceClientSelectObjects(resultLocalIDs);

-            }

-        }

-

-        /// <summary>

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

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

-        ///

-        /// </summary>

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

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

-        /// </param>

-        public void SendLandObjectOwners(IClientAPI remote_client)

-        {

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

-            {

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

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

-

-                lock (primsOverMe)

-                {

-                    try

-                    {

-

-                        foreach (SceneObjectGroup obj in primsOverMe)

-                        {

-                            try

-                            {

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

-                                {

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

-                                }

-                            }

-                            catch (NullReferenceException)

-                            {

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

-                            }

-                            try

-                            {

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

-                            }

-                            catch (KeyNotFoundException)

-                            {

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

-                            }

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

-                                groups.Add(obj.OwnerID);

-                        }

-                    }

-                    catch (InvalidOperationException)

-                    {

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

-                    }

-                }

-

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

-            }

-        }

-

-        public Dictionary<UUID, int> GetLandObjectOwners()

-        {

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

-            lock (primsOverMe)

-            {

-                try

-                {

-

-                    foreach (SceneObjectGroup obj in primsOverMe)

-                    {

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

-                        {

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

-                        }

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

-                    }

-                }

-                catch (InvalidOperationException)

-                {

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

-                }

-

-            }

-            return ownersAndCount;

-        }

-

-        #endregion

-

-        #region Object Returning

-

-        public void ReturnObject(SceneObjectGroup obj)

-        {

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

-            objs[0] = obj;

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

-        }

-

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

-        {

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

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

-

-            lock (primsOverMe)

-            {

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

-                {

-                    foreach (SceneObjectGroup obj in primsOverMe)

-                    {

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

-                        {

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

-                                returns[obj.OwnerID] =

-                                        new List<SceneObjectGroup>();

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

-                        }

-                    }

-                }

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

-                {

-                    foreach (SceneObjectGroup obj in primsOverMe)

-                    {

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

-                        {

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

-                                returns[obj.OwnerID] =

-                                        new List<SceneObjectGroup>();

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

-                        }

-                    }

-                }

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

-                {

-                    foreach (SceneObjectGroup obj in primsOverMe)

-                    {

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

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

-                            m_landData.GroupID == UUID.Zero))

-                        {

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

-                                returns[obj.OwnerID] =

-                                        new List<SceneObjectGroup>();

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

-                        }

-                    }

-                }

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

-                {

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

-

-                    foreach (SceneObjectGroup obj in primsOverMe)

-                    {

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

-                        {

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

-                                returns[obj.OwnerID] =

-                                        new List<SceneObjectGroup>();

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

-                        }

-                    }

-                }

-            }

-

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

-            {

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

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

-            }

-        }

-

-        #endregion

-

-        #region Object Adding/Removing from Parcel

-

-        public void ResetLandPrimCounts()

-        {

-            LandData.GroupPrims = 0;

-            LandData.OwnerPrims = 0;

-            LandData.OtherPrims = 0;

-            LandData.SelectedPrims = 0;

-

-

-            lock (primsOverMe)

-                primsOverMe.Clear();

-        }

-

-        public void AddPrimToCount(SceneObjectGroup obj)

-        {

-

-            UUID prim_owner = obj.OwnerID;

-            int prim_count = obj.PrimCount;

-

-            if (obj.IsSelected)

-            {

-                LandData.SelectedPrims += prim_count;

-            }

-            else

-            {

-                if (prim_owner == LandData.OwnerID)

-                {

-                    LandData.OwnerPrims += prim_count;

-                }

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

-                          prim_owner  == LandData.GroupID) &&

-                          LandData.GroupID != UUID.Zero)

-                {

-                    LandData.GroupPrims += prim_count;

-                }

-                else

-                {

-                    LandData.OtherPrims += prim_count;

-                }

-            }

-

-            lock (primsOverMe)

-                primsOverMe.Add(obj);

-        }

-

-        public void RemovePrimFromCount(SceneObjectGroup obj)

-        {

-            lock (primsOverMe)

-            {

-                if (primsOverMe.Contains(obj))

-                {

-                    UUID prim_owner = obj.OwnerID;

-                    int prim_count = obj.PrimCount;

-

-                    if (prim_owner == LandData.OwnerID)

-                    {

-                        LandData.OwnerPrims -= prim_count;

-                    }

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

-                             prim_owner  == LandData.GroupID)

-                    {

-                        LandData.GroupPrims -= prim_count;

-                    }

-                    else

-                    {

-                        LandData.OtherPrims -= prim_count;

-                    }

-

-                    primsOverMe.Remove(obj);

-                }

-            }

-        }

-

-        #endregion

-

-        #endregion

-

-        #endregion

-        

-        /// <summary>

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

-        /// </summary>

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

-        public void SetMediaUrl(string url)

-        {

-            LandData.MediaURL = url;

-            SendLandUpdateToAvatarsOverMe();

-        }

-        

-        /// <summary>

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

-        /// </summary>

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

-        public void SetMusicUrl(string url)

-        {

-            LandData.MusicURL = url;

-            SendLandUpdateToAvatarsOverMe();

-        }

-    }

-}

+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using log4net;
+using OpenMetaverse;
+using OpenSim.Framework;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
+
+namespace OpenSim.Region.CoreModules.World.Land
+{
+    /// <summary>
+    /// Keeps track of a specific piece of land's information
+    /// </summary>
+    public class LandObject : ILandObject
+    {
+        #region Member Variables
+
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        #pragma warning disable 0429
+        private const int landArrayMax = ((int)((int)Constants.RegionSize / 4) >= 64) ? (int)((int)Constants.RegionSize / 4) : 64;
+        #pragma warning restore 0429
+        private bool[,] m_landBitmap = new bool[landArrayMax,landArrayMax];
+
+        private int m_lastSeqId = 0;
+
+        protected LandData m_landData = new LandData();
+        protected Scene m_scene;
+        protected List<SceneObjectGroup> primsOverMe = new List<SceneObjectGroup>();
+
+        public bool[,] LandBitmap
+        {
+            get { return m_landBitmap; }
+            set { m_landBitmap = value; }
+        }
+
+        #endregion
+
+        #region ILandObject Members
+
+        public LandData LandData
+        {
+            get { return m_landData; }
+
+            set { m_landData = value; }
+        }
+
+        public UUID RegionUUID
+        {
+            get { return m_scene.RegionInfo.RegionID; }
+        }
+
+        #region Constructors
+
+        public LandObject(UUID owner_id, bool is_group_owned, Scene scene)
+        {
+            m_scene = scene;
+            LandData.OwnerID = owner_id;
+            if (is_group_owned)
+                LandData.GroupID = owner_id;
+            else
+                LandData.GroupID = UUID.Zero;
+            LandData.IsGroupOwned = is_group_owned;
+        }
+
+        #endregion
+
+        #region Member Functions
+
+        #region General Functions
+
+        /// <summary>
+        /// Checks to see if this land object contains a point
+        /// </summary>
+        /// <param name="x"></param>
+        /// <param name="y"></param>
+        /// <returns>Returns true if the piece of land contains the specified point</returns>
+        public bool ContainsPoint(int x, int y)
+        {
+            if (x >= 0 && y >= 0 && x <= Constants.RegionSize && y <= Constants.RegionSize)
+            {
+                return (LandBitmap[x / 4, y / 4] == true);
+            }
+            else
+            {
+                return false;
+            }
+        }
+
+        public ILandObject Copy()
+        {
+            ILandObject newLand = new LandObject(LandData.OwnerID, LandData.IsGroupOwned, m_scene);
+
+            //Place all new variables here!
+            newLand.LandBitmap = (bool[,]) (LandBitmap.Clone());
+            newLand.LandData = LandData.Copy();
+
+            return newLand;
+        }
+
+        static overrideParcelMaxPrimCountDelegate overrideParcelMaxPrimCount;
+        static overrideSimulatorMaxPrimCountDelegate overrideSimulatorMaxPrimCount;
+
+        public void SetParcelObjectMaxOverride(overrideParcelMaxPrimCountDelegate overrideDel)
+        {
+            overrideParcelMaxPrimCount = overrideDel;
+        }
+        public void SetSimulatorObjectMaxOverride(overrideSimulatorMaxPrimCountDelegate overrideDel)
+        {
+            overrideSimulatorMaxPrimCount = overrideDel;
+        }
+
+        public int GetParcelMaxPrimCount(ILandObject thisObject)
+        {
+            if (overrideParcelMaxPrimCount != null)
+            {
+                return overrideParcelMaxPrimCount(thisObject);
+            }
+            else
+            {
+                // Normal Calculations
+                return (int)Math.Round(((float)LandData.Area / 65536.0f) * (float)m_scene.RegionInfo.ObjectCapacity * (float)m_scene.RegionInfo.RegionSettings.ObjectBonus);
+            }
+        }
+        public int GetSimulatorMaxPrimCount(ILandObject thisObject)
+        {
+            if (overrideSimulatorMaxPrimCount != null)
+            {
+                return overrideSimulatorMaxPrimCount(thisObject);
+            }
+            else
+            {
+                //Normal Calculations
+                return m_scene.RegionInfo.ObjectCapacity;
+            }
+        }
+        #endregion
+
+        #region Packet Request Handling
+
+        public void SendLandProperties(int sequence_id, bool snap_selection, int request_result, IClientAPI remote_client)
+        {
+            IEstateModule estateModule = m_scene.RequestModuleInterface<IEstateModule>();
+            uint regionFlags = 336723974 & ~((uint)(RegionFlags.AllowLandmark | RegionFlags.AllowSetHome));
+            if (estateModule != null)
+                regionFlags = estateModule.GetRegionFlags();
+
+            // In a perfect world, this would have worked.
+            //
+//            if ((landData.Flags & (uint)ParcelFlags.AllowLandmark) != 0)
+//                regionFlags |=  (uint)RegionFlags.AllowLandmark;
+//            if (landData.OwnerID == remote_client.AgentId)
+//                regionFlags |=  (uint)RegionFlags.AllowSetHome;
+
+            int seq_id;
+            if (snap_selection && (sequence_id == 0))
+            {
+                seq_id = m_lastSeqId;
+            }
+            else
+            {
+                seq_id = sequence_id;
+                m_lastSeqId = seq_id;
+            }
+
+            remote_client.SendLandProperties(seq_id,
+                    snap_selection, request_result, LandData,
+                    (float)m_scene.RegionInfo.RegionSettings.ObjectBonus,
+                    GetParcelMaxPrimCount(this),
+                    GetSimulatorMaxPrimCount(this), regionFlags);
+        }
+
+        public void UpdateLandProperties(LandUpdateArgs args, IClientAPI remote_client)
+        {
+            if (m_scene.Permissions.CanEditParcel(remote_client.AgentId,this))
+            {
+                //Needs later group support
+                bool snap_selection = false;
+                LandData newData = LandData.Copy();
+
+                if (args.AuthBuyerID != newData.AuthBuyerID || args.SalePrice != newData.SalePrice)
+                {
+                    if (m_scene.Permissions.CanSellParcel(remote_client.AgentId, this))
+                    {
+                        newData.AuthBuyerID = args.AuthBuyerID;
+                        newData.SalePrice = args.SalePrice;
+                        snap_selection = true;
+                    }
+                }
+                newData.Category = args.Category;
+                newData.Description = args.Desc;
+                newData.GroupID = args.GroupID;
+                newData.LandingType = args.LandingType;
+                newData.MediaAutoScale = args.MediaAutoScale;
+                newData.MediaID = args.MediaID;
+                newData.MediaURL = args.MediaURL;
+                newData.MusicURL = args.MusicURL;
+                newData.Name = args.Name;
+                newData.Flags = args.ParcelFlags;
+                newData.PassHours = args.PassHours;
+                newData.PassPrice = args.PassPrice;
+                newData.SnapshotID = args.SnapshotID;
+                newData.UserLocation = args.UserLocation;
+                newData.UserLookAt = args.UserLookAt;
+                                newData.MediaType = args.MediaType;
+                                newData.MediaDescription = args.MediaDescription;
+                                newData.MediaWidth = args.MediaWidth;
+                                newData.MediaHeight = args.MediaHeight;
+                                newData.MediaLoop = args.MediaLoop;
+                                newData.ObscureMusic = args.ObscureMusic;
+                                newData.ObscureMedia = args.ObscureMedia;
+
+                m_scene.LandChannel.UpdateLandObject(LandData.LocalID, newData);
+
+                SendLandUpdateToAvatarsOverMe(snap_selection);
+            }
+        }
+
+        public void UpdateLandSold(UUID avatarID, UUID groupID, bool groupOwned, uint AuctionID, int claimprice, int area)
+        {
+            LandData newData = LandData.Copy();
+            newData.OwnerID = avatarID;
+            newData.GroupID = groupID;
+            newData.IsGroupOwned = groupOwned;
+            //newData.auctionID = AuctionID;
+            newData.ClaimDate = Util.UnixTimeSinceEpoch();
+            newData.ClaimPrice = claimprice;
+            newData.SalePrice = 0;
+            newData.AuthBuyerID = UUID.Zero;
+            newData.Flags &= ~(uint) (ParcelFlags.ForSale | ParcelFlags.ForSaleObjects | ParcelFlags.SellParcelObjects | ParcelFlags.ShowDirectory);
+            m_scene.LandChannel.UpdateLandObject(LandData.LocalID, newData);
+
+            SendLandUpdateToAvatarsOverMe(true);
+        }
+
+        public void DeedToGroup(UUID groupID)
+        {
+            LandData newData = LandData.Copy();
+            newData.OwnerID = groupID;
+            newData.GroupID = groupID;
+            newData.IsGroupOwned = true;
+
+            // Reset show in directory flag on deed
+            newData.Flags &= ~(uint) (ParcelFlags.ForSale | ParcelFlags.ForSaleObjects | ParcelFlags.SellParcelObjects | ParcelFlags.ShowDirectory);
+
+            m_scene.LandChannel.UpdateLandObject(LandData.LocalID, newData);
+
+            SendLandUpdateToAvatarsOverMe(true);
+        }
+
+        public bool IsEitherBannedOrRestricted(UUID avatar)
+        {
+            if (IsBannedFromLand(avatar))
+            {
+                return true;
+            }
+            else if (IsRestrictedFromLand(avatar))
+            {
+                return true;
+            }
+            return false;
+        }
+
+        public bool HasGroupAccess(UUID avatar)
+        {
+            if ((LandData.Flags & (uint)ParcelFlags.UseAccessGroup) == (uint)ParcelFlags.UseAccessGroup)
+            {
+                IGroupsModule groupsModule =
+                        m_scene.RequestModuleInterface<IGroupsModule>();
+
+                List<UUID> agentGroups = new List<UUID>();
+                if (groupsModule != null)
+                {
+                    GroupMembershipData[] GroupMembership =
+                            groupsModule.GetMembershipData(avatar);
+
+                    if (GroupMembership != null)
+                    {
+                        for (int i = 0; i < GroupMembership.Length; i++)
+                        {
+                            if (LandData.GroupID == GroupMembership[i].GroupID)
+                            {
+                                return true;
+                            }
+                        }
+                    }
+                }
+            }
+            return false;
+        }
+
+        public bool IsBannedFromLand(UUID avatar)
+        {
+            if (m_scene.Permissions.IsAdministrator(avatar))
+                return false;
+
+            if ((LandData.Flags & (uint) ParcelFlags.UseBanList) > 0)
+            {
+                ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry();
+                entry.AgentID = avatar;
+                entry.Flags = AccessList.Ban;
+                entry.Time = new DateTime();
+                //See if they are on the list, but make sure the owner isn't banned
+                if (LandData.ParcelAccessList.Contains(entry) && LandData.OwnerID != avatar)
+                {
+                    //They are banned, so lets send them a notice about this parcel
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        public bool IsRestrictedFromLand(UUID avatar)
+        {
+            if (m_scene.Permissions.IsAdministrator(avatar))
+                return false;
+
+            if ((LandData.Flags & (uint) ParcelFlags.UseAccessList) > 0)
+            {
+                ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry();
+                entry.AgentID = avatar;
+                entry.Flags = AccessList.Access;
+                entry.Time = new DateTime();
+
+                //If they are not on the access list and are not the owner
+                if (!LandData.ParcelAccessList.Contains(entry) && LandData.OwnerID != avatar)
+                {
+                    if (!HasGroupAccess(avatar))
+                    {
+                        //They are not allowed in this parcel, but not banned, so lets send them a notice about this parcel
+                        return true;
+                    }
+                }
+            }
+
+            return false;
+        }
+
+        public void SendLandUpdateToClient(IClientAPI remote_client)
+        {
+            SendLandProperties(0, false, 0, remote_client);
+        }
+
+        public void SendLandUpdateToClient(bool snap_selection, IClientAPI remote_client)
+        {
+            SendLandProperties(0, snap_selection, 0, remote_client);
+        }
+
+        public void SendLandUpdateToAvatarsOverMe()
+        {
+            SendLandUpdateToAvatarsOverMe(false);
+        }
+
+        public void SendLandUpdateToAvatarsOverMe(bool snap_selection)
+        {
+            m_scene.ForEachScenePresence(delegate(ScenePresence avatar)
+            {
+                if (avatar.IsChildAgent)
+                    return;
+
+                ILandObject over = null;
+                try
+                {
+                    over =
+                        m_scene.LandChannel.GetLandObject(Util.Clamp<int>((int)Math.Round(avatar.AbsolutePosition.X), 0, ((int)Constants.RegionSize - 1)),
+                                                          Util.Clamp<int>((int)Math.Round(avatar.AbsolutePosition.Y), 0, ((int)Constants.RegionSize - 1)));
+                }
+                catch (Exception)
+                {
+                    m_log.Warn("[LAND]: " + "unable to get land at x: " + Math.Round(avatar.AbsolutePosition.X) + " y: " +
+                               Math.Round(avatar.AbsolutePosition.Y));
+                }
+
+                if (over != null)
+                {
+                    if (over.LandData.LocalID == LandData.LocalID)
+                    {
+                        if (((over.LandData.Flags & (uint)ParcelFlags.AllowDamage) != 0) &&
+                            m_scene.RegionInfo.RegionSettings.AllowDamage)
+                            avatar.Invulnerable = false;
+                        else
+                            avatar.Invulnerable = true;
+
+                        SendLandUpdateToClient(snap_selection, avatar.ControllingClient);
+                    }
+                }
+            });
+        }
+
+        #endregion
+
+        #region AccessList Functions
+
+        public List<UUID>  CreateAccessListArrayByFlag(AccessList flag)
+        {
+            List<UUID> list = new List<UUID>();
+            foreach (ParcelManager.ParcelAccessEntry entry in LandData.ParcelAccessList)
+            {
+                if (entry.Flags == flag)
+                {
+                   list.Add(entry.AgentID);
+                }
+            }
+            if (list.Count == 0)
+            {
+                list.Add(UUID.Zero);
+            }
+
+            return list;
+        }
+
+        public void SendAccessList(UUID agentID, UUID sessionID, uint flags, int sequenceID,
+                                   IClientAPI remote_client)
+        {
+
+            if (flags == (uint) AccessList.Access || flags == (uint) AccessList.Both)
+            {
+                List<UUID> avatars = CreateAccessListArrayByFlag(AccessList.Access);
+                remote_client.SendLandAccessListData(avatars,(uint) AccessList.Access,LandData.LocalID);
+            }
+
+            if (flags == (uint) AccessList.Ban || flags == (uint) AccessList.Both)
+            {
+                List<UUID> avatars = CreateAccessListArrayByFlag(AccessList.Ban);
+                remote_client.SendLandAccessListData(avatars, (uint)AccessList.Ban, LandData.LocalID);
+            }
+        }
+
+        public void UpdateAccessList(uint flags, List<ParcelManager.ParcelAccessEntry> entries, IClientAPI remote_client)
+        {
+            LandData newData = LandData.Copy();
+
+            if (entries.Count == 1 && entries[0].AgentID == UUID.Zero)
+            {
+                entries.Clear();
+            }
+
+            List<ParcelManager.ParcelAccessEntry> toRemove = new List<ParcelManager.ParcelAccessEntry>();
+            foreach (ParcelManager.ParcelAccessEntry entry in newData.ParcelAccessList)
+            {
+                if (entry.Flags == (AccessList)flags)
+                {
+                    toRemove.Add(entry);
+                }
+            }
+
+            foreach (ParcelManager.ParcelAccessEntry entry in toRemove)
+            {
+                newData.ParcelAccessList.Remove(entry);
+            }
+            foreach (ParcelManager.ParcelAccessEntry entry in entries)
+            {
+                ParcelManager.ParcelAccessEntry temp = new ParcelManager.ParcelAccessEntry();
+                temp.AgentID = entry.AgentID;
+                temp.Time = new DateTime(); //Pointless? Yes.
+                temp.Flags = (AccessList)flags;
+
+                if (!newData.ParcelAccessList.Contains(temp))
+                {
+                    newData.ParcelAccessList.Add(temp);
+                }
+            }
+
+            m_scene.LandChannel.UpdateLandObject(LandData.LocalID, newData);
+        }
+
+        #endregion
+
+        #region Update Functions
+
+        public void UpdateLandBitmapByteArray()
+        {
+            LandData.Bitmap = ConvertLandBitmapToBytes();
+        }
+
+        /// <summary>
+        /// Update all settings in land such as area, bitmap byte array, etc
+        /// </summary>
+        public void ForceUpdateLandInfo()
+        {
+            UpdateAABBAndAreaValues();
+            UpdateLandBitmapByteArray();
+        }
+
+        public void SetLandBitmapFromByteArray()
+        {
+            LandBitmap = ConvertBytesToLandBitmap();
+        }
+
+        /// <summary>
+        /// Updates the AABBMin and AABBMax values after area/shape modification of the land object
+        /// </summary>
+        private void UpdateAABBAndAreaValues()
+        {
+            int min_x = 64;
+            int min_y = 64;
+            int max_x = 0;
+            int max_y = 0;
+            int tempArea = 0;
+            int x, y;
+            for (x = 0; x < 64; x++)
+            {
+                for (y = 0; y < 64; y++)
+                {
+                    if (LandBitmap[x, y] == true)
+                    {
+                        if (min_x > x) min_x = x;
+                        if (min_y > y) min_y = y;
+                        if (max_x < x) max_x = x;
+                        if (max_y < y) max_y = y;
+                        tempArea += 16; //16sqm peice of land
+                    }
+                }
+            }
+            int tx = min_x * 4;
+            if (tx > ((int)Constants.RegionSize - 1))
+                tx = ((int)Constants.RegionSize - 1);
+            int ty = min_y * 4;
+            if (ty > ((int)Constants.RegionSize - 1))
+                ty = ((int)Constants.RegionSize - 1);
+            LandData.AABBMin =
+                new Vector3((float) (min_x * 4), (float) (min_y * 4),
+                              (float) m_scene.Heightmap[tx, ty]);
+
+            tx = max_x * 4;
+            if (tx > ((int)Constants.RegionSize - 1))
+                tx = ((int)Constants.RegionSize - 1);
+            ty = max_y * 4;
+            if (ty > ((int)Constants.RegionSize - 1))
+                ty = ((int)Constants.RegionSize - 1);
+            LandData.AABBMax =
+                new Vector3((float) (max_x * 4), (float) (max_y * 4),
+                              (float) m_scene.Heightmap[tx, ty]);
+            LandData.Area = tempArea;
+        }
+
+        #endregion
+
+        #region Land Bitmap Functions
+
+        /// <summary>
+        /// Sets the land's bitmap manually
+        /// </summary>
+        /// <param name="bitmap">64x64 block representing where this land is on a map</param>
+        public void SetLandBitmap(bool[,] bitmap)
+        {
+            if (bitmap.GetLength(0) != 64 || bitmap.GetLength(1) != 64 || bitmap.Rank != 2)
+            {
+                //Throw an exception - The bitmap is not 64x64
+                //throw new Exception("Error: Invalid Parcel Bitmap");
+            }
+            else
+            {
+                //Valid: Lets set it
+                LandBitmap = bitmap;
+                ForceUpdateLandInfo();
+            }
+        }
+
+        /// <summary>
+        /// Gets the land's bitmap manually
+        /// </summary>
+        /// <returns></returns>
+        public bool[,] GetLandBitmap()
+        {
+            return LandBitmap;
+        }
+
+        /// <summary>
+        /// Full sim land object creation
+        /// </summary>
+        /// <returns></returns>
+        public bool[,] BasicFullRegionLandBitmap()
+        {
+            return GetSquareLandBitmap(0, 0, (int) Constants.RegionSize, (int) Constants.RegionSize);
+        }
+
+        /// <summary>
+        /// Used to modify the bitmap between the x and y points. Points use 64 scale
+        /// </summary>
+        /// <param name="start_x"></param>
+        /// <param name="start_y"></param>
+        /// <param name="end_x"></param>
+        /// <param name="end_y"></param>
+        /// <returns></returns>
+        public bool[,] GetSquareLandBitmap(int start_x, int start_y, int end_x, int end_y)
+        {
+            bool[,] tempBitmap = new bool[64,64];
+            tempBitmap.Initialize();
+
+            tempBitmap = ModifyLandBitmapSquare(tempBitmap, start_x, start_y, end_x, end_y, true);
+            return tempBitmap;
+        }
+
+        /// <summary>
+        /// Change a land bitmap at within a square and set those points to a specific value
+        /// </summary>
+        /// <param name="land_bitmap"></param>
+        /// <param name="start_x"></param>
+        /// <param name="start_y"></param>
+        /// <param name="end_x"></param>
+        /// <param name="end_y"></param>
+        /// <param name="set_value"></param>
+        /// <returns></returns>
+        public bool[,] ModifyLandBitmapSquare(bool[,] land_bitmap, int start_x, int start_y, int end_x, int end_y,
+                                              bool set_value)
+        {
+            if (land_bitmap.GetLength(0) != 64 || land_bitmap.GetLength(1) != 64 || land_bitmap.Rank != 2)
+            {
+                //Throw an exception - The bitmap is not 64x64
+                //throw new Exception("Error: Invalid Parcel Bitmap in modifyLandBitmapSquare()");
+            }
+
+            int x, y;
+            for (y = 0; y < 64; y++)
+            {
+                for (x = 0; x < 64; x++)
+                {
+                    if (x >= start_x / 4 && x < end_x / 4
+                        && y >= start_y / 4 && y < end_y / 4)
+                    {
+                        land_bitmap[x, y] = set_value;
+                    }
+                }
+            }
+            return land_bitmap;
+        }
+
+        /// <summary>
+        /// Join the true values of 2 bitmaps together
+        /// </summary>
+        /// <param name="bitmap_base"></param>
+        /// <param name="bitmap_add"></param>
+        /// <returns></returns>
+        public bool[,] MergeLandBitmaps(bool[,] bitmap_base, bool[,] bitmap_add)
+        {
+            if (bitmap_base.GetLength(0) != 64 || bitmap_base.GetLength(1) != 64 || bitmap_base.Rank != 2)
+            {
+                //Throw an exception - The bitmap is not 64x64
+                throw new Exception("Error: Invalid Parcel Bitmap - Bitmap_base in mergeLandBitmaps");
+            }
+            if (bitmap_add.GetLength(0) != 64 || bitmap_add.GetLength(1) != 64 || bitmap_add.Rank != 2)
+            {
+                //Throw an exception - The bitmap is not 64x64
+                throw new Exception("Error: Invalid Parcel Bitmap - Bitmap_add in mergeLandBitmaps");
+            }
+
+            int x, y;
+            for (y = 0; y < 64; y++)
+            {
+                for (x = 0; x < 64; x++)
+                {
+                    if (bitmap_add[x, y])
+                    {
+                        bitmap_base[x, y] = true;
+                    }
+                }
+            }
+            return bitmap_base;
+        }
+
+        /// <summary>
+        /// Converts the land bitmap to a packet friendly byte array
+        /// </summary>
+        /// <returns></returns>
+        private byte[] ConvertLandBitmapToBytes()
+        {
+            byte[] tempConvertArr = new byte[512];
+            byte tempByte = 0;
+            int x, y, i, byteNum = 0;
+            i = 0;
+            for (y = 0; y < 64; y++)
+            {
+                for (x = 0; x < 64; x++)
+                {
+                    tempByte = Convert.ToByte(tempByte | Convert.ToByte(LandBitmap[x, y]) << (i++ % 8));
+                    if (i % 8 == 0)
+                    {
+                        tempConvertArr[byteNum] = tempByte;
+                        tempByte = (byte) 0;
+                        i = 0;
+                        byteNum++;
+                    }
+                }
+            }
+            return tempConvertArr;
+        }
+
+        private bool[,] ConvertBytesToLandBitmap()
+        {
+            bool[,] tempConvertMap = new bool[landArrayMax, landArrayMax];
+            tempConvertMap.Initialize();
+            byte tempByte = 0;
+            int x = 0, y = 0, i = 0, bitNum = 0;
+            for (i = 0; i < 512; i++)
+            {
+                tempByte = LandData.Bitmap[i];
+                for (bitNum = 0; bitNum < 8; bitNum++)
+                {
+                    bool bit = Convert.ToBoolean(Convert.ToByte(tempByte >> bitNum) & (byte) 1);
+                    tempConvertMap[x, y] = bit;
+                    x++;
+                    if (x > 63)
+                    {
+                        x = 0;
+                        y++;
+                    }
+                }
+            }
+            return tempConvertMap;
+        }
+
+        #endregion
+
+        #region Object Select and Object Owner Listing
+
+        public void SendForceObjectSelect(int local_id, int request_type, List<UUID> returnIDs, IClientAPI remote_client)
+        {
+            if (m_scene.Permissions.CanEditParcel(remote_client.AgentId, this))
+            {
+                List<uint> resultLocalIDs = new List<uint>();
+                try
+                {
+                    lock (primsOverMe)
+                    {
+                        foreach (SceneObjectGroup obj in primsOverMe)
+                        {
+                            if (obj.LocalId > 0)
+                            {
+                                if (request_type == LandChannel.LAND_SELECT_OBJECTS_OWNER && obj.OwnerID == LandData.OwnerID)
+                                {
+                                    resultLocalIDs.Add(obj.LocalId);
+                                }
+                                else if (request_type == LandChannel.LAND_SELECT_OBJECTS_GROUP && obj.GroupID == LandData.GroupID && LandData.GroupID != UUID.Zero)
+                                {
+                                    resultLocalIDs.Add(obj.LocalId);
+                                }
+                                else if (request_type == LandChannel.LAND_SELECT_OBJECTS_OTHER &&
+                                         obj.OwnerID != remote_client.AgentId)
+                                {
+                                    resultLocalIDs.Add(obj.LocalId);
+                                }
+                                else if (request_type == (int)ObjectReturnType.List && returnIDs.Contains(obj.OwnerID))
+                                {
+                                    resultLocalIDs.Add(obj.LocalId);
+                                }
+                            }
+                        }
+                    }
+                } catch (InvalidOperationException)
+                {
+                    m_log.Error("[LAND]: Unable to force select the parcel objects. Arr.");
+                }
+
+                remote_client.SendForceClientSelectObjects(resultLocalIDs);
+            }
+        }
+
+        /// <summary>
+        /// Notify the parcel owner each avatar that owns prims situated on their land.  This notification includes
+        /// aggreagete details such as the number of prims.
+        ///
+        /// </summary>
+        /// <param name="remote_client">
+        /// A <see cref="IClientAPI"/>
+        /// </param>
+        public void SendLandObjectOwners(IClientAPI remote_client)
+        {
+            if (m_scene.Permissions.CanEditParcel(remote_client.AgentId, this))
+            {
+                Dictionary<UUID, int> primCount = new Dictionary<UUID, int>();
+                List<UUID> groups = new List<UUID>();
+
+                lock (primsOverMe)
+                {
+                    try
+                    {
+
+                        foreach (SceneObjectGroup obj in primsOverMe)
+                        {
+                            try
+                            {
+                                if (!primCount.ContainsKey(obj.OwnerID))
+                                {
+                                    primCount.Add(obj.OwnerID, 0);
+                                }
+                            }
+                            catch (NullReferenceException)
+                            {
+                                m_log.Info("[LAND]: " + "Got Null Reference when searching land owners from the parcel panel");
+                            }
+                            try
+                            {
+                                primCount[obj.OwnerID] += obj.PrimCount;
+                            }
+                            catch (KeyNotFoundException)
+                            {
+                                m_log.Error("[LAND]: Unable to match a prim with it's owner.");
+                            }
+                            if (obj.OwnerID == obj.GroupID && (!groups.Contains(obj.OwnerID)))
+                                groups.Add(obj.OwnerID);
+                        }
+                    }
+                    catch (InvalidOperationException)
+                    {
+                        m_log.Error("[LAND]: Unable to Enumerate Land object arr.");
+                    }
+                }
+
+                remote_client.SendLandObjectOwners(LandData, groups, primCount);
+            }
+        }
+
+        public Dictionary<UUID, int> GetLandObjectOwners()
+        {
+            Dictionary<UUID, int> ownersAndCount = new Dictionary<UUID, int>();
+            lock (primsOverMe)
+            {
+                try
+                {
+
+                    foreach (SceneObjectGroup obj in primsOverMe)
+                    {
+                        if (!ownersAndCount.ContainsKey(obj.OwnerID))
+                        {
+                            ownersAndCount.Add(obj.OwnerID, 0);
+                        }
+                        ownersAndCount[obj.OwnerID] += obj.PrimCount;
+                    }
+                }
+                catch (InvalidOperationException)
+                {
+                    m_log.Error("[LAND]: Unable to enumerate land owners. arr.");
+                }
+
+            }
+            return ownersAndCount;
+        }
+
+        #endregion
+
+        #region Object Returning
+
+        public void ReturnObject(SceneObjectGroup obj)
+        {
+            SceneObjectGroup[] objs = new SceneObjectGroup[1];
+            objs[0] = obj;
+            m_scene.returnObjects(objs, obj.OwnerID);
+        }
+
+        public void ReturnLandObjects(uint type, UUID[] owners, UUID[] tasks, IClientAPI remote_client)
+        {
+            Dictionary<UUID,List<SceneObjectGroup>> returns =
+                    new Dictionary<UUID,List<SceneObjectGroup>>();
+
+            lock (primsOverMe)
+            {
+                if (type == (uint)ObjectReturnType.Owner)
+                {
+                    foreach (SceneObjectGroup obj in primsOverMe)
+                    {
+                        if (obj.OwnerID == m_landData.OwnerID)
+                        {
+                            if (!returns.ContainsKey(obj.OwnerID))
+                                returns[obj.OwnerID] =
+                                        new List<SceneObjectGroup>();
+                            returns[obj.OwnerID].Add(obj);
+                        }
+                    }
+                }
+                else if (type == (uint)ObjectReturnType.Group && m_landData.GroupID != UUID.Zero)
+                {
+                    foreach (SceneObjectGroup obj in primsOverMe)
+                    {
+                        if (obj.GroupID == m_landData.GroupID)
+                        {
+                            if (!returns.ContainsKey(obj.OwnerID))
+                                returns[obj.OwnerID] =
+                                        new List<SceneObjectGroup>();
+                            returns[obj.OwnerID].Add(obj);
+                        }
+                    }
+                }
+                else if (type == (uint)ObjectReturnType.Other)
+                {
+                    foreach (SceneObjectGroup obj in primsOverMe)
+                    {
+                        if (obj.OwnerID != m_landData.OwnerID &&
+                            (obj.GroupID != m_landData.GroupID ||
+                            m_landData.GroupID == UUID.Zero))
+                        {
+                            if (!returns.ContainsKey(obj.OwnerID))
+                                returns[obj.OwnerID] =
+                                        new List<SceneObjectGroup>();
+                            returns[obj.OwnerID].Add(obj);
+                        }
+                    }
+                }
+                else if (type == (uint)ObjectReturnType.List)
+                {
+                    List<UUID> ownerlist = new List<UUID>(owners);
+
+                    foreach (SceneObjectGroup obj in primsOverMe)
+                    {
+                        if (ownerlist.Contains(obj.OwnerID))
+                        {
+                            if (!returns.ContainsKey(obj.OwnerID))
+                                returns[obj.OwnerID] =
+                                        new List<SceneObjectGroup>();
+                            returns[obj.OwnerID].Add(obj);
+                        }
+                    }
+                }
+            }
+
+            foreach (List<SceneObjectGroup> ol in returns.Values)
+            {
+                if (m_scene.Permissions.CanReturnObjects(this, remote_client.AgentId, ol))
+                    m_scene.returnObjects(ol.ToArray(), remote_client.AgentId);
+            }
+        }
+
+        #endregion
+
+        #region Object Adding/Removing from Parcel
+
+        public void ResetLandPrimCounts()
+        {
+            LandData.GroupPrims = 0;
+            LandData.OwnerPrims = 0;
+            LandData.OtherPrims = 0;
+            LandData.SelectedPrims = 0;
+
+
+            lock (primsOverMe)
+                primsOverMe.Clear();
+        }
+
+        public void AddPrimToCount(SceneObjectGroup obj)
+        {
+
+            UUID prim_owner = obj.OwnerID;
+            int prim_count = obj.PrimCount;
+
+            if (obj.IsSelected)
+            {
+                LandData.SelectedPrims += prim_count;
+            }
+            else
+            {
+                if (prim_owner == LandData.OwnerID)
+                {
+                    LandData.OwnerPrims += prim_count;
+                }
+                else if ((obj.GroupID == LandData.GroupID ||
+                          prim_owner  == LandData.GroupID) &&
+                          LandData.GroupID != UUID.Zero)
+                {
+                    LandData.GroupPrims += prim_count;
+                }
+                else
+                {
+                    LandData.OtherPrims += prim_count;
+                }
+            }
+
+            lock (primsOverMe)
+                primsOverMe.Add(obj);
+        }
+
+        public void RemovePrimFromCount(SceneObjectGroup obj)
+        {
+            lock (primsOverMe)
+            {
+                if (primsOverMe.Contains(obj))
+                {
+                    UUID prim_owner = obj.OwnerID;
+                    int prim_count = obj.PrimCount;
+
+                    if (prim_owner == LandData.OwnerID)
+                    {
+                        LandData.OwnerPrims -= prim_count;
+                    }
+                    else if (obj.GroupID == LandData.GroupID ||
+                             prim_owner  == LandData.GroupID)
+                    {
+                        LandData.GroupPrims -= prim_count;
+                    }
+                    else
+                    {
+                        LandData.OtherPrims -= prim_count;
+                    }
+
+                    primsOverMe.Remove(obj);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+        
+        /// <summary>
+        /// Set the media url for this land parcel
+        /// </summary>
+        /// <param name="url"></param>
+        public void SetMediaUrl(string url)
+        {
+            LandData.MediaURL = url;
+            SendLandUpdateToAvatarsOverMe();
+        }
+        
+        /// <summary>
+        /// Set the music url for this land parcel
+        /// </summary>
+        /// <param name="url"></param>
+        public void SetMusicUrl(string url)
+        {
+            LandData.MusicURL = url;
+            SendLandUpdateToAvatarsOverMe();
+        }
+    }
+}
diff --git a/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs b/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs
index 62abd4c..8ce6daf 100644
--- a/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs
+++ b/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs
@@ -128,7 +128,10 @@ namespace OpenSim.Region.CoreModules.World.Objects.BuySell
                 group.SetOwnerId(remoteClient.AgentId);
                 group.SetRootPartOwner(part, remoteClient.AgentId, remoteClient.ActiveGroupId);
 
-                List<SceneObjectPart> partList = new List<SceneObjectPart>(group.Children.Values);
+                List<SceneObjectPart> partList = null;
+                
+                lock (group.Children)
+                    partList = new List<SceneObjectPart>(group.Children.Values);
 
                 if (m_scene.Permissions.PropagatePermissions())
                 {
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/MapImageModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/MapImageModule.cs
index b96d95a..57eff8a 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/MapImageModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/MapImageModule.cs
@@ -227,8 +227,13 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                     {
                         SceneObjectGroup mapdot = (SceneObjectGroup)obj;
                         Color mapdotspot = Color.Gray; // Default color when prim color is white
-                        // Loop over prim in group
-                        foreach (SceneObjectPart part in mapdot.Children.Values)
+                        
+                        // Loop over prim in group                            
+                        List<SceneObjectPart> partList = null;
+                        lock (mapdot.Children)
+                            partList = new List<SceneObjectPart>(mapdot.Children.Values);
+                            
+                        foreach (SceneObjectPart part in partList)
                         {
                             if (part == null)
                                 continue;