Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor

77 files changed, 3202 insertions, 2665 deletions

diff --git a/OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs b/OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs
index 7d017a6..7ff8737 100644
--- a/OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs
@@ -89,7 +89,6 @@ namespace OpenSim.Data.MSSQL
             Dictionary<UUID, SceneObjectGroup> objects = new Dictionary<UUID, SceneObjectGroup>();
             SceneObjectGroup grp = null;
 
-
             string sql = "SELECT *, " +
                            "sort = CASE WHEN prims.UUID = prims.SceneGroupID THEN 0 ELSE 1 END " +
                            "FROM prims " +
@@ -232,7 +231,7 @@ namespace OpenSim.Data.MSSQL
         /// <param name="regionUUID"></param>
         public void StoreObject(SceneObjectGroup obj, UUID regionUUID)
         {
-            _Log.InfoFormat("[MSSQL]: Adding/Changing SceneObjectGroup: {0} to region: {1}, object has {2} prims.", obj.UUID, regionUUID, obj.Children.Count);
+            _Log.DebugFormat("[MSSQL]: Adding/Changing SceneObjectGroup: {0} to region: {1}, object has {2} prims.", obj.UUID, regionUUID, obj.Children.Count);
 
             using (SqlConnection conn = new SqlConnection(m_connectionString))
             {
@@ -291,7 +290,6 @@ namespace OpenSim.Data.MSSQL
                     }
                 }
             }
-
         }
 
         /// <summary>
diff --git a/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs b/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs
index 1edcb5d..04446ce 100644
--- a/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs
+++ b/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs
@@ -239,6 +239,7 @@ namespace OpenSim.Data.MySQL
 
                         ExecuteNonQuery(cmd);
                     }
+                    
                     cmd.Dispose();
                 }
             }
@@ -676,7 +677,8 @@ namespace OpenSim.Data.MySQL
                             "MusicURL, PassHours, PassPrice, SnapshotUUID, " +
                             "UserLocationX, UserLocationY, UserLocationZ, " +
                             "UserLookAtX, UserLookAtY, UserLookAtZ, " +
-                            "AuthbuyerID, OtherCleanTime, Dwell) values (" +
+                            "AuthbuyerID, OtherCleanTime, Dwell, MediaType, MediaDescription, " +
+                                                        "MediaSize, MediaLoop, ObscureMusic, ObscureMedia) values (" +
                             "?UUID, ?RegionUUID, " +
                             "?LocalLandID, ?Bitmap, ?Name, ?Description, " +
                             "?OwnerUUID, ?IsGroupOwned, ?Area, ?AuctionID, " +
@@ -686,7 +688,8 @@ namespace OpenSim.Data.MySQL
                             "?MusicURL, ?PassHours, ?PassPrice, ?SnapshotUUID, " +
                             "?UserLocationX, ?UserLocationY, ?UserLocationZ, " +
                             "?UserLookAtX, ?UserLookAtY, ?UserLookAtZ, " +
-                            "?AuthbuyerID, ?OtherCleanTime, ?Dwell)";
+                            "?AuthbuyerID, ?OtherCleanTime, ?Dwell, ?MediaType, ?MediaDescription, "+
+                                                        "CONCAT(?MediaWidth, ',', ?MediaHeight), ?MediaLoop, ?ObscureMusic, ?ObscureMedia)";
 
                         FillLandCommand(cmd, parcel.LandData, parcel.RegionUUID);
 
@@ -1346,6 +1349,14 @@ namespace OpenSim.Data.MySQL
                 m_log.ErrorFormat("[PARCEL]: unable to get parcel telehub settings for {1}", newData.Name);
             }
 
+                        newData.MediaDescription = (string) row["MediaDescription"];
+                        newData.MediaType = (string) row["MediaType"];
+                        newData.MediaWidth = Convert.ToInt32((((string) row["MediaSize"]).Split(','))[0]);
+                        newData.MediaHeight = Convert.ToInt32((((string) row["MediaSize"]).Split(','))[1]);
+                        newData.MediaLoop = Convert.ToBoolean(row["MediaLoop"]);
+                        newData.ObscureMusic = Convert.ToBoolean(row["ObscureMusic"]);
+                        newData.ObscureMedia = Convert.ToBoolean(row["ObscureMedia"]);
+
             newData.ParcelAccessList = new List<ParcelManager.ParcelAccessEntry>();
 
             return newData;
@@ -1650,6 +1661,14 @@ namespace OpenSim.Data.MySQL
             cmd.Parameters.AddWithValue("AuthBuyerID", land.AuthBuyerID);
             cmd.Parameters.AddWithValue("OtherCleanTime", land.OtherCleanTime);
             cmd.Parameters.AddWithValue("Dwell", land.Dwell);
+            cmd.Parameters.AddWithValue("MediaDescription", land.MediaDescription);
+            cmd.Parameters.AddWithValue("MediaType", land.MediaType);
+            cmd.Parameters.AddWithValue("MediaWidth", land.MediaWidth);
+            cmd.Parameters.AddWithValue("MediaHeight", land.MediaHeight);
+            cmd.Parameters.AddWithValue("MediaLoop", land.MediaLoop);
+            cmd.Parameters.AddWithValue("ObscureMusic", land.ObscureMusic);
+            cmd.Parameters.AddWithValue("ObscureMedia", land.ObscureMedia);
+
         }
 
         /// <summary>
diff --git a/OpenSim/Data/MySQL/Resources/RegionStore.migrations b/OpenSim/Data/MySQL/Resources/RegionStore.migrations
index ce99ce4..5c32209 100644
--- a/OpenSim/Data/MySQL/Resources/RegionStore.migrations
+++ b/OpenSim/Data/MySQL/Resources/RegionStore.migrations
@@ -801,9 +801,19 @@ ALTER TABLE `regionwindlight`  CHANGE COLUMN `cloud_scroll_x` `cloud_scroll_x` F
 COMMIT;
 
 :VERSION 35         #---------------------
--- Added post 0.7
 
 BEGIN;
 ALTER TABLE prims ADD COLUMN MediaURL varchar(255);
 ALTER TABLE primshapes ADD COLUMN Media TEXT;
-COMMIT;
\ No newline at end of file
+COMMIT;
+
+:VERSION 36         #---------------------
+
+BEGIN;
+ALTER TABLE `land` ADD COLUMN `MediaType` VARCHAR(32) NOT NULL DEFAULT 'none/none' ;
+ALTER TABLE `land` ADD COLUMN `MediaDescription` VARCHAR(255) NOT NULL DEFAULT '';
+ALTER TABLE `land` ADD COLUMN `MediaSize` VARCHAR(16) NOT NULL DEFAULT '0,0';
+ALTER TABLE `land` ADD COLUMN `MediaLoop` BOOLEAN NOT NULL DEFAULT FALSE;
+ALTER TABLE `land` ADD COLUMN `ObscureMusic` BOOLEAN NOT NULL DEFAULT FALSE;
+ALTER TABLE `land` ADD COLUMN `ObscureMedia` BOOLEAN NOT NULL DEFAULT FALSE;
+COMMIT;
diff --git a/OpenSim/Data/SQLite/Resources/RegionStore.migrations b/OpenSim/Data/SQLite/Resources/RegionStore.migrations
index c461bf0..0c421ec 100644
--- a/OpenSim/Data/SQLite/Resources/RegionStore.migrations
+++ b/OpenSim/Data/SQLite/Resources/RegionStore.migrations
@@ -446,3 +446,13 @@ update land
   where AuthbuyerID not like '%-%';
   
 COMMIT;
+
+:VERSION 19
+BEGIN ;
+ALTER TABLE `land` ADD COLUMN `MediaType` VARCHAR(32) NOT NULL DEFAULT 'none/none' ;
+ALTER TABLE `land` ADD COLUMN `MediaDescription` VARCHAR(255) NOT NULL DEFAULT '';
+ALTER TABLE `land` ADD COLUMN `MediaSize` VARCHAR(16) NOT NULL DEFAULT '0,0';
+ALTER TABLE `land` ADD COLUMN `MediaLoop` BOOLEAN NOT NULL DEFAULT FALSE;
+ALTER TABLE `land` ADD COLUMN `ObscureMusic` BOOLEAN NOT NULL DEFAULT FALSE;
+ALTER TABLE `land` ADD COLUMN `ObscureMedia` BOOLEAN NOT NULL DEFAULT FALSE;
+COMMIT ;
\ No newline at end of file
diff --git a/OpenSim/Data/SQLite/SQLiteRegionData.cs b/OpenSim/Data/SQLite/SQLiteRegionData.cs
index 4208050..8432e74 100644
--- a/OpenSim/Data/SQLite/SQLiteRegionData.cs
+++ b/OpenSim/Data/SQLite/SQLiteRegionData.cs
@@ -1762,6 +1762,12 @@ namespace OpenSim.Data.SQLite
             row["AuthbuyerID"] = land.AuthBuyerID.ToString();
             row["OtherCleanTime"] = land.OtherCleanTime;
             row["Dwell"] = land.Dwell;
+                        row["MediaType"] = land.MediaType;
+                        row["MediaDescription"] = land.MediaDescription;
+                        row["MediaSize"] = land.MediaWidth.ToString() + "," + land.MediaHeight.ToString();
+                        row["MediaLoop"] = land.MediaLoop.ToString();
+                        row["ObscureMusic"] = land.ObscureMusic.ToString();
+                        row["ObscureMedia"] = land.ObscureMedia.ToString();
         }
 
         /// <summary>
diff --git a/OpenSim/Data/Tests/EstateTests.cs b/OpenSim/Data/Tests/EstateTests.cs
index d6eed3d..fbf8ba6 100644
--- a/OpenSim/Data/Tests/EstateTests.cs
+++ b/OpenSim/Data/Tests/EstateTests.cs
@@ -37,11 +37,6 @@ using log4net;
 using System.Reflection;
 using System.Data.Common;
 
-#if !NUNIT25
-using NUnit.Framework.SyntaxHelpers;
-#endif
-
-
 // DBMS-specific:
 using MySql.Data.MySqlClient;
 using OpenSim.Data.MySQL;
@@ -52,7 +47,6 @@ using OpenSim.Data.MSSQL;
 using Mono.Data.Sqlite;
 using OpenSim.Data.SQLite;
 
-
 namespace OpenSim.Data.Tests
 {
 
diff --git a/OpenSim/Data/Tests/InventoryTests.cs b/OpenSim/Data/Tests/InventoryTests.cs
index c22e26c..3205bfa 100644
--- a/OpenSim/Data/Tests/InventoryTests.cs
+++ b/OpenSim/Data/Tests/InventoryTests.cs
@@ -37,10 +37,6 @@ using log4net;
 using System.Reflection;
 using System.Data.Common;
 
-#if !NUNIT25
-using NUnit.Framework.SyntaxHelpers;
-#endif
-
 // DBMS-specific:
 using MySql.Data.MySqlClient;
 using OpenSim.Data.MySQL;
diff --git a/OpenSim/Data/Tests/RegionTests.cs b/OpenSim/Data/Tests/RegionTests.cs
index 3cd9e0b..29bf5a3 100644
--- a/OpenSim/Data/Tests/RegionTests.cs
+++ b/OpenSim/Data/Tests/RegionTests.cs
@@ -40,10 +40,6 @@ using log4net;
 using System.Reflection;
 using System.Data.Common;
 
-#if !NUNIT25
-using NUnit.Framework.SyntaxHelpers;
-#endif
-
 // DBMS-specific:
 using MySql.Data.MySqlClient;
 using OpenSim.Data.MySQL;
diff --git a/OpenSim/Framework/LandData.cs b/OpenSim/Framework/LandData.cs
index ef07438..4440c94 100644
--- a/OpenSim/Framework/LandData.cs
+++ b/OpenSim/Framework/LandData.cs
@@ -90,6 +90,78 @@ namespace OpenSim.Framework
         private Vector3 _userLookAt = new Vector3();
         private int _dwell = 0;
         private int _otherCleanTime = 0;
+                private string _mediaType = "none/none";
+                private string _mediaDescription = "";
+                private int _mediaHeight = 0;
+                private int _mediaWidth = 0;
+                private bool _mediaLoop = false;
+                private bool _obscureMusic = false;
+                private bool _obscureMedia = false;
+
+        /// <summary>
+        /// Whether to obscure parcel media URL
+        /// </summary>
+        [XmlIgnore]
+        public bool ObscureMedia {
+            get {
+                return _obscureMedia;
+            }
+            set {
+                _obscureMedia = value;
+            }
+        }
+
+        /// <summary>
+        /// Whether to obscure parcel music URL
+        /// </summary>
+        [XmlIgnore]
+        public bool ObscureMusic {
+            get {
+                return _obscureMusic;
+            }
+            set {
+                _obscureMusic = value;
+            }
+        }
+
+        /// <summary>
+        /// Whether to loop parcel media
+        /// </summary>
+        [XmlIgnore]
+        public bool MediaLoop {
+            get {
+                return _mediaLoop;
+            }
+            set {
+                _mediaLoop = value;
+            }
+        }
+
+        /// <summary>
+        /// Height of parcel media render
+        /// </summary>
+        [XmlIgnore]
+        public int MediaHeight {
+            get {
+                return _mediaHeight;
+            }
+            set {
+                _mediaHeight = value;
+            }
+        }
+
+        /// <summary>
+        /// Width of parcel media render
+        /// </summary>
+        [XmlIgnore]
+        public int MediaWidth {
+            get {
+                return _mediaWidth;
+            }
+            set {
+                _mediaWidth = value;
+            }
+        }
 
         /// <summary>
         /// Upper corner of the AABB for the parcel
@@ -358,20 +430,6 @@ namespace OpenSim.Framework
             }
         }
 
-        private int[] _mediaSize = new int[2];
-        public int[] MediaSize
-        {
-            get
-            {
-                return _mediaSize;
-            }
-            set
-            {
-                _mediaSize = value;
-            }
-        }
-
-        private string _mediaType = "";
         public string MediaType
         {
             get
@@ -586,6 +644,17 @@ namespace OpenSim.Framework
             }
         }
 
+        /// <summary>
+        /// parcel media description
+        /// </summary>
+        public string MediaDescription {
+            get {
+                return _mediaDescription;
+            }
+            set {
+                _mediaDescription = value;
+            }
+        }
 
         public LandData()
         {
@@ -635,6 +704,13 @@ namespace OpenSim.Framework
             landData._userLookAt = _userLookAt;
             landData._otherCleanTime = _otherCleanTime;
             landData._dwell = _dwell;
+                        landData._mediaType = _mediaType;
+                        landData._mediaDescription = _mediaDescription;
+                        landData._mediaWidth = _mediaWidth;
+                        landData._mediaHeight = _mediaHeight;
+                        landData._mediaLoop = _mediaLoop;
+                        landData._obscureMusic = _obscureMusic;
+                        landData._obscureMedia = _obscureMedia;
 
             landData._parcelAccessList.Clear();
             foreach (ParcelManager.ParcelAccessEntry entry in _parcelAccessList)
diff --git a/OpenSim/Framework/LandUpdateArgs.cs b/OpenSim/Framework/LandUpdateArgs.cs
index 9760a1d..ed496a1 100644
--- a/OpenSim/Framework/LandUpdateArgs.cs
+++ b/OpenSim/Framework/LandUpdateArgs.cs
@@ -49,5 +49,12 @@ namespace OpenSim.Framework
         public UUID SnapshotID;
         public Vector3 UserLocation;
         public Vector3 UserLookAt;
+                public string MediaType;
+                public string MediaDescription;
+                public int MediaHeight;
+                public int MediaWidth;
+                public bool MediaLoop;
+                public bool ObscureMusic;
+                public bool ObscureMedia;
     }
 }
diff --git a/OpenSim/Framework/RegionInfoForEstateMenuArgs.cs b/OpenSim/Framework/RegionInfoForEstateMenuArgs.cs
index fee3126..f274da2 100644
--- a/OpenSim/Framework/RegionInfoForEstateMenuArgs.cs
+++ b/OpenSim/Framework/RegionInfoForEstateMenuArgs.cs
@@ -47,5 +47,6 @@ namespace OpenSim.Framework
         public bool useEstateSun;
         public float waterHeight;
         public string simName;
+        public string regionType;
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Framework/RegionSettings.cs b/OpenSim/Framework/RegionSettings.cs
index 8d1212b..673cf20 100644
--- a/OpenSim/Framework/RegionSettings.cs
+++ b/OpenSim/Framework/RegionSettings.cs
@@ -33,8 +33,6 @@ namespace OpenSim.Framework
 {
     public class RegionSettings
     {
-        private ConfigurationMember configMember;
-
         public delegate void SaveDelegate(RegionSettings rs);
 
         public event SaveDelegate OnSave;
@@ -47,202 +45,6 @@ namespace OpenSim.Framework
         public static readonly UUID DEFAULT_TERRAIN_TEXTURE_3 = new UUID("179cdabd-398a-9b6b-1391-4dc333ba321f");
         public static readonly UUID DEFAULT_TERRAIN_TEXTURE_4 = new UUID("beb169c7-11ea-fff2-efe5-0f24dc881df2");
 
-        public RegionSettings()
-        {
-            if (configMember == null)
-            {
-                try
-                {
-                    configMember = new ConfigurationMember(Path.Combine(Util.configDir(), "estate_settings.xml"), "ESTATE SETTINGS", LoadConfigurationOptions, HandleIncomingConfiguration, true);
-                    configMember.performConfigurationRetrieve();
-                }
-                catch (Exception)
-                {
-                }
-            }
-        }
-
-        public void LoadConfigurationOptions()
-        {
-             configMember.addConfigurationOption("region_flags",
-                     ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
-                     String.Empty, "336723974", true);
-
-             configMember.addConfigurationOption("max_agents",
-                     ConfigurationOption.ConfigurationTypes.TYPE_INT32,
-                     String.Empty, "40", true);
-
-             configMember.addConfigurationOption("object_bonus_factor",
-                     ConfigurationOption.ConfigurationTypes.TYPE_DOUBLE,
-                     String.Empty, "1.0", true);
-
-             configMember.addConfigurationOption("sim_access",
-                     ConfigurationOption.ConfigurationTypes.TYPE_INT32,
-                     String.Empty, "21", true);
-
-             configMember.addConfigurationOption("terrain_base_0",
-                     ConfigurationOption.ConfigurationTypes.TYPE_UUID,
-                     String.Empty, DEFAULT_TERRAIN_TEXTURE_1.ToString(), true);
-
-             configMember.addConfigurationOption("terrain_base_1",
-                     ConfigurationOption.ConfigurationTypes.TYPE_UUID,
-                     String.Empty, DEFAULT_TERRAIN_TEXTURE_2.ToString(), true);
-
-             configMember.addConfigurationOption("terrain_base_2",
-                     ConfigurationOption.ConfigurationTypes.TYPE_UUID,
-                     String.Empty, DEFAULT_TERRAIN_TEXTURE_3.ToString(), true);
-
-             configMember.addConfigurationOption("terrain_base_3",
-                     ConfigurationOption.ConfigurationTypes.TYPE_UUID,
-                     String.Empty, DEFAULT_TERRAIN_TEXTURE_4.ToString(), true);
-
-             configMember.addConfigurationOption("terrain_start_height_0",
-                     ConfigurationOption.ConfigurationTypes.TYPE_DOUBLE,
-                     String.Empty, "10.0", true);
-
-             configMember.addConfigurationOption("terrain_start_height_1",
-                     ConfigurationOption.ConfigurationTypes.TYPE_DOUBLE,
-                     String.Empty, "10.0", true);
-
-             configMember.addConfigurationOption("terrain_start_height_2",
-                     ConfigurationOption.ConfigurationTypes.TYPE_DOUBLE,
-                     String.Empty, "10.0", true);
-
-             configMember.addConfigurationOption("terrain_start_height_3",
-                     ConfigurationOption.ConfigurationTypes.TYPE_DOUBLE,
-                     String.Empty, "10.0", true);
-
-             configMember.addConfigurationOption("terrain_height_range_0",
-                     ConfigurationOption.ConfigurationTypes.TYPE_DOUBLE,
-                     String.Empty, "60.0", true);
-
-             configMember.addConfigurationOption("terrain_height_range_1",
-                     ConfigurationOption.ConfigurationTypes.TYPE_DOUBLE,
-                     String.Empty, "60.0", true);
-
-             configMember.addConfigurationOption("terrain_height_range_2",
-                     ConfigurationOption.ConfigurationTypes.TYPE_DOUBLE,
-                     String.Empty, "60.0", true);
-
-             configMember.addConfigurationOption("terrain_height_range_3",
-                     ConfigurationOption.ConfigurationTypes.TYPE_DOUBLE,
-                     String.Empty, "60.0", true);
-
-             configMember.addConfigurationOption("region_water_height",
-                     ConfigurationOption.ConfigurationTypes.TYPE_DOUBLE,
-                     String.Empty, "20.0", true);
-
-             configMember.addConfigurationOption("terrain_raise_limit",
-                     ConfigurationOption.ConfigurationTypes.TYPE_DOUBLE,
-                     String.Empty, "100.0", true);
-
-             configMember.addConfigurationOption("terrain_lower_limit",
-                     ConfigurationOption.ConfigurationTypes.TYPE_DOUBLE,
-                     String.Empty, "-100.0", true);
-
-             configMember.addConfigurationOption("sun_hour",
-                     ConfigurationOption.ConfigurationTypes.TYPE_DOUBLE,
-                     String.Empty, "0.0", true);
-        }
-
-        public bool HandleIncomingConfiguration(string key, object value)
-        {
-            switch (key)
-            {
-            case "region_flags":
-                RegionFlags flags = (RegionFlags)(uint)value;
-
-                m_BlockTerraform =
-                        (flags & RegionFlags.BlockTerraform) != 0;
-                m_BlockFly =
-                        (flags & RegionFlags.NoFly) != 0;
-                m_AllowDamage =
-                        (flags & RegionFlags.AllowDamage) != 0;
-                m_RestrictPushing =
-                        (flags & RegionFlags.RestrictPushObject) != 0;
-                m_AllowLandResell =
-                        (flags & RegionFlags.BlockLandResell) == 0;
-                m_AllowLandJoinDivide =
-                        (flags & RegionFlags.AllowParcelChanges) != 0;
-                m_BlockShowInSearch =
-                        ((uint)flags & (1 << 29)) != 0;
-                m_DisableScripts =
-                        (flags & RegionFlags.SkipScripts) != 0;
-                m_DisableCollisions =
-                        (flags & RegionFlags.SkipCollisions) != 0;
-                m_DisablePhysics =
-                        (flags & RegionFlags.SkipPhysics) != 0;
-                m_FixedSun =
-                        (flags & RegionFlags.SunFixed) != 0;
-                m_Sandbox =
-                        (flags & RegionFlags.Sandbox) != 0;
-                break;
-            case "max_agents":
-                m_AgentLimit = (int)value;
-                break;
-            case "object_bonus_factor":
-                m_ObjectBonus = (double)value;
-                break;
-            case "sim_access":
-                int access = (int)value;
-                if (access <= 13)
-                    m_Maturity = 0;
-                else
-                    m_Maturity = 1;
-                break;
-            case "terrain_base_0":
-                m_TerrainTexture1 = (UUID)value;
-                break;
-            case "terrain_base_1":
-                m_TerrainTexture2 = (UUID)value;
-                break;
-            case "terrain_base_2":
-                m_TerrainTexture3 = (UUID)value;
-                break;
-            case "terrain_base_3":
-                m_TerrainTexture4 = (UUID)value;
-                break;
-            case "terrain_start_height_0":
-                m_Elevation1SW = (double)value;
-                break;
-            case "terrain_start_height_1":
-                m_Elevation1NW = (double)value;
-                break;
-            case "terrain_start_height_2":
-                m_Elevation1SE = (double)value;
-                break;
-            case "terrain_start_height_3":
-                m_Elevation1NE = (double)value;
-                break;
-            case "terrain_height_range_0":
-                m_Elevation2SW = (double)value;
-                break;
-            case "terrain_height_range_1":
-                m_Elevation2NW = (double)value;
-                break;
-            case "terrain_height_range_2":
-                m_Elevation2SE = (double)value;
-                break;
-            case "terrain_height_range_3":
-                m_Elevation2NE = (double)value;
-                break;
-            case "region_water_height":
-                m_WaterHeight = (double)value;
-                break;
-            case "terrain_raise_limit":
-                m_TerrainRaiseLimit = (double)value;
-                break;
-            case "terrain_lower_limit":
-                m_TerrainLowerLimit = (double)value;
-                break;
-            case "sun_hour":
-                m_SunPosition = (double)value;
-                break;
-            }
-
-            return true;
-        }
-
         public void Save()
         {
             if (OnSave != null)
diff --git a/OpenSim/Framework/Servers/HttpServer/SynchronousRestFormsRequester.cs b/OpenSim/Framework/Servers/HttpServer/SynchronousRestFormsRequester.cs
index 92a6caa..f955df7 100644
--- a/OpenSim/Framework/Servers/HttpServer/SynchronousRestFormsRequester.cs
+++ b/OpenSim/Framework/Servers/HttpServer/SynchronousRestFormsRequester.cs
@@ -81,12 +81,17 @@ namespace OpenSim.Framework.Servers.HttpServer
                 }
                 catch (Exception e)
                 {
-                    m_log.DebugFormat("[FORMS]: exception occured on sending request to {0}: {1}", requestUrl, e.Message);
+                    m_log.DebugFormat("[FORMS]: exception occured on sending request to {0}: " + e.ToString(), requestUrl);
                 }
                 finally
                 {
-                    if (requestStream != null)
-                        requestStream.Close();
+                    // If this is closed, it will be disposed internally,
+                    // but the above write is asynchronous and may hit after
+                    // we're through here. So the thread handling that will
+                    // throw and put us back into the catch above. Isn't 
+                    // .NET great?
+                    //if (requestStream != null)
+                    //    requestStream.Close();
                     // Let's not close this
                     //buffer.Close();
 
@@ -112,7 +117,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                         }
                         catch (Exception e)
                         {
-                            m_log.DebugFormat("[FORMS]: exception occured on receiving reply {0}", e.Message);
+                            m_log.DebugFormat("[FORMS]: exception occured on receiving reply " + e.ToString());
                         }
                         finally
                         {
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index fa72410..105501f 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -37,6 +37,7 @@ using System.Xml;
 using log4net;
 using OpenMetaverse;
 using OpenMetaverse.Packets;
+using OpenMetaverse.Messages.Linden;
 using OpenMetaverse.StructuredData;
 using OpenSim.Framework;
 using OpenSim.Framework.Client;
@@ -328,7 +329,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// thread servicing the m_primFullUpdates queue after a kill.  If this happens the object persists as an
         /// ownerless phantom.
         ///
-        /// All manipulation of this set has to occur under a m_primFullUpdate.SyncRoot lock
+        /// All manipulation of this set has to occur under an m_entityUpdates.SyncRoot lock
         ///       
         /// </value>
         protected HashSet<uint> m_killRecord;
@@ -394,18 +395,22 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         public string ActiveGroupName { get { return m_activeGroupName; } }
         public ulong ActiveGroupPowers { get { return m_activeGroupPowers; } }
         public bool IsGroupMember(UUID groupID) { return m_groupPowers.ContainsKey(groupID); }
+        
         /// <summary>
         /// First name of the agent/avatar represented by the client
         /// </summary>
         public string FirstName { get { return m_firstName; } }
+        
         /// <summary>
         /// Last name of the agent/avatar represented by the client
         /// </summary>
         public string LastName { get { return m_lastName; } }
+        
         /// <summary>
         /// Full name of the client (first name and last name)
         /// </summary>
         public string Name { get { return FirstName + " " + LastName; } }
+        
         public uint CircuitCode { get { return m_circuitCode; } }
         public int MoneyBalance { get { return m_moneyBalance; } }
         public int NextAnimationSequenceNumber { get { return m_animationSequenceNumber++; } }
@@ -742,7 +747,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             handshake.RegionInfo3.CPURatio = 1;
 
             handshake.RegionInfo3.ColoName = Utils.EmptyBytes;
-            handshake.RegionInfo3.ProductName = Utils.EmptyBytes;
+            handshake.RegionInfo3.ProductName = Util.StringToBytes256(regionInfo.RegionType);
             handshake.RegionInfo3.ProductSKU = Utils.EmptyBytes;
 
             OutPacket(handshake, ThrottleOutPacketType.Task);
@@ -2743,7 +2748,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             DirPlacesReplyPacket.StatusDataBlock[] status =
                     new DirPlacesReplyPacket.StatusDataBlock[0];
 
-            int i = 0;
+            packet.QueryReplies = replies;
+            packet.StatusData = status;
+
             foreach (DirPlacesReplyData d in data)
             {
                 int idx = replies.Length;
@@ -2779,11 +2786,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
                     replies = new DirPlacesReplyPacket.QueryRepliesBlock[0];
                     status = new DirPlacesReplyPacket.StatusDataBlock[0];
-
                 }
             }
 
-            if (replies.Length > 0)
+            if (replies.Length > 0 || data.Length == 0)
                 OutPacket(packet, ThrottleOutPacketType.Task);
         }
 
@@ -4143,7 +4149,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             rinfopack.RegionInfo2.HardMaxAgents = uint.MaxValue;
             rinfopack.RegionInfo2.HardMaxObjects = uint.MaxValue;
             rinfopack.RegionInfo2.MaxAgents32 = uint.MaxValue;
-            rinfopack.RegionInfo2.ProductName = Utils.EmptyBytes;
+            rinfopack.RegionInfo2.ProductName = Util.StringToBytes256(args.regionType);
             rinfopack.RegionInfo2.ProductSKU = Utils.EmptyBytes;
 
             rinfopack.HasVariableBlocks = true;
@@ -4215,94 +4221,101 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
         public void SendLandProperties(int sequence_id, bool snap_selection, int request_result, LandData landData, float simObjectBonusFactor, int parcelObjectCapacity, int simObjectCapacity, uint regionFlags)
         {
-            ParcelPropertiesPacket updatePacket = (ParcelPropertiesPacket)PacketPool.Instance.GetPacket(PacketType.ParcelProperties);
-            // TODO: don't create new blocks if recycling an old packet
+                        ParcelPropertiesMessage updateMessage = new ParcelPropertiesMessage();
 
-            updatePacket.ParcelData.AABBMax = landData.AABBMax;
-            updatePacket.ParcelData.AABBMin = landData.AABBMin;
-            updatePacket.ParcelData.Area = landData.Area;
-            updatePacket.ParcelData.AuctionID = landData.AuctionID;
-            updatePacket.ParcelData.AuthBuyerID = landData.AuthBuyerID;
+            updateMessage.AABBMax = landData.AABBMax;
+            updateMessage.AABBMin = landData.AABBMin;
+            updateMessage.Area = landData.Area;
+            updateMessage.AuctionID = landData.AuctionID;
+            updateMessage.AuthBuyerID = landData.AuthBuyerID;
 
-            updatePacket.ParcelData.Bitmap = landData.Bitmap;
+            updateMessage.Bitmap = landData.Bitmap;
 
-            updatePacket.ParcelData.Desc = Utils.StringToBytes(landData.Description);
-            updatePacket.ParcelData.Category = (byte)landData.Category;
-            updatePacket.ParcelData.ClaimDate = landData.ClaimDate;
-            updatePacket.ParcelData.ClaimPrice = landData.ClaimPrice;
-            updatePacket.ParcelData.GroupID = landData.GroupID;
-            updatePacket.ParcelData.GroupPrims = landData.GroupPrims;
-            updatePacket.ParcelData.IsGroupOwned = landData.IsGroupOwned;
-            updatePacket.ParcelData.LandingType = landData.LandingType;
-            updatePacket.ParcelData.LocalID = landData.LocalID;
+            updateMessage.Desc = landData.Description;
+            updateMessage.Category = landData.Category;
+            updateMessage.ClaimDate = Util.ToDateTime(landData.ClaimDate);
+            updateMessage.ClaimPrice = landData.ClaimPrice;
+            updateMessage.GroupID = landData.GroupID;
+            updateMessage.GroupPrims = landData.GroupPrims;
+            updateMessage.IsGroupOwned = landData.IsGroupOwned;
+            updateMessage.LandingType = (LandingType) landData.LandingType;
+            updateMessage.LocalID = landData.LocalID;
 
             if (landData.Area > 0)
             {
-                updatePacket.ParcelData.MaxPrims = parcelObjectCapacity;
+                updateMessage.MaxPrims = parcelObjectCapacity;
             }
             else
             {
-                updatePacket.ParcelData.MaxPrims = 0;
-            }
-
-            updatePacket.ParcelData.MediaAutoScale = landData.MediaAutoScale;
-            updatePacket.ParcelData.MediaID = landData.MediaID;
-            updatePacket.ParcelData.MediaURL = Util.StringToBytes256(landData.MediaURL);
-            updatePacket.ParcelData.MusicURL = Util.StringToBytes256(landData.MusicURL);
-            updatePacket.ParcelData.Name = Util.StringToBytes256(landData.Name);
-            updatePacket.ParcelData.OtherCleanTime = landData.OtherCleanTime;
-            updatePacket.ParcelData.OtherCount = 0; //TODO: Unimplemented
-            updatePacket.ParcelData.OtherPrims = landData.OtherPrims;
-            updatePacket.ParcelData.OwnerID = landData.OwnerID;
-            updatePacket.ParcelData.OwnerPrims = landData.OwnerPrims;
-            updatePacket.ParcelData.ParcelFlags = landData.Flags;
-            updatePacket.ParcelData.ParcelPrimBonus = simObjectBonusFactor;
-            updatePacket.ParcelData.PassHours = landData.PassHours;
-            updatePacket.ParcelData.PassPrice = landData.PassPrice;
-            updatePacket.ParcelData.PublicCount = 0; //TODO: Unimplemented
-
-            updatePacket.ParcelData.RegionDenyAnonymous = (regionFlags & (uint)RegionFlags.DenyAnonymous) > 0;
-            updatePacket.ParcelData.RegionDenyIdentified = (regionFlags & (uint)RegionFlags.DenyIdentified) > 0;
-            updatePacket.ParcelData.RegionDenyTransacted = (regionFlags & (uint)RegionFlags.DenyTransacted) > 0;
-            updatePacket.ParcelData.RegionPushOverride = (regionFlags & (uint)RegionFlags.RestrictPushObject) > 0;
-
-            updatePacket.ParcelData.RentPrice = 0;
-            updatePacket.ParcelData.RequestResult = request_result;
-            updatePacket.ParcelData.SalePrice = landData.SalePrice;
-            updatePacket.ParcelData.SelectedPrims = landData.SelectedPrims;
-            updatePacket.ParcelData.SelfCount = 0; //TODO: Unimplemented
-            updatePacket.ParcelData.SequenceID = sequence_id;
+                updateMessage.MaxPrims = 0;
+            }
+
+            updateMessage.MediaAutoScale = Convert.ToBoolean(landData.MediaAutoScale);
+            updateMessage.MediaID = landData.MediaID;
+            updateMessage.MediaURL = landData.MediaURL;
+            updateMessage.MusicURL = landData.MusicURL;
+            updateMessage.Name = landData.Name;
+            updateMessage.OtherCleanTime = landData.OtherCleanTime;
+            updateMessage.OtherCount = 0; //TODO: Unimplemented
+            updateMessage.OtherPrims = landData.OtherPrims;
+            updateMessage.OwnerID = landData.OwnerID;
+            updateMessage.OwnerPrims = landData.OwnerPrims;
+            updateMessage.ParcelFlags = (ParcelFlags) landData.Flags;
+            updateMessage.ParcelPrimBonus = simObjectBonusFactor;
+            updateMessage.PassHours = landData.PassHours;
+            updateMessage.PassPrice = landData.PassPrice;
+            updateMessage.PublicCount = 0; //TODO: Unimplemented
+                        
+            updateMessage.RegionPushOverride = (regionFlags & (uint)RegionFlags.RestrictPushObject) > 0;
+            updateMessage.RegionDenyAnonymous = (regionFlags & (uint)RegionFlags.DenyAnonymous) > 0;
+
+            //updateMessage.RegionDenyIdentified = (regionFlags & (uint)RegionFlags.DenyIdentified) > 0;
+            //updateMessage.RegionDenyTransacted = (regionFlags & (uint)RegionFlags.DenyTransacted) > 0;
+
+            updateMessage.RentPrice = 0;
+            updateMessage.RequestResult = (ParcelResult) request_result;
+            updateMessage.SalePrice = landData.SalePrice;
+            updateMessage.SelectedPrims = landData.SelectedPrims;
+            updateMessage.SelfCount = 0; //TODO: Unimplemented
+            updateMessage.SequenceID = sequence_id;
             if (landData.SimwideArea > 0)
             {
-                updatePacket.ParcelData.SimWideMaxPrims = parcelObjectCapacity;
+                updateMessage.SimWideMaxPrims = parcelObjectCapacity;
             }
             else
             {
-                updatePacket.ParcelData.SimWideMaxPrims = 0;
+                updateMessage.SimWideMaxPrims = 0;
             }
-            updatePacket.ParcelData.SimWideTotalPrims = landData.SimwidePrims;
-            updatePacket.ParcelData.SnapSelection = snap_selection;
-            updatePacket.ParcelData.SnapshotID = landData.SnapshotID;
-            updatePacket.ParcelData.Status = (byte)landData.Status;
-            updatePacket.ParcelData.TotalPrims = landData.OwnerPrims + landData.GroupPrims + landData.OtherPrims +
+            updateMessage.SimWideTotalPrims = landData.SimwidePrims;
+            updateMessage.SnapSelection = snap_selection;
+            updateMessage.SnapshotID = landData.SnapshotID;
+            updateMessage.Status = (ParcelStatus) landData.Status;
+            updateMessage.TotalPrims = landData.OwnerPrims + landData.GroupPrims + landData.OtherPrims +
                                                  landData.SelectedPrims;
-            updatePacket.ParcelData.UserLocation = landData.UserLocation;
-            updatePacket.ParcelData.UserLookAt = landData.UserLookAt;
-            updatePacket.Header.Zerocoded = true;
+            updateMessage.UserLocation = landData.UserLocation;
+            updateMessage.UserLookAt = landData.UserLookAt;
+
+                        updateMessage.MediaType = landData.MediaType;
+                        updateMessage.MediaDesc = landData.MediaDescription;
+                        updateMessage.MediaWidth = landData.MediaWidth;
+                        updateMessage.MediaHeight = landData.MediaHeight;
+                        updateMessage.MediaLoop = landData.MediaLoop;
+                        updateMessage.ObscureMusic = landData.ObscureMusic;
+                        updateMessage.ObscureMedia = landData.ObscureMedia;
 
             try
             {
                 IEventQueue eq = Scene.RequestModuleInterface<IEventQueue>();
                 if (eq != null)
                 {
-                    eq.ParcelProperties(updatePacket, this.AgentId);
-                }
+                    eq.ParcelProperties(updateMessage, this.AgentId);
+                } else {
+                                        m_log.Warn("No EQ Interface when sending parcel data.");
+                                }
             }
             catch (Exception ex)
             {
                 m_log.Error("Unable to send parcel data via eventqueue - exception: " + ex.ToString());
-                m_log.Warn("sending parcel data via UDP");
-                OutPacket(updatePacket, ThrottleOutPacketType.Task);
             }
         }
 
@@ -8995,7 +9008,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 if (handlerGodKickUser != null)
                 {
                     handlerGodKickUser(gkupack.UserInfo.GodID, gkupack.UserInfo.GodSessionID,
-                                       gkupack.UserInfo.AgentID, (uint)0, gkupack.UserInfo.Reason);
+                                       gkupack.UserInfo.AgentID, gkupack.UserInfo.KickFlags, gkupack.UserInfo.Reason);
                 }
             }
             else
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;
diff --git a/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs b/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs
index c489972..3c39f9e 100644
--- a/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs
+++ b/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs
@@ -142,9 +142,18 @@ namespace OpenSim.Region.DataSnapshot.Providers
                             node.InnerText = m_scene.RegionInfo.RegionSettings.RegionUUID.ToString();
                             xmlobject.AppendChild(node);
 
-                            node = nodeFactory.CreateNode(XmlNodeType.Element, "parceluuid", "");
-                            node.InnerText = land.LandData.GlobalID.ToString();
-                            xmlobject.AppendChild(node);
+                            if (land != null && land.LandData != null)
+                            {
+                                node = nodeFactory.CreateNode(XmlNodeType.Element, "parceluuid", "");
+                                node.InnerText = land.LandData.GlobalID.ToString();
+                                xmlobject.AppendChild(node);
+                            }
+                            else
+                            {
+                                // Something is wrong with this object. Let's not list it.
+                                m_log.WarnFormat("[DATASNAPSHOT]: Bad data for object {0} ({1}) in region {2}", obj.Name, obj.UUID, m_scene.RegionInfo.RegionName);
+                                continue;
+                            }
 
                             node = nodeFactory.CreateNode(XmlNodeType.Element, "location", "");
                             Vector3 loc = obj.AbsolutePosition;
diff --git a/OpenSim/Region/DataSnapshot/SnapshotStore.cs b/OpenSim/Region/DataSnapshot/SnapshotStore.cs
index 70cb205..aa3d2ff 100644
--- a/OpenSim/Region/DataSnapshot/SnapshotStore.cs
+++ b/OpenSim/Region/DataSnapshot/SnapshotStore.cs
@@ -30,6 +30,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Reflection;
 using System.Text;
+using System.Text.RegularExpressions;
 using System.Xml;
 using log4net;
 using OpenSim.Region.DataSnapshot.Interfaces;
@@ -98,13 +99,21 @@ namespace OpenSim.Region.DataSnapshot
                 {
                     String path = DataFileNameFragment(provider.GetParentScene, provider.Name);
 
-                    using (XmlTextWriter snapXWriter = new XmlTextWriter(path, Encoding.Default))
+                    try
                     {
-                        snapXWriter.Formatting = Formatting.Indented;
-                        snapXWriter.WriteStartDocument();
-                        data.WriteTo(snapXWriter);
-                        snapXWriter.WriteEndDocument();
+                        using (XmlTextWriter snapXWriter = new XmlTextWriter(path, Encoding.Default))
+                        {
+                            snapXWriter.Formatting = Formatting.Indented;
+                            snapXWriter.WriteStartDocument();
+                            data.WriteTo(snapXWriter);
+                            snapXWriter.WriteEndDocument();
+                        }
+                    }
+                    catch (Exception e)
+                    {
+                        m_log.WarnFormat("[DATASNAPSHOT]: Exception on writing to file {0}: {1}", path, e.Message);
                     }
+
                 }
 
                 //mark provider as not stale, parent scene as stale
@@ -185,12 +194,19 @@ namespace OpenSim.Region.DataSnapshot
                 //save snapshot
                 String path = DataFileNameScene(scene);
 
-                using (XmlTextWriter snapXWriter = new XmlTextWriter(path, Encoding.Default))
+                try
+                {
+                    using (XmlTextWriter snapXWriter = new XmlTextWriter(path, Encoding.Default))
+                    {
+                        snapXWriter.Formatting = Formatting.Indented;
+                        snapXWriter.WriteStartDocument();
+                        regionElement.WriteTo(snapXWriter);
+                        snapXWriter.WriteEndDocument();
+                    }
+                }
+                catch (Exception e)
                 {
-                    snapXWriter.Formatting = Formatting.Indented;
-                    snapXWriter.WriteStartDocument();
-                    regionElement.WriteTo(snapXWriter);
-                    snapXWriter.WriteEndDocument();
+                    m_log.WarnFormat("[DATASNAPSHOT]: Exception on writing to file {0}: {1}", path, e.Message);
                 }
 
                 m_scenes[scene] = false;
@@ -206,15 +222,23 @@ namespace OpenSim.Region.DataSnapshot
         #region Helpers
         private string DataFileNameFragment(Scene scene, String fragmentName)
         {
-            return Path.Combine(m_directory, Path.ChangeExtension(scene.RegionInfo.RegionName + "_" + fragmentName, "xml"));
+            return Path.Combine(m_directory, Path.ChangeExtension(Sanitize(scene.RegionInfo.RegionName + "_" + fragmentName), "xml"));
         }
 
         private string DataFileNameScene(Scene scene)
         {
-            return Path.Combine(m_directory, Path.ChangeExtension(scene.RegionInfo.RegionName, "xml"));
+            return Path.Combine(m_directory, Path.ChangeExtension(Sanitize(scene.RegionInfo.RegionName), "xml"));
             //return (m_snapsDir + Path.DirectorySeparatorChar + scene.RegionInfo.RegionName + ".xml");
         }
 
+        private static string Sanitize(string name)
+        {
+            string invalidChars = Regex.Escape(new string(Path.GetInvalidFileNameChars()));
+            string invalidReStr = string.Format(@"[{0}]", invalidChars);
+            string newname = Regex.Replace(name, invalidReStr, "_");
+            return newname.Replace('.', '_');
+        }
+
         private XmlNode MakeRegionNode(Scene scene, XmlDocument basedoc)
         {
             XmlNode docElement = basedoc.CreateNode(XmlNodeType.Element, "region", "");
diff --git a/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs b/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
index 9fe6d96..59c035f 100644
--- a/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
@@ -136,5 +136,13 @@ namespace OpenSim.Region.Framework.Interfaces
         /// A <see cref="IClientAPI"/>
         /// </param>
         void ShowDetachInUserInventory(UUID itemID, IClientAPI remoteClient);
+        
+        /// <summary>
+        /// Update the position of an attachment
+        /// </summary>
+        /// <param name="client"></param>
+        /// <param name="sog"></param>
+        /// <param name="pos"></param>
+        void UpdateAttachmentPosition(IClientAPI client, SceneObjectGroup sog, Vector3 pos);
     }
 }
diff --git a/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs b/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs
index 1e2f60b..f5cd528 100644
--- a/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs
@@ -29,6 +29,7 @@ using System.Collections.Generic;
 using System.Collections;
 using OpenMetaverse;
 using OpenSim.Framework;
+using OpenSim.Region.Framework.Scenes;
 
 namespace OpenSim.Region.Framework.Interfaces
 {
@@ -155,6 +156,17 @@ namespace OpenSim.Region.Framework.Interfaces
         /// If no inventory item has that name then an empty list is returned.
         /// </returns>
         IList<TaskInventoryItem> GetInventoryItems(string name);
+        
+        /// <summary>
+        /// Get the scene object referenced by an inventory item.
+        /// </summary>
+        /// 
+        /// This is returned in a 'rez ready' state.  That is, name, description, permissions and other details have
+        /// been adjusted to reflect the part and item from which it originates.
+        /// 
+        /// <param name="item"></param>
+        /// <returns>The scene object.  Null if the scene object asset couldn't be found</returns>
+        SceneObjectGroup GetRezReadySceneObject(TaskInventoryItem item);
 
         /// <summary>
         /// Update an existing inventory item.
diff --git a/OpenSim/Region/Framework/Interfaces/IEventQueue.cs b/OpenSim/Region/Framework/Interfaces/IEventQueue.cs
index e093f0a..81e4952 100644
--- a/OpenSim/Region/Framework/Interfaces/IEventQueue.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEventQueue.cs
@@ -28,6 +28,7 @@
 using System.Net;
 using OpenMetaverse;
 using OpenMetaverse.Packets;
+using OpenMetaverse.Messages.Linden;
 using OpenMetaverse.StructuredData;
 
 namespace OpenSim.Region.Framework.Interfaces
@@ -54,7 +55,7 @@ namespace OpenSim.Region.Framework.Interfaces
                                   uint ttl, UUID transactionID, bool fromGroup, byte[] binaryBucket);
         void ChatterBoxSessionAgentListUpdates(UUID sessionID, UUID fromAgent, UUID toAgent, bool canVoiceChat, 
                                                bool isModerator, bool textMute);
-        void ParcelProperties(ParcelPropertiesPacket parcelPropertiesPacket, UUID avatarID);
+        void ParcelProperties(ParcelPropertiesMessage parcelPropertiesMessage, UUID avatarID);
         void GroupMembership(AgentGroupDataUpdatePacket groupUpdate, UUID avatarID);
     }
 }
diff --git a/OpenSim/Region/Framework/Scenes/Prioritizer.cs b/OpenSim/Region/Framework/Scenes/Prioritizer.cs
index 145f9ed..3a3ec2b 100644
--- a/OpenSim/Region/Framework/Scenes/Prioritizer.cs
+++ b/OpenSim/Region/Framework/Scenes/Prioritizer.cs
@@ -31,7 +31,7 @@ namespace OpenSim.Region.Framework.Scenes
 
     public class Prioritizer
     {
-        private static readonly ILog m_log = LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+//        private static readonly ILog m_log = LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
         
         /// <summary>
         /// This is added to the priority of all child prims, to make sure that the root prim update is sent to the
@@ -75,7 +75,6 @@ namespace OpenSim.Region.Framework.Scenes
                     break;
                 default:
                     throw new InvalidOperationException("UpdatePrioritizationScheme not defined.");
-                    break;
             }
             
             // Adjust priority so that root prims are sent to the viewer first.  This is especially important for 
@@ -122,9 +121,16 @@ namespace OpenSim.Region.Framework.Scenes
                 // Use group position for child prims
                 Vector3 entityPos;
                 if (entity is SceneObjectPart)
-                    entityPos = m_scene.GetGroupByPrim(entity.LocalId).AbsolutePosition;
+                {
+                    // Can't use Scene.GetGroupByPrim() here, since the entity may have been delete from the scene
+                    // before its scheduled update was triggered                    
+                    //entityPos = m_scene.GetGroupByPrim(entity.LocalId).AbsolutePosition;
+                    entityPos = ((SceneObjectPart)entity).ParentGroup.AbsolutePosition;                    
+                }
                 else
+                {
                     entityPos = entity.AbsolutePosition;
+                }
 
                 return Vector3.DistanceSquared(presencePos, entityPos);
             }
@@ -157,7 +163,9 @@ namespace OpenSim.Region.Framework.Scenes
                     }
                 }
                 else
+                {
                     entityPos = entity.AbsolutePosition;
+                }
 
                 if (!presence.IsChildAgent)
                 {
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index ab18c93..8760c84 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -122,7 +122,7 @@ namespace OpenSim.Region.Framework.Scenes
             else
             {
                 m_log.WarnFormat(
-                    "[AGENT INVENTORY]: Agent {1} could not add item {2} {3}",
+                    "[AGENT INVENTORY]: Agent {0} could not add item {1} {2}",
                     AgentID, item.Name, item.ID);
 
                 return;
@@ -984,7 +984,6 @@ namespace OpenSim.Region.Framework.Scenes
 
         private InventoryItemBase CreateAgentInventoryItemFromTask(UUID destAgent, SceneObjectPart part, UUID itemId)
         {
-            Console.WriteLine("CreateAgentInventoryItemFromTask");
             TaskInventoryItem taskItem = part.Inventory.GetInventoryItem(itemId);
 
             if (null == taskItem)
@@ -1055,7 +1054,10 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="itemID"></param>
         public InventoryItemBase MoveTaskInventoryItem(IClientAPI remoteClient, UUID folderId, SceneObjectPart part, UUID itemId)
         {
-            m_log.Info("Adding task inventory");
+            m_log.DebugFormat(
+                "[PRIM INVENTORY]: Adding item {0} from {1} to folder {2} for {3}", 
+                itemId, part.Name, folderId, remoteClient.Name);
+            
             InventoryItemBase agentItem = CreateAgentInventoryItemFromTask(remoteClient.AgentId, part, itemId);
 
             if (agentItem == null)
@@ -1121,7 +1123,11 @@ namespace OpenSim.Region.Framework.Scenes
         /// <see>MoveTaskInventoryItem</see>
         /// </summary>
         /// <param name="remoteClient"></param>
-        /// <param name="folderID"></param>
+        /// <param name="folderID">
+        /// The user inventory folder to move (or copy) the item to.  If null, then the most
+        /// suitable system folder is used (e.g. the Objects folder for objects).  If there is no suitable folder, then
+        /// the item is placed in the user's root inventory folder
+        /// </param>
         /// <param name="part"></param>
         /// <param name="itemID"></param>
         public InventoryItemBase MoveTaskInventoryItem(UUID avatarId, UUID folderId, SceneObjectPart part, UUID itemId)
@@ -1846,53 +1852,6 @@ namespace OpenSim.Region.Framework.Scenes
             }
         }
 
-        public void UpdateKnownItem(IClientAPI remoteClient, SceneObjectGroup grp, UUID itemID, UUID agentID)
-        {
-            SceneObjectGroup objectGroup = grp;
-            if (objectGroup != null)
-            {
-                if (!grp.HasGroupChanged)
-                {
-                    m_log.InfoFormat("[ATTACHMENT]: Save request for {0} which is unchanged", grp.UUID);
-                    return;
-                }
-
-                m_log.InfoFormat(
-                    "[ATTACHMENT]: Updating asset for attachment {0}, attachpoint {1}",
-                    grp.UUID, grp.GetAttachmentPoint());
-
-                string sceneObjectXml = SceneObjectSerializer.ToOriginalXmlFormat(objectGroup);
-
-                InventoryItemBase item = new InventoryItemBase(itemID, remoteClient.AgentId);
-                item = InventoryService.GetItem(item);
-
-                if (item != null)
-                {
-                    AssetBase asset = CreateAsset(
-                        objectGroup.GetPartName(objectGroup.LocalId),
-                        objectGroup.GetPartDescription(objectGroup.LocalId),
-                        (sbyte)AssetType.Object,
-                        Utils.StringToBytes(sceneObjectXml),
-                        remoteClient.AgentId);
-                    AssetService.Store(asset);
-
-                    item.AssetID = asset.FullID;
-                    item.Description = asset.Description;
-                    item.Name = asset.Name;
-                    item.AssetType = asset.Type;
-                    item.InvType = (int)InventoryType.Object;
-
-                    InventoryService.UpdateItem(item);
-
-                    // this gets called when the agent loggs off!
-                    if (remoteClient != null)
-                    {
-                        remoteClient.SendInventoryItemCreateUpdate(item, 0);
-                    }
-                }
-            }
-        }
-
         public UUID attachObjectAssetStore(IClientAPI remoteClient, SceneObjectGroup grp, UUID AgentId, out UUID itemID)
         {
             itemID = UUID.Zero;
@@ -1998,7 +1957,7 @@ namespace OpenSim.Region.Framework.Scenes
                     remoteClient, itemID, RayEnd, RayStart, RayTargetID, BypassRayCast, RayEndIsIntersection,
                     RezSelected, RemoveItem, fromTaskID, false);
         }
-
+        
         /// <summary>
         /// Rez an object into the scene from a prim's inventory.
         /// </summary>
@@ -2013,95 +1972,32 @@ namespace OpenSim.Region.Framework.Scenes
             SceneObjectPart sourcePart, TaskInventoryItem item,
             Vector3 pos, Quaternion rot, Vector3 vel, int param)
         {
-            // Rez object
-            if (item != null)
-            {
-                UUID ownerID = item.OwnerID;
-
-                AssetBase rezAsset = AssetService.Get(item.AssetID.ToString());
-
-                if (rezAsset != null)
-                {
-                    string xmlData = Utils.BytesToString(rezAsset.Data);
-                    SceneObjectGroup group = SceneObjectSerializer.FromOriginalXmlFormat(xmlData);
-
-                    if (!Permissions.CanRezObject(group.Children.Count, ownerID, pos))
-                    {
-                        return null;
-                    }
-                    group.ResetIDs();
-
-                    AddNewSceneObject(group, true);
-
-                    // we set it's position in world.
-                    group.AbsolutePosition = pos;
-
-                    SceneObjectPart rootPart = group.GetChildPart(group.UUID);
-
-                    // Since renaming the item in the inventory does not affect the name stored
-                    // in the serialization, transfer the correct name from the inventory to the
-                    // object itself before we rez.
-                    rootPart.Name = item.Name;
-                    rootPart.Description = item.Description;
-
-                    List<SceneObjectPart> partList = new List<SceneObjectPart>(group.Children.Values);
-
-                    group.SetGroup(sourcePart.GroupID, null);
-
-                    if ((rootPart.OwnerID != item.OwnerID) || (item.CurrentPermissions & 16) != 0)
-                    {
-                        if (Permissions.PropagatePermissions())
-                        {
-                            foreach (SceneObjectPart part in partList)
-                            {
-                                part.EveryoneMask = item.EveryonePermissions;
-                                part.NextOwnerMask = item.NextPermissions;
-                            }
-                            group.ApplyNextOwnerPermissions();
-                        }
-                    }
-
-                    foreach (SceneObjectPart part in partList)
-                    {
-                        if ((part.OwnerID != item.OwnerID) || (item.CurrentPermissions & 16) != 0)
-                        {
-                            part.LastOwnerID = part.OwnerID;
-                            part.OwnerID = item.OwnerID;
-                            part.Inventory.ChangeInventoryOwner(item.OwnerID);
-                        }
-                        part.EveryoneMask = item.EveryonePermissions;
-                        part.NextOwnerMask = item.NextPermissions;
-                    }
-                    
-                    rootPart.TrimPermissions();
-                    
-                    if (group.RootPart.Shape.PCode == (byte)PCode.Prim)
-                    {
-                        group.ClearPartAttachmentData();
-                    }
-                    
-                    group.UpdateGroupRotationR(rot);
-                    
-                    //group.ApplyPhysics(m_physicalPrim);
-                    if (group.RootPart.PhysActor != null && group.RootPart.PhysActor.IsPhysical && vel != Vector3.Zero)
-                    {
-                        group.RootPart.ApplyImpulse((vel * group.GetMass()), false);
-                        group.Velocity = vel;
-                        rootPart.ScheduleFullUpdate();
-                    }
-                    group.CreateScriptInstances(param, true, DefaultScriptEngine, 2);
-                    rootPart.ScheduleFullUpdate();
+            if (null == item)
+                return null;
+            
+            SceneObjectGroup group = sourcePart.Inventory.GetRezReadySceneObject(item);
+            
+            if (null == group)
+                return null;
+            
+            if (!Permissions.CanRezObject(group.PrimCount, item.OwnerID, pos))
+                return null;            
 
-                    if (!Permissions.BypassPermissions())
-                    {
-                        if ((item.CurrentPermissions & (uint)PermissionMask.Copy) == 0)
-                            sourcePart.Inventory.RemoveInventoryItem(item.ItemID);
-                    }
-                    return rootPart.ParentGroup;
-                }
+            if (!Permissions.BypassPermissions())
+            {
+                if ((item.CurrentPermissions & (uint)PermissionMask.Copy) == 0)
+                    sourcePart.Inventory.RemoveInventoryItem(item.ItemID);
             }
-
-            return null;
+                        
+            AddNewSceneObject(group, true, pos, rot, vel);
+            
+            // We can only call this after adding the scene object, since the scene object references the scene
+            // to find out if scripts should be activated at all.
+            group.CreateScriptInstances(param, true, DefaultScriptEngine, 2);
+            
+            group.ScheduleGroupForFullUpdate();
+        
+            return group;
         }
 
         public virtual bool returnObjects(SceneObjectGroup[] returnobjects, UUID AgentId)
@@ -2161,7 +2057,11 @@ namespace OpenSim.Region.Framework.Scenes
                     sog.SetGroup(groupID, remoteClient);
                     sog.ScheduleGroupForFullUpdate();
 
-                    foreach (SceneObjectPart child in sog.Children.Values)
+                    List<SceneObjectPart> partList = null;
+                    lock (sog.Children)
+                        partList = new List<SceneObjectPart>(sog.Children.Values);                    
+                    
+                    foreach (SceneObjectPart child in partList)
                         child.Inventory.ChangeInventoryOwner(ownerID);
                 }
                 else
@@ -2171,8 +2071,12 @@ namespace OpenSim.Region.Framework.Scenes
 
                     if (sog.GroupID != groupID)
                         continue;
+                    
+                    List<SceneObjectPart> partList = null;
+                    lock (sog.Children)
+                        partList = new List<SceneObjectPart>(sog.Children.Values);                    
 
-                    foreach (SceneObjectPart child in sog.Children.Values)
+                    foreach (SceneObjectPart child in partList)
                     {
                         child.LastOwnerID = child.OwnerID;
                         child.Inventory.ChangeInventoryOwner(groupID);
@@ -2180,8 +2084,7 @@ namespace OpenSim.Region.Framework.Scenes
 
                     sog.SetOwnerId(groupID);
                     sog.ApplyNextOwnerPermissions();
-                }
-                
+                }                
             }
 
             foreach (uint localID in localIDs)
diff --git a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
index e25b1f1..c511774 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
@@ -156,21 +156,30 @@ namespace OpenSim.Region.Framework.Scenes
                         }
                         break;
                     }
-                   else 
-                   {
-                       // We also need to check the children of this prim as they
-                       // can be selected as well and send property information
-                       bool foundPrim = false;
-                       foreach (KeyValuePair<UUID, SceneObjectPart> child in ((SceneObjectGroup) ent).Children)
-                       {
-                           if (child.Value.LocalId == primLocalID) 
-                           {
-                               child.Value.GetProperties(remoteClient);
-                               foundPrim = true;
-                               break;
-                           }
-                       }
-                       if (foundPrim) break;
+                    else 
+                    {
+                        // We also need to check the children of this prim as they
+                        // can be selected as well and send property information
+                        bool foundPrim = false;
+                        
+                        SceneObjectGroup sog = ent as SceneObjectGroup;
+                        
+                        List<SceneObjectPart> partList = null;
+                        lock (sog.Children)
+                            partList = new List<SceneObjectPart>(sog.Children.Values);    
+
+                        foreach (SceneObjectPart part in partList)
+                        {
+                            if (part.LocalId == primLocalID) 
+                            {
+                                part.GetProperties(remoteClient);
+                                foundPrim = true;
+                                break;
+                            }
+                        }
+                            
+                        if (foundPrim) 
+                            break;
                    }
                 }
             }
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 736b696..9fea2a0 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -42,7 +42,6 @@ using OpenMetaverse.Imaging;
 using OpenSim.Framework;
 using OpenSim.Services.Interfaces;
 using OpenSim.Framework.Communications;
-
 using OpenSim.Framework.Console;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes.Scripting;
@@ -399,6 +398,7 @@ namespace OpenSim.Region.Framework.Scenes
         private bool m_firstHeartbeat = true;
 
         private object m_deleting_scene_object = new object();
+        private object m_cleaningAttachments = new object();
 
         // the minimum time that must elapse before a changed object will be considered for persisted
         public long m_dontPersistBefore = DEFAULT_MIN_TIME_FOR_PERSISTENCE * 10000000L;
@@ -1790,8 +1790,9 @@ namespace OpenSim.Region.Framework.Scenes
                 
                 if (group.RootPart == null)
                 {
-                    m_log.ErrorFormat("[SCENE]: Found a SceneObjectGroup with m_rootPart == null and {0} children",
-                                      group.Children == null ? 0 : group.Children.Count);
+                    m_log.ErrorFormat(
+                        "[SCENE]: Found a SceneObjectGroup with m_rootPart == null and {0} children",
+                        group.Children == null ? 0 : group.PrimCount);
                 }
 
                 AddRestoredSceneObject(group, true, true);
@@ -2050,7 +2051,24 @@ namespace OpenSim.Region.Framework.Scenes
         public bool AddNewSceneObject(SceneObjectGroup sceneObject, bool attachToBackup, bool sendClientUpdates)
         {
             return m_sceneGraph.AddNewSceneObject(sceneObject, attachToBackup, sendClientUpdates);
-        }        
+        }
+        
+        /// <summary>
+        /// Add a newly created object to the scene.
+        /// </summary>
+        /// 
+        /// This method does not send updates to the client - callers need to handle this themselves.
+        /// <param name="sceneObject"></param>
+        /// <param name="attachToBackup"></param>
+        /// <param name="pos">Position of the object</param>
+        /// <param name="rot">Rotation of the object</param>
+        /// <param name="vel">Velocity of the object.  This parameter only has an effect if the object is physical</param>
+        /// <returns></returns>
+        public bool AddNewSceneObject(
+            SceneObjectGroup sceneObject, bool attachToBackup, Vector3 pos, Quaternion rot, Vector3 vel)
+        {            
+            return m_sceneGraph.AddNewSceneObject(sceneObject, attachToBackup, pos, rot, vel);
+        }
 
         /// <summary>
         /// Delete every object from the scene.  This does not include attachments worn by avatars.
@@ -2113,7 +2131,11 @@ namespace OpenSim.Region.Framework.Scenes
                 group.RemoveScriptInstances(true);
             }
 
-            foreach (SceneObjectPart part in group.Children.Values)
+            List<SceneObjectPart> partList = null;
+            lock (group.Children)
+                partList = new List<SceneObjectPart>(group.Children.Values);
+
+            foreach (SceneObjectPart part in partList)
             {
                 if (part.IsJoint() && ((part.Flags & PrimFlags.Physics) != 0))
                 {
@@ -2125,6 +2147,7 @@ namespace OpenSim.Region.Framework.Scenes
                     part.PhysActor = null;
                 }
             }
+            
 //            if (rootPart.PhysActor != null)
 //            {
 //                PhysicsScene.RemovePrim(rootPart.PhysActor);
@@ -2481,14 +2504,16 @@ namespace OpenSim.Region.Framework.Scenes
 
             // Force allocation of new LocalId
             //
-            foreach (SceneObjectPart p in sceneObject.Children.Values)
-                p.LocalId = 0;
+            lock (sceneObject.Children)
+            {
+                foreach (SceneObjectPart p in sceneObject.Children.Values)
+                    p.LocalId = 0;
+            }
 
             if (sceneObject.IsAttachmentCheckFull()) // Attachment
             {
                 sceneObject.RootPart.AddFlag(PrimFlags.TemporaryOnRez);
                 sceneObject.RootPart.AddFlag(PrimFlags.Phantom);
-
                       
                 // Don't sent a full update here because this will cause full updates to be sent twice for 
                 // attachments on region crossings, resulting in viewer glitches.                
@@ -2502,7 +2527,6 @@ namespace OpenSim.Region.Framework.Scenes
 
                 if (sp != null)
                 {
-
                     SceneObjectGroup grp = sceneObject;
 
                     m_log.DebugFormat(
@@ -3210,6 +3234,7 @@ namespace OpenSim.Region.Framework.Scenes
                 m_log.Debug("[Scene] Beginning OnRemovePresence");
                 m_eventManager.TriggerOnRemovePresence(agentID);
                 m_log.Debug("[Scene] Finished OnRemovePresence");
+
                 ForEachClient(
                     delegate(IClientAPI client)
                     {
@@ -3245,6 +3270,7 @@ namespace OpenSim.Region.Framework.Scenes
                 }
                 m_log.Debug("[Scene] Done. Firing RemoveCircuit");
                 m_authenticateHandler.RemoveCircuit(avatar.ControllingClient.CircuitCode);
+                CleanDroppedAttachments();
                 m_log.Debug("[Scene] The avatar has left the building");
                 //m_log.InfoFormat("[SCENE] Memory pre  GC {0}", System.GC.GetTotalMemory(false));
                 //m_log.InfoFormat("[SCENE] Memory post GC {0}", System.GC.GetTotalMemory(true));
@@ -3443,6 +3469,8 @@ namespace OpenSim.Region.Framework.Scenes
 
             if (vialogin) 
             {
+                CleanDroppedAttachments();
+
                 if (TestBorderCross(agent.startpos, Cardinals.E))
                 {
                     Border crossedBorder = GetCrossedBorder(agent.startpos, Cardinals.E);
@@ -3694,18 +3722,6 @@ namespace OpenSim.Region.Framework.Scenes
             return true;
         }
 
-        private ILandObject GetParcelAtPoint(float x, float y)
-        {
-            foreach (var parcel in AllParcels())
-            {
-                if (parcel.ContainsPoint((int)x,(int)y))
-                {
-                    return parcel;
-                }
-            }
-            return null;
-        }
-
         /// <summary>
         /// Update an AgentCircuitData object with new information
         /// </summary>
@@ -5041,5 +5057,45 @@ namespace OpenSim.Region.Framework.Scenes
                     throw new Exception(error);
             }
         }
+
+        public void CleanDroppedAttachments()
+        {
+            List<SceneObjectGroup> objectsToDelete =
+                    new List<SceneObjectGroup>();
+
+            lock (m_cleaningAttachments)
+            {
+                ForEachSOG(delegate (SceneObjectGroup grp)
+                        {
+                            if (grp.RootPart.Shape.State != 0 && (!objectsToDelete.Contains(grp)))
+                            {
+                                UUID agentID = grp.OwnerID;
+                                if (agentID == UUID.Zero)
+                                {
+                                    objectsToDelete.Add(grp);
+                                    return;
+                                }
+
+                                ScenePresence sp = GetScenePresence(agentID);
+                                if (sp == null)
+                                {
+                                    objectsToDelete.Add(grp);
+                                    return;
+                                }
+                            }
+                        });
+            }
+
+            if (objectsToDelete.Count > 0)
+            {
+                m_log.DebugFormat("[SCENE]: Starting delete of {0} dropped attachments", objectsToDelete.Count);
+                foreach (SceneObjectGroup grp in objectsToDelete)
+                {
+                    m_log.InfoFormat("[SCENE]: Deleting dropped attachment {0} of user {1}", grp.UUID, grp.OwnerID);
+                    DeleteSceneObject(grp, true);
+                }
+                m_log.Debug("[SCENE]: Finished dropped attachment deletion");
+            }
+        }
     }
 }
diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
index 59e4037..1293d5d 100644
--- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
@@ -70,7 +70,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// <summary>
         /// A user will arrive shortly, set up appropriate credentials so it can connect
         /// </summary>
-        public event ExpectUserDelegate OnExpectUser;
+//        public event ExpectUserDelegate OnExpectUser;
 
         /// <summary>
         /// A Prim will arrive shortly
@@ -80,7 +80,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// <summary>
         /// A new prim has arrived
         /// </summary>
-        public event PrimCrossing OnPrimCrossingIntoRegion;
+//        public event PrimCrossing OnPrimCrossingIntoRegion;
 
         ///// <summary>
         ///// A New Region is up and available
@@ -90,7 +90,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// <summary>
         /// We have a child agent for this avatar and we're getting a status update about it
         /// </summary>
-        public event ChildAgentUpdate OnChildAgentUpdate;
+//        public event ChildAgentUpdate OnChildAgentUpdate;
         //public event RemoveKnownRegionsFromAvatarList OnRemoveKnownRegionFromAvatar;
 
         /// <summary>
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index 94ec534..b86a564 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -104,7 +104,6 @@ namespace OpenSim.Region.Framework.Scenes
 
         protected internal Dictionary<uint, SceneObjectGroup> SceneObjectGroupsByLocalID = new Dictionary<uint, SceneObjectGroup>();
         protected internal Dictionary<UUID, SceneObjectGroup> SceneObjectGroupsByFullID = new Dictionary<UUID, SceneObjectGroup>();
-        private readonly Object m_dictionary_lock = new Object();
 
         private Object m_updateLock = new Object();
 
@@ -150,11 +149,10 @@ namespace OpenSim.Region.Framework.Scenes
                 m_scenePresencesLock.ExitWriteLock();
             }
 
-            lock (m_dictionary_lock)
-            {
+            lock (SceneObjectGroupsByFullID)
                 SceneObjectGroupsByFullID.Clear();
+            lock (SceneObjectGroupsByLocalID)
                 SceneObjectGroupsByLocalID.Clear();
-            }
 
             Entities.Clear();
         }
@@ -314,6 +312,42 @@ namespace OpenSim.Region.Framework.Scenes
 
             return AddSceneObject(sceneObject, attachToBackup, sendClientUpdates);
         }
+        
+        /// <summary>
+        /// Add a newly created object to the scene.
+        /// </summary>
+        /// 
+        /// This method does not send updates to the client - callers need to handle this themselves.
+        /// <param name="sceneObject"></param>
+        /// <param name="attachToBackup"></param>
+        /// <param name="pos">Position of the object</param>
+        /// <param name="rot">Rotation of the object</param>
+        /// <param name="vel">Velocity of the object.  This parameter only has an effect if the object is physical</param>
+        /// <returns></returns>        
+        public bool AddNewSceneObject(
+            SceneObjectGroup sceneObject, bool attachToBackup, Vector3 pos, Quaternion rot, Vector3 vel)
+        {
+            AddNewSceneObject(sceneObject, true, false);
+
+            // we set it's position in world.
+            sceneObject.AbsolutePosition = pos;
+
+            if (sceneObject.RootPart.Shape.PCode == (byte)PCode.Prim)
+            {
+                sceneObject.ClearPartAttachmentData();
+            }
+            
+            sceneObject.UpdateGroupRotationR(rot);
+            
+            //group.ApplyPhysics(m_physicalPrim);
+            if (sceneObject.RootPart.PhysActor != null && sceneObject.RootPart.PhysActor.IsPhysical && vel != Vector3.Zero)
+            {
+                sceneObject.RootPart.ApplyImpulse((vel * sceneObject.GetMass()), false);
+                sceneObject.Velocity = vel;
+            }
+        
+            return true;
+        }        
 
         /// <summary>
         /// Add an object to the scene.  This will both update the scene, and send information about the
@@ -350,50 +384,53 @@ namespace OpenSim.Region.Framework.Scenes
 //                        "[SCENE GRAPH]: Adding object {0} {1} to region {2}", 
 //                        sceneObject.Name, sceneObject.UUID, m_parentScene.RegionInfo.RegionName);                
             
-                if (m_parentScene.m_clampPrimSize)
+                lock (sceneObject.Children)
                 {
-                    foreach (SceneObjectPart part in sceneObject.Children.Values)
+                    if (m_parentScene.m_clampPrimSize)
                     {
-                        Vector3 scale = part.Shape.Scale;
-    
-                        if (scale.X > m_parentScene.m_maxNonphys)
-                            scale.X = m_parentScene.m_maxNonphys;
-                        if (scale.Y > m_parentScene.m_maxNonphys)
-                            scale.Y = m_parentScene.m_maxNonphys;
-                        if (scale.Z > m_parentScene.m_maxNonphys)
-                            scale.Z = m_parentScene.m_maxNonphys;
-    
-                        part.Shape.Scale = scale;
+                        foreach (SceneObjectPart part in sceneObject.Children.Values)
+                        {
+                            Vector3 scale = part.Shape.Scale;
+        
+                            if (scale.X > m_parentScene.m_maxNonphys)
+                                scale.X = m_parentScene.m_maxNonphys;
+                            if (scale.Y > m_parentScene.m_maxNonphys)
+                                scale.Y = m_parentScene.m_maxNonphys;
+                            if (scale.Z > m_parentScene.m_maxNonphys)
+                                scale.Z = m_parentScene.m_maxNonphys;
+        
+                            part.Shape.Scale = scale;
+                        }
                     }
+                    
+                    m_numPrim += sceneObject.Children.Count;
                 }
-    
+        
                 sceneObject.AttachToScene(m_parentScene);
-    
+
                 if (sendClientUpdates)
                     sceneObject.ScheduleGroupForFullUpdate();
-                                     
-                Entities.Add(sceneObject);
-                m_numPrim += sceneObject.Children.Count;
+                                 
+                Entities.Add(sceneObject);                    
 
                 if (attachToBackup)
-                {
                     sceneObject.AttachToBackup();
-                }
 
                 if (OnObjectCreate != null)
-                {
                     OnObjectCreate(sceneObject);
-                }
                 
-                lock (m_dictionary_lock)
+                lock (SceneObjectGroupsByFullID)
                 {
                     SceneObjectGroupsByFullID[sceneObject.UUID] = sceneObject;
-                    SceneObjectGroupsByLocalID[sceneObject.LocalId] = sceneObject;
                     foreach (SceneObjectPart part in sceneObject.Children.Values)
-                    {
                         SceneObjectGroupsByFullID[part.UUID] = sceneObject;
+                }
+                    
+                lock (SceneObjectGroupsByLocalID)
+                {
+                    SceneObjectGroupsByLocalID[sceneObject.LocalId] = sceneObject;
+                    foreach (SceneObjectPart part in sceneObject.Children.Values)
                         SceneObjectGroupsByLocalID[part.LocalId] = sceneObject;
-                    }
                 }
             }
 
@@ -408,24 +445,32 @@ namespace OpenSim.Region.Framework.Scenes
         {
             if (Entities.ContainsKey(uuid))
             {
+                SceneObjectGroup grp = (SceneObjectGroup)Entities[uuid];
+
                 if (!resultOfObjectLinked)
                 {
-                    m_numPrim -= ((SceneObjectGroup) Entities[uuid]).Children.Count;
+                    m_numPrim -= grp.PrimCount;
 
-                    if ((((SceneObjectGroup)Entities[uuid]).RootPart.Flags & PrimFlags.Physics) == PrimFlags.Physics)
-                    {
-                        RemovePhysicalPrim(((SceneObjectGroup)Entities[uuid]).Children.Count);
-                    }
+                    if ((grp.RootPart.Flags & PrimFlags.Physics) == PrimFlags.Physics)
+                        RemovePhysicalPrim(grp.PrimCount);
                 }
 
                 if (OnObjectRemove != null)
                     OnObjectRemove(Entities[uuid]);
 
-                lock (m_dictionary_lock)
+                lock (SceneObjectGroupsByFullID)
                 {
-                    SceneObjectGroupsByFullID.Remove(uuid);
-                    SceneObjectGroupsByLocalID.Remove(((SceneObjectGroup)Entities[uuid]).LocalId);
+                    foreach (SceneObjectPart part in grp.Children.Values)
+                        SceneObjectGroupsByFullID.Remove(part.UUID);
+                    SceneObjectGroupsByFullID.Remove(grp.RootPart.UUID);
                 }
+                lock (SceneObjectGroupsByLocalID)
+                {
+                    foreach (SceneObjectPart part in grp.Children.Values)
+                        SceneObjectGroupsByLocalID.Remove(part.LocalId);
+                    SceneObjectGroupsByLocalID.Remove(grp.RootPart.LocalId);
+                }
+
                 Entities.Remove(uuid);
                 //SceneObjectGroup part;
                 //((part.RootPart.Flags & PrimFlags.Physics) == PrimFlags.Physics)
@@ -884,7 +929,9 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 if (SceneObjectGroupsByLocalID.TryGetValue(localID, out sog))
                 {
-                    return sog;
+                    if (sog.HasChildPrim(localID))
+                        return sog;
+                    SceneObjectGroupsByLocalID.Remove(localID);
                 }
             }
 
@@ -920,7 +967,13 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 if (SceneObjectGroupsByFullID.TryGetValue(fullID, out sog))
                 {
-                    return sog;
+                    lock (sog.Children)
+                    {
+                        if (sog.Children.ContainsKey(fullID))
+                            return sog;
+                    }
+                    
+                    SceneObjectGroupsByFullID.Remove(fullID);
                 }
             }
 
@@ -1087,9 +1140,11 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="action"></param>
         protected internal void ForEachSOG(Action<SceneObjectGroup> action)
         {
-            List<SceneObjectGroup> objlist = new List<SceneObjectGroup>(SceneObjectGroupsByFullID.Values);
-            foreach (SceneObjectGroup obj in objlist)
+            List<EntityBase> objlist = Entities.GetAllByType<SceneObjectGroup>();
+            foreach (EntityBase ent in objlist)
             {
+                SceneObjectGroup obj = (SceneObjectGroup)ent;
+
                 try
                 {
                     action(obj);
@@ -1293,37 +1348,21 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="localID"></param>
         /// <param name="pos"></param>
         /// <param name="remoteClient"></param>
-        protected internal void UpdatePrimPosition(uint localID, Vector3 pos, IClientAPI remoteClient)
+        public void UpdatePrimPosition(uint localID, Vector3 pos, IClientAPI remoteClient)
         {
             SceneObjectGroup group = GetGroupByPrim(localID);
+            
             if (group != null)
-            {
-
-                // Vector3 oldPos = group.AbsolutePosition;
+            {                
                 if (group.IsAttachment || (group.RootPart.Shape.PCode == 9 && group.RootPart.Shape.State != 0))
                 {
- 
-                    // 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 = group.GetAttachmentPoint();
-                    group.UpdateGroupPosition(pos);
-                    group.RootPart.IsAttachment = false;
-                    group.AbsolutePosition = group.RootPart.AttachedPos;
-                    m_parentScene.UpdateKnownItem(remoteClient, group, group.GetFromItemID(), group.OwnerID);
-                    group.SetAttachmentPoint(attachmentPoint);
-
+                    if (m_parentScene.AttachmentsModule != null)
+                        m_parentScene.AttachmentsModule.UpdateAttachmentPosition(remoteClient, group, pos);
                 }
                 else
                 {
-                    if (m_parentScene.Permissions.CanMoveObject(group.UUID, remoteClient.AgentId) && m_parentScene.Permissions.CanObjectEntry(group.UUID, false, pos))
+                    if (m_parentScene.Permissions.CanMoveObject(group.UUID, remoteClient.AgentId) 
+                        && m_parentScene.Permissions.CanObjectEntry(group.UUID, false, pos))
                     {
                         group.UpdateGroupPosition(pos);
                     }
@@ -1332,14 +1371,19 @@ namespace OpenSim.Region.Framework.Scenes
         }
 
         /// <summary>
-        ///
+        /// Update the texture entry of the given prim.
         /// </summary>
+        /// 
+        /// A texture entry is an object that contains details of all the textures of the prim's face.  In this case,
+        /// the texture is given in its byte serialized form.
+        /// 
         /// <param name="localID"></param>
         /// <param name="texture"></param>
         /// <param name="remoteClient"></param>
         protected internal void UpdatePrimTexture(uint localID, byte[] texture, IClientAPI remoteClient)
         {
             SceneObjectGroup group = GetGroupByPrim(localID);
+            
             if (group != null)
             {
                 if (m_parentScene.Permissions.CanEditObject(group.UUID,remoteClient.AgentId))
@@ -1630,7 +1674,7 @@ namespace OpenSim.Region.Framework.Scenes
                 {
                     if (part != null)
                     {
-                        if (part.ParentGroup.Children.Count != 1) // Skip single
+                        if (part.ParentGroup.PrimCount != 1) // Skip single
                         {
                             if (part.LinkNum < 2) // Root
                                 rootParts.Add(part);
@@ -1669,8 +1713,15 @@ namespace OpenSim.Region.Framework.Scenes
                     // However, editing linked parts and unlinking may be different
                     //
                     SceneObjectGroup group = root.ParentGroup;
-                    List<SceneObjectPart> newSet = new List<SceneObjectPart>(group.Children.Values);
-                    int numChildren = group.Children.Count;
+                    
+                    List<SceneObjectPart> newSet = null;
+                    int numChildren = -1;
+                    
+                    lock (group.Children)
+                    {
+                        newSet = new List<SceneObjectPart>(group.Children.Values);
+                        numChildren = group.PrimCount;
+                    }
 
                     // If there are prims left in a link set, but the root is
                     // slated for unlink, we need to do this
@@ -1722,8 +1773,6 @@ namespace OpenSim.Region.Framework.Scenes
                             SceneObjectPart newRoot = newSet[0];
                             newSet.RemoveAt(0);
 
-                            List<uint> linkIDs = new List<uint>();
-
                             foreach (SceneObjectPart newChild in newSet)
                                 newChild.UpdateFlag = 0;
 
@@ -1760,12 +1809,17 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 if (ent is SceneObjectGroup)
                 {
-                    foreach (KeyValuePair<UUID, SceneObjectPart> subent in ((SceneObjectGroup)ent).Children)
+                    SceneObjectGroup sog = ent as SceneObjectGroup;
+                    
+                    lock (sog.Children)
                     {
-                        if (subent.Value.LocalId == localID)
+                        foreach (KeyValuePair<UUID, SceneObjectPart> subent in sog.Children)
                         {
-                            objid = subent.Key;
-                            obj = subent.Value;
+                            if (subent.Value.LocalId == localID)
+                            {
+                                objid = subent.Key;
+                                obj = subent.Value;
+                            }
                         }
                     }
                 }
@@ -1830,7 +1884,8 @@ namespace OpenSim.Region.Framework.Scenes
             SceneObjectGroup original = GetGroupByPrim(originalPrimID);
             if (original != null)
             {
-                if (m_parentScene.Permissions.CanDuplicateObject(original.Children.Count, original.UUID, AgentID, original.AbsolutePosition))
+                if (m_parentScene.Permissions.CanDuplicateObject(
+                    original.PrimCount, original.UUID, AgentID, original.AbsolutePosition))
                 {
                     SceneObjectGroup copy = original.Copy(true);
                     copy.AbsolutePosition = copy.AbsolutePosition + offset;
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 9b66fad..5a586d4 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -360,7 +360,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         public int PrimCount
         {
-            get { return m_parts.Count; }
+            get { lock (m_parts) { return m_parts.Count; } }
         }
 
         protected Quaternion m_rotation = Quaternion.Identity;
@@ -398,6 +398,9 @@ namespace OpenSim.Region.Framework.Scenes
 
         /// <value>
         /// The parts of this scene object group.  You must lock this property before using it.
+        /// If you're doing anything other than reading values, please take a copy of the values rather than locking
+        /// the dictionary for the entirety of the operation.  This increases liveness and reduces the danger of deadlock
+        /// If you want to know the number of children, consider using the PrimCount property instead
         /// </value>
         public Dictionary<UUID, SceneObjectPart> Children
         {
@@ -521,7 +524,16 @@ namespace OpenSim.Region.Framework.Scenes
         public override UUID UUID
         {
             get { return m_rootPart.UUID; }
-            set { m_rootPart.UUID = value; }
+            set 
+            { 
+                m_rootPart.UUID = value; 
+                
+                lock (m_parts)
+                {
+                    m_parts.Remove(m_rootPart.UUID);
+                    m_parts.Add(m_rootPart.UUID, m_rootPart);
+                }
+            }
         }
 
         public UUID OwnerID
@@ -742,21 +754,23 @@ namespace OpenSim.Region.Framework.Scenes
             if (m_rootPart.LocalId == 0)
                 m_rootPart.LocalId = m_scene.AllocateLocalId();
 
-            // No need to lock here since the object isn't yet in a scene
-            foreach (SceneObjectPart part in m_parts.Values)
+            lock (m_parts)
             {
-                if (Object.ReferenceEquals(part, m_rootPart))
-                {
-                    continue;
-                }
-
-                if (part.LocalId == 0)
+                foreach (SceneObjectPart part in m_parts.Values)
                 {
-                    part.LocalId = m_scene.AllocateLocalId();
+                    if (Object.ReferenceEquals(part, m_rootPart))
+                    {
+                        continue;
+                    }
+    
+                    if (part.LocalId == 0)
+                    {
+                        part.LocalId = m_scene.AllocateLocalId();
+                    }
+    
+                    part.ParentID = m_rootPart.LocalId;
+                    //m_log.DebugFormat("[SCENE]: Given local id {0} to part {1}, linknum {2}, parent {3} {4}", part.LocalId, part.UUID, part.LinkNum, part.ParentID, part.ParentUUID);
                 }
-
-                part.ParentID = m_rootPart.LocalId;
-                //m_log.DebugFormat("[SCENE]: Given local id {0} to part {1}, linknum {2}, parent {3} {4}", part.LocalId, part.UUID, part.LinkNum, part.ParentID, part.ParentUUID);
             }
             
             ApplyPhysics(m_scene.m_physicalPrim);
@@ -1238,9 +1252,12 @@ namespace OpenSim.Region.Framework.Scenes
                 m_rootPart.AttachedAvatar = agentID;
 
                 //Anakin Lohner bug #3839 
-                foreach (SceneObjectPart p in m_parts.Values)
+                lock (m_parts)
                 {
-                    p.AttachedAvatar = agentID;
+                    foreach (SceneObjectPart p in m_parts.Values)
+                    {
+                        p.AttachedAvatar = agentID;
+                    }
                 }
 
                 if (m_rootPart.PhysActor != null)
@@ -1308,10 +1325,14 @@ namespace OpenSim.Region.Framework.Scenes
 
             AbsolutePosition = detachedpos;
             m_rootPart.AttachedAvatar = UUID.Zero;
-            //Anakin Lohner bug #3839 
-            foreach (SceneObjectPart p in m_parts.Values)
+            
+            //Anakin Lohner bug #3839            
+            lock (m_parts)
             {
-                p.AttachedAvatar = UUID.Zero;
+                foreach (SceneObjectPart p in m_parts.Values)
+                {
+                    p.AttachedAvatar = UUID.Zero;
+                }
             }
 
             m_rootPart.SetParentLocalId(0);
@@ -1337,10 +1358,14 @@ namespace OpenSim.Region.Framework.Scenes
             }
 
             m_rootPart.AttachedAvatar = UUID.Zero;
+            
             //Anakin Lohner bug #3839 
-            foreach (SceneObjectPart p in m_parts.Values)
+            lock (m_parts)
             {
-                p.AttachedAvatar = UUID.Zero;
+                foreach (SceneObjectPart p in m_parts.Values)
+                {
+                    p.AttachedAvatar = UUID.Zero;
+                }
             }
 
             m_rootPart.SetParentLocalId(0);
@@ -1406,9 +1431,8 @@ namespace OpenSim.Region.Framework.Scenes
                 part.ParentID = 0;
             part.LinkNum = 0;
             
-            // No locking required since the SOG should not be in the scene yet - one can't change root parts after
-            // the scene object has been attached to the scene
-            m_parts.Add(m_rootPart.UUID, m_rootPart);
+            lock (m_parts)
+                m_parts.Add(m_rootPart.UUID, m_rootPart);
         }
 
         /// <summary>
@@ -1928,14 +1952,14 @@ namespace OpenSim.Region.Framework.Scenes
         }
 
         /// <summary>
-        ///
+        /// Copy the given part as the root part of this scene object.
         /// </summary>
         /// <param name="part"></param>
         /// <param name="cAgentID"></param>
         /// <param name="cGroupID"></param>
         public void CopyRootPart(SceneObjectPart part, UUID cAgentID, UUID cGroupID, bool userExposed)
         {
-            SetRootPart(part.Copy(m_scene.AllocateLocalId(), OwnerID, GroupID, m_parts.Count, userExposed));
+            SetRootPart(part.Copy(m_scene.AllocateLocalId(), OwnerID, GroupID, 0, userExposed));
         }
 
         public void ScriptSetPhysicsStatus(bool UsePhysics)
@@ -2234,14 +2258,15 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         public void ResetIDs()
         {
-            // As this is only ever called for prims which are not currently part of the scene (and hence
-            // not accessible by clients), there should be no need to lock
-            List<SceneObjectPart> partsList = new List<SceneObjectPart>(m_parts.Values);
-            m_parts.Clear();
-            foreach (SceneObjectPart part in partsList)
+            lock (m_parts)
             {
-                part.ResetIDs(part.LinkNum); // Don't change link nums
-                m_parts.Add(part.UUID, part);
+                List<SceneObjectPart> partsList = new List<SceneObjectPart>(m_parts.Values);
+                m_parts.Clear();
+                foreach (SceneObjectPart part in partsList)
+                {
+                    part.ResetIDs(part.LinkNum); // Don't change link nums
+                    m_parts.Add(part.UUID, part);
+                }
             }
         }
 
@@ -2283,29 +2308,29 @@ namespace OpenSim.Region.Framework.Scenes
             //    return;
 
             lockPartsForRead(true);
-            {
-                bool UsePhysics = ((RootPart.Flags & PrimFlags.Physics) != 0);
 
-                if (UsePhysics && !AbsolutePosition.ApproxEquals(lastPhysGroupPos, 0.02f))
-                {
-                    m_rootPart.UpdateFlag = 1;
-                    lastPhysGroupPos = AbsolutePosition;
-                }
+            bool UsePhysics = ((RootPart.Flags & PrimFlags.Physics) != 0);
 
-                if (UsePhysics && !GroupRotation.ApproxEquals(lastPhysGroupRot, 0.1f))
-                {
-                    m_rootPart.UpdateFlag = 1;
-                    lastPhysGroupRot = GroupRotation;
-                }
+            if (UsePhysics && !AbsolutePosition.ApproxEquals(lastPhysGroupPos, 0.02f))
+            {
+                m_rootPart.UpdateFlag = 1;
+                lastPhysGroupPos = AbsolutePosition;
+            }
 
-                foreach (SceneObjectPart part in m_parts.Values)
-                {
-                    if (!IsSelected)
-                        part.UpdateLookAt();
+            if (UsePhysics && !GroupRotation.ApproxEquals(lastPhysGroupRot, 0.1f))
+            {
+                m_rootPart.UpdateFlag = 1;
+                lastPhysGroupRot = GroupRotation;
+            }
 
-                    part.SendScheduledUpdates();
-                    
-                }
+            List<SceneObjectPart> partList = null;
+            partList = new List<SceneObjectPart>(m_parts.Values);
+                
+            foreach (SceneObjectPart part in partList)
+            {
+                if (!IsSelected)
+                    part.UpdateLookAt();
+                part.SendScheduledUpdates();
             }
             lockPartsForRead(false);
         }
@@ -2479,10 +2504,15 @@ namespace OpenSim.Region.Framework.Scenes
         public SceneObjectPart GetChildPart(UUID primID)
         {
             SceneObjectPart childPart = null;
-            if (m_parts.ContainsKey(primID))
+            
+            lock (m_parts)
             {
-                childPart = m_parts[primID];
+                if (m_parts.ContainsKey(primID))
+                {
+                    childPart = m_parts[primID];
+                }
             }
+            
             return childPart;
         }
 
@@ -2519,9 +2549,10 @@ namespace OpenSim.Region.Framework.Scenes
         /// <returns></returns>
         public bool HasChildPrim(UUID primID)
         {
-            if (m_parts.ContainsKey(primID))
+            lock (m_parts)
             {
-                return true;
+                if (m_parts.ContainsKey(primID))
+                    return true;
             }
 
             return false;
@@ -3132,9 +3163,12 @@ namespace OpenSim.Region.Framework.Scenes
         public void UpdatePermissions(UUID AgentID, byte field, uint localID,
                 uint mask, byte addRemTF)
         {
-            foreach (SceneObjectPart part in m_parts.Values)
-                part.UpdatePermissions(AgentID, field, localID, mask,
-                        addRemTF);
+            List<SceneObjectPart> partList = null;
+            lock (m_parts)
+                partList = new List<SceneObjectPart>(m_parts.Values);
+
+            foreach (SceneObjectPart part in partList)
+                part.UpdatePermissions(AgentID, field, localID, mask, addRemTF);
 
             HasGroupChanged = true;
         }
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 9e52b00..eefe8bb 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -4756,20 +4756,8 @@ namespace OpenSim.Region.Framework.Scenes
             if (ParentGroup == null || ParentGroup.IsDeleted)
                 return;
 
-            Vector3 lPos = OffsetPosition;
-
-            if (IsAttachment)
-            {
-                if (ParentGroup.RootPart != this)
-                    return;
-
-                lPos = ParentGroup.RootPart.AttachedPos;
-            }
-            else
-            {
-                if (ParentGroup.RootPart == this)
-                    lPos = AbsolutePosition;
-            }
+            if (IsAttachment && ParentGroup.RootPart != this)                                    
+                return;
             
             // Causes this thread to dig into the Client Thread Data.
             // Remember your locking here!
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index 8b4f0ed..c5994b2 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -37,6 +37,7 @@ using log4net;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes.Scripting;
+using OpenSim.Region.Framework.Scenes.Serialization;
 
 namespace OpenSim.Region.Framework.Scenes
 {
@@ -722,6 +723,70 @@ namespace OpenSim.Region.Framework.Scenes
             return items;
         }
         
+        public SceneObjectGroup GetRezReadySceneObject(TaskInventoryItem item)
+        {
+            AssetBase rezAsset = m_part.ParentGroup.Scene.AssetService.Get(item.AssetID.ToString());
+
+            if (null == rezAsset)
+            {
+                m_log.WarnFormat(
+                    "[PRIM INVENTORY]: Could not find asset {0} for inventory item {1} in {2}", 
+                    item.AssetID, item.Name, m_part.Name);
+                return null;
+            }
+
+            string xmlData = Utils.BytesToString(rezAsset.Data);
+            SceneObjectGroup group = SceneObjectSerializer.FromOriginalXmlFormat(xmlData);
+
+            group.ResetIDs();
+
+            SceneObjectPart rootPart = group.GetChildPart(group.UUID);
+
+            // Since renaming the item in the inventory does not affect the name stored
+            // in the serialization, transfer the correct name from the inventory to the
+            // object itself before we rez.
+            rootPart.Name = item.Name;
+            rootPart.Description = item.Description;
+
+            List<SceneObjectPart> partList = null;
+            
+            lock (group.Children)
+                partList = new List<SceneObjectPart>(group.Children.Values);
+
+            group.SetGroup(m_part.GroupID, null);
+
+            if ((rootPart.OwnerID != item.OwnerID) || (item.CurrentPermissions & 16) != 0)
+            {
+                if (m_part.ParentGroup.Scene.Permissions.PropagatePermissions())
+                {
+                    foreach (SceneObjectPart part in partList)
+                    {
+                        part.EveryoneMask = item.EveryonePermissions;
+                        part.NextOwnerMask = item.NextPermissions;
+                    }
+                    
+                    group.ApplyNextOwnerPermissions();
+                }
+            }
+
+            foreach (SceneObjectPart part in partList)
+            {
+                if ((part.OwnerID != item.OwnerID) || (item.CurrentPermissions & 16) != 0)
+                {
+                    part.LastOwnerID = part.OwnerID;
+                    part.OwnerID = item.OwnerID;
+                    part.Inventory.ChangeInventoryOwner(item.OwnerID);
+                }
+                
+                part.EveryoneMask = item.EveryonePermissions;
+                part.NextOwnerMask = item.NextPermissions;
+            }
+            
+            rootPart.TrimPermissions(); 
+            
+            return group;
+        }
+        
         /// <summary>
         /// Update an existing inventory item.
         /// </summary>
@@ -1197,6 +1262,5 @@ namespace OpenSim.Region.Framework.Scenes
 
             Items.LockItemsForRead(false);
         }
-
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 02e60f8..cd80eb0 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2668,15 +2668,15 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 m_perfMonMS = Util.EnvironmentTickCount();
 
-                PhysicsActor actor = m_physicsActor;
-                Vector3 velocity = (actor != null) ? actor.Velocity : Vector3.Zero;
-
                 Vector3 pos = m_pos;
                 pos.Z += m_appearance.HipOffset;
 
                 //m_log.DebugFormat("[SCENEPRESENCE]: TerseUpdate: Pos={0} Rot={1} Vel={2}", m_pos, m_bodyRot, m_velocity);
 
-                remoteClient.SendPrimUpdate(this, PrimUpdateFlags.Position | PrimUpdateFlags.Rotation | PrimUpdateFlags.Velocity | PrimUpdateFlags.Acceleration | PrimUpdateFlags.AngularVelocity);
+                remoteClient.SendPrimUpdate(
+                    this, 
+                    PrimUpdateFlags.Position | PrimUpdateFlags.Rotation | PrimUpdateFlags.Velocity 
+                    | PrimUpdateFlags.Acceleration | PrimUpdateFlags.AngularVelocity);
 
                 m_scene.StatsReporter.AddAgentTime(Util.EnvironmentTickCountSubtract(m_perfMonMS));
                 m_scene.StatsReporter.AddAgentUpdates(1);
diff --git a/OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs b/OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs
index fc66c85..3e2a2af 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs
@@ -134,7 +134,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             sop.Text = RandomName();
             sop.SitName = RandomName();
             sop.TouchName = RandomName();
-            sop.ObjectFlags |= (uint)PrimFlags.Phantom;
+            sop.Flags |= PrimFlags.Phantom;
 
             SceneObjectGroup sog = new SceneObjectGroup(sop);
             scene.AddNewSceneObject(sog, false);
diff --git a/OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs b/OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs
new file mode 100644
index 0000000..da8199d
--- /dev/null
+++ b/OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs
@@ -0,0 +1,143 @@
+/*
+ * 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 System.Text;
+using System.Threading;
+using System.Timers;
+using Timer=System.Timers.Timer;
+using Nini.Config;
+using NUnit.Framework;
+using NUnit.Framework.SyntaxHelpers;
+using OpenMetaverse;
+using OpenMetaverse.Assets;
+using OpenSim.Framework;
+using OpenSim.Framework.Communications;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.CoreModules.Avatar.Inventory.Archiver;
+using OpenSim.Region.CoreModules.World.Serialiser;
+using OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation;
+using OpenSim.Services.Interfaces;
+using OpenSim.Tests.Common;
+using OpenSim.Tests.Common.Mock;
+using OpenSim.Tests.Common.Setup;
+
+namespace OpenSim.Region.Framework.Tests
+{
+    [TestFixture]
+    public class TaskInventoryTests
+    {
+        protected UserAccount CreateUser(Scene scene)
+        {
+            string userFirstName = "Jock";
+            string userLastName = "Stirrup";
+            string userPassword = "troll";
+            UUID userId = UUID.Parse("00000000-0000-0000-0000-000000000020");            
+            return UserProfileTestUtils.CreateUserWithInventory(scene, userFirstName, userLastName, userId, userPassword);            
+        }
+        
+        protected SceneObjectGroup CreateSO1(Scene scene, UUID ownerId)
+        {
+            string part1Name = "part1";
+            UUID part1Id = UUID.Parse("10000000-0000-0000-0000-000000000000");
+            SceneObjectPart part1
+                = new SceneObjectPart(ownerId, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero) 
+                    { Name = part1Name, UUID = part1Id };
+            return new SceneObjectGroup(part1);            
+        }
+        
+        protected TaskInventoryItem CreateSOItem1(Scene scene, SceneObjectPart part)
+        {
+            AssetNotecard nc = new AssetNotecard("Hello World!");
+            UUID ncAssetUuid = new UUID("00000000-0000-0000-1000-000000000000");
+            UUID ncItemUuid = new UUID("00000000-0000-0000-1100-000000000000");            
+            AssetBase ncAsset 
+                = AssetHelpers.CreateAsset(ncAssetUuid, AssetType.Notecard, nc.AssetData, UUID.Zero);
+            scene.AssetService.Store(ncAsset);
+            TaskInventoryItem ncItem 
+                = new TaskInventoryItem 
+                    { Name = "ncItem", AssetID = ncAssetUuid, ItemID = ncItemUuid, 
+                      Type = (int)AssetType.Notecard, InvType = (int)InventoryType.Notecard };
+            part.Inventory.AddInventoryItem(ncItem, true); 
+            
+            return ncItem;
+        }
+        
+        /// <summary>
+        /// Test MoveTaskInventoryItem where the item has no parent folder assigned.
+        /// </summary>
+        /// This should place it in the most suitable user folder.
+        [Test]
+        public void TestMoveTaskInventoryItem()
+        {
+            TestHelper.InMethod();
+//            log4net.Config.XmlConfigurator.Configure();
+            
+            Scene scene = SceneSetupHelpers.SetupScene("inventory");
+            UserAccount user1 = CreateUser(scene);
+            SceneObjectGroup sog1 = CreateSO1(scene, user1.PrincipalID);
+            SceneObjectPart sop1 = sog1.RootPart;
+            TaskInventoryItem sopItem1 = CreateSOItem1(scene, sop1);
+            InventoryFolderBase folder 
+                = InventoryArchiveUtils.FindFolderByPath(scene.InventoryService, user1.PrincipalID, "Objects")[0];
+            
+            // Perform test
+            scene.MoveTaskInventoryItem(user1.PrincipalID, folder.ID, sop1, sopItem1.ItemID);
+                
+            InventoryItemBase ncUserItem
+                = InventoryArchiveUtils.FindItemByPath(scene.InventoryService, user1.PrincipalID, "Objects/ncItem");            
+            Assert.That(ncUserItem, Is.Not.Null, "Objects/ncItem was not found");
+        }        
+        
+        /// <summary>
+        /// Test MoveTaskInventoryItem where the item has no parent folder assigned.
+        /// </summary>
+        /// This should place it in the most suitable user folder.
+        [Test]
+        public void TestMoveTaskInventoryItemNoParent()
+        {
+            TestHelper.InMethod();
+//            log4net.Config.XmlConfigurator.Configure();
+            
+            Scene scene = SceneSetupHelpers.SetupScene("inventory");
+            UserAccount user1 = CreateUser(scene);
+            SceneObjectGroup sog1 = CreateSO1(scene, user1.PrincipalID);
+            SceneObjectPart sop1 = sog1.RootPart;
+            TaskInventoryItem sopItem1 = CreateSOItem1(scene, sop1);
+            
+            // Perform test
+            scene.MoveTaskInventoryItem(user1.PrincipalID, UUID.Zero, sop1, sopItem1.ItemID);
+                
+            InventoryItemBase ncUserItem
+                = InventoryArchiveUtils.FindItemByPath(scene.InventoryService, user1.PrincipalID, "Notecards/ncItem");            
+            Assert.That(ncUserItem, Is.Not.Null, "Notecards/ncItem was not found");
+        }
+    }
+}
\ No newline at end of file
diff --git a/OpenSim/Region/OptionalModules/ContentManagementSystem/CMEntityCollection.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/CMEntityCollection.cs
index 56656fc..de1e01c 100644
--- a/OpenSim/Region/OptionalModules/ContentManagementSystem/CMEntityCollection.cs
+++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/CMEntityCollection.cs
@@ -121,16 +121,19 @@ namespace OpenSim.Region.OptionalModules.ContentManagement
                     continue;
                 temp = (SceneObjectGroup) currObj;
 
-                if (m_CMEntityHash.ContainsKey(temp.UUID))
+                lock (temp.Children)
                 {
-                    foreach (SceneObjectPart part in temp.Children.Values)
-                        if (!((ContentManagementEntity)m_CMEntityHash[temp.UUID]).HasChildPrim(part.UUID))
+                    if (m_CMEntityHash.ContainsKey(temp.UUID))
+                    {
+                        foreach (SceneObjectPart part in temp.Children.Values)
+                            if (!((ContentManagementEntity)m_CMEntityHash[temp.UUID]).HasChildPrim(part.UUID))
+                                missingList.Add(part);
+                    }
+                    else //Entire group is missing from revision. (and is a new part in region)
+                    {
+                        foreach (SceneObjectPart part in temp.Children.Values)
                             missingList.Add(part);
-                }
-                else //Entire group is missing from revision. (and is a new part in region)
-                {
-                    foreach (SceneObjectPart part in temp.Children.Values)
-                        missingList.Add(part);
+                    }
                 }
             }
             return missingList;
diff --git a/OpenSim/Region/OptionalModules/ContentManagementSystem/CMModel.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/CMModel.cs
index 0dc78c0..e5fcb54 100644
--- a/OpenSim/Region/OptionalModules/ContentManagementSystem/CMModel.cs
+++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/CMModel.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) Contributors, http://opensimulator.org/
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
@@ -167,9 +167,12 @@ namespace OpenSim.Region.OptionalModules.ContentManagement
         public void RemoveOrUpdateDeletedEntity(SceneObjectGroup group)
         {
             // Deal with new parts not revisioned that have been deleted.
-            foreach (SceneObjectPart part in group.Children.Values)
-                if (m_MetaEntityCollection.Auras.ContainsKey(part.UUID))
-                    m_MetaEntityCollection.RemoveNewlyCreatedEntityAura(part.UUID);
+            lock (group.Children)
+            {
+                foreach (SceneObjectPart part in group.Children.Values)
+                    if (m_MetaEntityCollection.Auras.ContainsKey(part.UUID))
+                        m_MetaEntityCollection.RemoveNewlyCreatedEntityAura(part.UUID);
+            }
         }
 
         /// <summary>
@@ -207,8 +210,13 @@ namespace OpenSim.Region.OptionalModules.ContentManagement
                 {
                     temp = SceneObjectSerializer.FromXml2Format(xml);
                     temp.SetScene(scene);
-                    foreach (SceneObjectPart part in temp.Children.Values)
-                        part.RegionHandle = scene.RegionInfo.RegionHandle;
+                    
+                    lock (temp.Children)
+                    {
+                        foreach (SceneObjectPart part in temp.Children.Values)
+                            part.RegionHandle = scene.RegionInfo.RegionHandle;
+                    }
+                    
                     ReplacementList.Add(temp.UUID, (EntityBase)temp);
                 }
                 catch (Exception e)
@@ -338,15 +346,20 @@ namespace OpenSim.Region.OptionalModules.ContentManagement
             System.Collections.ArrayList auraList = new System.Collections.ArrayList();
             if (group == null)
                 return null;
-            foreach (SceneObjectPart part in group.Children.Values)
+            
+            lock (group.Children)
             {
-                if (m_MetaEntityCollection.Auras.ContainsKey(part.UUID))
+                foreach (SceneObjectPart part in group.Children.Values)
                 {
-                    ((AuraMetaEntity)m_MetaEntityCollection.Auras[part.UUID]).SetAura(new Vector3(0,254,0), part.Scale);
-                    ((AuraMetaEntity)m_MetaEntityCollection.Auras[part.UUID]).RootPart.GroupPosition = part.GetWorldPosition();
-                    auraList.Add((AuraMetaEntity)m_MetaEntityCollection.Auras[part.UUID]);
+                    if (m_MetaEntityCollection.Auras.ContainsKey(part.UUID))
+                    {
+                        ((AuraMetaEntity)m_MetaEntityCollection.Auras[part.UUID]).SetAura(new Vector3(0,254,0), part.Scale);
+                        ((AuraMetaEntity)m_MetaEntityCollection.Auras[part.UUID]).RootPart.GroupPosition = part.GetWorldPosition();
+                        auraList.Add((AuraMetaEntity)m_MetaEntityCollection.Auras[part.UUID]);
+                    }
                 }
             }
+            
             return auraList;
         }
 
diff --git a/OpenSim/Region/OptionalModules/ContentManagementSystem/CMView.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/CMView.cs
index 46fbd39..f75f40a 100644
--- a/OpenSim/Region/OptionalModules/ContentManagementSystem/CMView.cs
+++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/CMView.cs
@@ -186,9 +186,12 @@ namespace OpenSim.Region.OptionalModules.ContentManagement
                 ((ContentManagementEntity)m_model.MetaEntityCollection.Entities[group.UUID]).SendFullDiffUpdateToAll();
 
             // Deal with new parts not revisioned that have been deleted.
-            foreach (SceneObjectPart part in group.Children.Values)
-                if (m_model.MetaEntityCollection.Auras.ContainsKey(part.UUID))
-                    ((AuraMetaEntity)m_model.MetaEntityCollection.Auras[part.UUID]).HideFromAll();
+            lock (group.Children)
+            {
+                foreach (SceneObjectPart part in group.Children.Values)
+                    if (m_model.MetaEntityCollection.Auras.ContainsKey(part.UUID))
+                        ((AuraMetaEntity)m_model.MetaEntityCollection.Auras[part.UUID]).HideFromAll();
+            }
         }
 
         public void SendMetaEntitiesToNewClient(IClientAPI client)
diff --git a/OpenSim/Region/OptionalModules/ContentManagementSystem/ContentManagementEntity.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/ContentManagementEntity.cs
index ada6701..2730eee 100644
--- a/OpenSim/Region/OptionalModules/ContentManagementSystem/ContentManagementEntity.cs
+++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/ContentManagementEntity.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) Contributors, http://opensimulator.org/
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
@@ -132,30 +132,33 @@ namespace OpenSim.Region.OptionalModules.ContentManagement
             // if group is not contained in scene's list
             if (!ContainsKey(sceneEntityList, m_UnchangedEntity.UUID))
             {
-                foreach (SceneObjectPart part in m_UnchangedEntity.Children.Values)
+                lock (m_UnchangedEntity.Children)
                 {
-                    // if scene list no longer contains this part, display translucent part and mark with red aura
-                    if (!ContainsKey(sceneEntityList, part.UUID))
+                    foreach (SceneObjectPart part in m_UnchangedEntity.Children.Values)
                     {
-                        // if already displaying a red aura over part, make sure its red
-                        if (m_AuraEntities.ContainsKey(part.UUID))
-                        {
-                            m_AuraEntities[part.UUID].SetAura(new Vector3(254,0,0), part.Scale);
-                        }
-                        else
+                        // if scene list no longer contains this part, display translucent part and mark with red aura
+                        if (!ContainsKey(sceneEntityList, part.UUID))
                         {
-                            AuraMetaEntity auraGroup = new AuraMetaEntity(m_Entity.Scene,
-                                                                          part.GetWorldPosition(),
-                                                                          MetaEntity.TRANSLUCENT,
-                                                                          new Vector3(254,0,0),
-                                                                          part.Scale
-                                                                          );
-                            m_AuraEntities.Add(part.UUID, auraGroup);
+                            // if already displaying a red aura over part, make sure its red
+                            if (m_AuraEntities.ContainsKey(part.UUID))
+                            {
+                                m_AuraEntities[part.UUID].SetAura(new Vector3(254,0,0), part.Scale);
+                            }
+                            else
+                            {
+                                AuraMetaEntity auraGroup = new AuraMetaEntity(m_Entity.Scene,
+                                                                              part.GetWorldPosition(),
+                                                                              MetaEntity.TRANSLUCENT,
+                                                                              new Vector3(254,0,0),
+                                                                              part.Scale
+                                                                              );
+                                m_AuraEntities.Add(part.UUID, auraGroup);
+                            }
+                            SceneObjectPart metaPart = m_Entity.GetLinkNumPart(part.LinkNum);
+                            SetPartTransparency(metaPart, MetaEntity.TRANSLUCENT);
                         }
-                        SceneObjectPart metaPart = m_Entity.GetLinkNumPart(part.LinkNum);
-                        SetPartTransparency(metaPart, MetaEntity.TRANSLUCENT);
+                        // otherwise, scene will not contain the part. note: a group can not remove a part without changing group id
                     }
-                    // otherwise, scene will not contain the part. note: a group can not remove a part without changing group id
                 }
 
                 // a deleted part has no where to point a beam particle system,
@@ -180,8 +183,10 @@ namespace OpenSim.Region.OptionalModules.ContentManagement
         /// </summary>
         public bool HasChildPrim(UUID uuid)
         {
-            if (m_UnchangedEntity.Children.ContainsKey(uuid))
-                return true;
+            lock (m_UnchangedEntity.Children)
+                if (m_UnchangedEntity.Children.ContainsKey(uuid))
+                    return true;
+            
             return false;
         }
 
@@ -190,9 +195,13 @@ namespace OpenSim.Region.OptionalModules.ContentManagement
         /// </summary>
         public bool HasChildPrim(uint localID)
         {
-            foreach (SceneObjectPart part in m_UnchangedEntity.Children.Values)
-                if (part.LocalId == localID)
-                    return true;
+            lock (m_UnchangedEntity.Children)
+            {
+                foreach (SceneObjectPart part in m_UnchangedEntity.Children.Values)
+                    if (part.LocalId == localID)
+                        return true;
+            }
+            
             return false;
         }
 
@@ -228,37 +237,72 @@ namespace OpenSim.Region.OptionalModules.ContentManagement
             // Use "UnchangedEntity" to do comparisons because its text, transparency, and other attributes will be just as the user
             // had originally saved.
             // m_Entity will NOT necessarily be the same entity as the user had saved.
-            foreach (SceneObjectPart UnchangedPart in m_UnchangedEntity.Children.Values)
+            lock (m_UnchangedEntity.Children)
             {
-                //This is the part that we use to show changes.
-                metaEntityPart = m_Entity.GetLinkNumPart(UnchangedPart.LinkNum);
-                if (sceneEntityGroup.Children.ContainsKey(UnchangedPart.UUID))
+                foreach (SceneObjectPart UnchangedPart in m_UnchangedEntity.Children.Values)
                 {
-                    sceneEntityPart = sceneEntityGroup.Children[UnchangedPart.UUID];
-                    differences = Difference.FindDifferences(UnchangedPart,  sceneEntityPart);
-                    if (differences != Diff.NONE)
-                        metaEntityPart.Text = "CHANGE: " + differences.ToString();
-                    if (differences != 0)
+                    //This is the part that we use to show changes.
+                    metaEntityPart = m_Entity.GetLinkNumPart(UnchangedPart.LinkNum);
+                    if (sceneEntityGroup.Children.ContainsKey(UnchangedPart.UUID))
                     {
-                        // Root Part that has been modified
-                        if ((differences&Diff.POSITION) > 0)
+                        sceneEntityPart = sceneEntityGroup.Children[UnchangedPart.UUID];
+                        differences = Difference.FindDifferences(UnchangedPart,  sceneEntityPart);
+                        if (differences != Diff.NONE)
+                            metaEntityPart.Text = "CHANGE: " + differences.ToString();
+                        if (differences != 0)
+                        {
+                            // Root Part that has been modified
+                            if ((differences&Diff.POSITION) > 0)
+                            {
+                                // If the position of any part has changed, make sure the RootPart of the
+                                // meta entity is pointing with a beam particle system
+                                if (m_BeamEntities.ContainsKey(m_UnchangedEntity.RootPart.UUID))
+                                {
+                                    m_BeamEntities[m_UnchangedEntity.RootPart.UUID].HideFromAll();
+                                    m_BeamEntities.Remove(m_UnchangedEntity.RootPart.UUID);
+                                }
+                                BeamMetaEntity beamGroup = new BeamMetaEntity(m_Entity.Scene,
+                                                                              m_UnchangedEntity.RootPart.GetWorldPosition(),
+                                                                              MetaEntity.TRANSLUCENT,
+                                                                              sceneEntityPart,
+                                                                              new Vector3(0,0,254)
+                                                                              );
+                                m_BeamEntities.Add(m_UnchangedEntity.RootPart.UUID, beamGroup);
+                            }
+    
+                            if (m_AuraEntities.ContainsKey(UnchangedPart.UUID))
+                            {
+                                m_AuraEntities[UnchangedPart.UUID].HideFromAll();
+                                m_AuraEntities.Remove(UnchangedPart.UUID);
+                            }
+                            AuraMetaEntity auraGroup = new AuraMetaEntity(m_Entity.Scene,
+                                                                          UnchangedPart.GetWorldPosition(),
+                                                                          MetaEntity.TRANSLUCENT,
+                                                                          new Vector3(0,0,254),
+                                                                          UnchangedPart.Scale
+                                                                          );
+                            m_AuraEntities.Add(UnchangedPart.UUID, auraGroup);
+                            SetPartTransparency(metaEntityPart, MetaEntity.TRANSLUCENT);
+    
+                            DiffersFromSceneGroup = true;
+                        }
+                        else // no differences between scene part and meta part
                         {
-                            // If the position of any part has changed, make sure the RootPart of the
-                            // meta entity is pointing with a beam particle system
                             if (m_BeamEntities.ContainsKey(m_UnchangedEntity.RootPart.UUID))
                             {
                                 m_BeamEntities[m_UnchangedEntity.RootPart.UUID].HideFromAll();
                                 m_BeamEntities.Remove(m_UnchangedEntity.RootPart.UUID);
                             }
-                            BeamMetaEntity beamGroup = new BeamMetaEntity(m_Entity.Scene,
-                                                                          m_UnchangedEntity.RootPart.GetWorldPosition(),
-                                                                          MetaEntity.TRANSLUCENT,
-                                                                          sceneEntityPart,
-                                                                          new Vector3(0,0,254)
-                                                                          );
-                            m_BeamEntities.Add(m_UnchangedEntity.RootPart.UUID, beamGroup);
+                            if (m_AuraEntities.ContainsKey(UnchangedPart.UUID))
+                            {
+                                m_AuraEntities[UnchangedPart.UUID].HideFromAll();
+                                m_AuraEntities.Remove(UnchangedPart.UUID);
+                            }
+                            SetPartTransparency(metaEntityPart, MetaEntity.NONE);
                         }
-
+                    }
+                    else  //The entity currently in the scene is missing parts from the metaentity saved, so mark parts red as deleted.
+                    {
                         if (m_AuraEntities.ContainsKey(UnchangedPart.UUID))
                         {
                             m_AuraEntities[UnchangedPart.UUID].HideFromAll();
@@ -267,48 +311,17 @@ namespace OpenSim.Region.OptionalModules.ContentManagement
                         AuraMetaEntity auraGroup = new AuraMetaEntity(m_Entity.Scene,
                                                                       UnchangedPart.GetWorldPosition(),
                                                                       MetaEntity.TRANSLUCENT,
-                                                                      new Vector3(0,0,254),
+                                                                      new Vector3(254,0,0),
                                                                       UnchangedPart.Scale
                                                                       );
                         m_AuraEntities.Add(UnchangedPart.UUID, auraGroup);
                         SetPartTransparency(metaEntityPart, MetaEntity.TRANSLUCENT);
-
+                       
                         DiffersFromSceneGroup = true;
                     }
-                    else // no differences between scene part and meta part
-                    {
-                        if (m_BeamEntities.ContainsKey(m_UnchangedEntity.RootPart.UUID))
-                        {
-                            m_BeamEntities[m_UnchangedEntity.RootPart.UUID].HideFromAll();
-                            m_BeamEntities.Remove(m_UnchangedEntity.RootPart.UUID);
-                        }
-                        if (m_AuraEntities.ContainsKey(UnchangedPart.UUID))
-                        {
-                            m_AuraEntities[UnchangedPart.UUID].HideFromAll();
-                            m_AuraEntities.Remove(UnchangedPart.UUID);
-                        }
-                        SetPartTransparency(metaEntityPart, MetaEntity.NONE);
-                    }
-                }
-                else  //The entity currently in the scene is missing parts from the metaentity saved, so mark parts red as deleted.
-                {
-                    if (m_AuraEntities.ContainsKey(UnchangedPart.UUID))
-                    {
-                        m_AuraEntities[UnchangedPart.UUID].HideFromAll();
-                        m_AuraEntities.Remove(UnchangedPart.UUID);
-                    }
-                    AuraMetaEntity auraGroup = new AuraMetaEntity(m_Entity.Scene,
-                                                                  UnchangedPart.GetWorldPosition(),
-                                                                  MetaEntity.TRANSLUCENT,
-                                                                  new Vector3(254,0,0),
-                                                                  UnchangedPart.Scale
-                                                                  );
-                    m_AuraEntities.Add(UnchangedPart.UUID, auraGroup);
-                    SetPartTransparency(metaEntityPart, MetaEntity.TRANSLUCENT);
-                   
-                    DiffersFromSceneGroup = true;
                 }
             }
+            
             return changed;
         }
 
diff --git a/OpenSim/Region/OptionalModules/ContentManagementSystem/MetaEntity.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/MetaEntity.cs
index 841ee00..796f437 100644
--- a/OpenSim/Region/OptionalModules/ContentManagementSystem/MetaEntity.cs
+++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/MetaEntity.cs
@@ -150,15 +150,19 @@ namespace OpenSim.Region.OptionalModules.ContentManagement
         {
             //make new uuids
             Dictionary<UUID, SceneObjectPart> parts = new Dictionary<UUID, SceneObjectPart>();
-            foreach (SceneObjectPart part in m_Entity.Children.Values)
+            
+            lock (m_Entity.Children)
             {
-                part.ResetIDs(part.LinkNum);
-                parts.Add(part.UUID, part);
+                foreach (SceneObjectPart part in m_Entity.Children.Values)
+                {
+                    part.ResetIDs(part.LinkNum);
+                    parts.Add(part.UUID, part);
+                }
+                
+                //finalize
+                m_Entity.RootPart.PhysActor = null;
+                m_Entity.Children = parts;                
             }
-
-            //finalize
-            m_Entity.RootPart.PhysActor = null;
-            m_Entity.Children = parts;
         }
 
         #endregion Protected Methods
@@ -173,8 +177,11 @@ namespace OpenSim.Region.OptionalModules.ContentManagement
             //This deletes the group without removing from any databases.
             //This is important because we are not IN any database.
             //m_Entity.FakeDeleteGroup();
-            foreach (SceneObjectPart part in m_Entity.Children.Values)
-                client.SendKillObject(m_Entity.RegionHandle, part.LocalId);
+            lock (m_Entity.Children)
+            {
+                foreach (SceneObjectPart part in m_Entity.Children.Values)
+                    client.SendKillObject(m_Entity.RegionHandle, part.LocalId);
+            }
         }
 
         /// <summary>
@@ -182,12 +189,15 @@ namespace OpenSim.Region.OptionalModules.ContentManagement
         /// </summary>
         public virtual void HideFromAll()
         {
-            foreach (SceneObjectPart part in m_Entity.Children.Values)
+            lock (m_Entity.Children)
             {
-                m_Entity.Scene.ForEachClient(
-                    delegate(IClientAPI controller)
-                    { controller.SendKillObject(m_Entity.RegionHandle, part.LocalId); }
-                );
+                foreach (SceneObjectPart part in m_Entity.Children.Values)
+                {
+                    m_Entity.Scene.ForEachClient(
+                        delegate(IClientAPI controller)
+                        { controller.SendKillObject(m_Entity.RegionHandle, part.LocalId); }
+                    );
+                }
             }
         }
 
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs
index 96cccb7..c439e3e 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs
@@ -185,14 +185,21 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
             get
             {
                 SceneObjectPart my = GetSOP();
-                int total = my.ParentGroup.Children.Count;
+                IObject[] rets = null;
 
-                IObject[] rets = new IObject[total];
+                int total = my.ParentGroup.PrimCount;
+
+                rets = new IObject[total];
 
                 int i = 0;
-                foreach (KeyValuePair<UUID, SceneObjectPart> pair in my.ParentGroup.Children)
+                    
+                List<SceneObjectPart> partList = null;
+                lock (my.ParentGroup.Children)
+                    partList = new List<SceneObjectPart>(my.ParentGroup.Children.Values);
+                    
+                foreach (SceneObjectPart part in partList)
                 {
-                    rets[i++] = new SOPObject(m_rootScene, pair.Value.LocalId, m_security);
+                    rets[i++] = new SOPObject(m_rootScene, part.LocalId, m_security);
                 }
 
                 return rets;
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 94b9d40..512957d 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -293,7 +293,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             {
             case ScriptBaseClass.LINK_SET:
                 if (m_host.ParentGroup != null)
-                    return new List<SceneObjectPart>(m_host.ParentGroup.Children.Values);
+                {
+                    lock (m_host.ParentGroup.Children)
+                        return new List<SceneObjectPart>(m_host.ParentGroup.Children.Values);
+                }
                 return ret;
 
             case ScriptBaseClass.LINK_ROOT:
@@ -308,7 +311,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             case ScriptBaseClass.LINK_ALL_OTHERS:
                 if (m_host.ParentGroup ==  null)
                     return new List<SceneObjectPart>();
-                ret = new List<SceneObjectPart>(m_host.ParentGroup.Children.Values);
+                
+                lock (m_host.ParentGroup.Children)
+                    ret = new List<SceneObjectPart>(m_host.ParentGroup.Children.Values);
+                
                 if (ret.Contains(m_host))
                     ret.Remove(m_host);
                 return ret;
@@ -316,7 +322,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             case ScriptBaseClass.LINK_ALL_CHILDREN:
                 if (m_host.ParentGroup ==  null)
                     return new List<SceneObjectPart>();
-                ret = new List<SceneObjectPart>(m_host.ParentGroup.Children.Values);
+                
+                lock (m_host.ParentGroup.Children)
+                    ret = new List<SceneObjectPart>(m_host.ParentGroup.Children.Values);
+                
                 if (ret.Contains(m_host.ParentGroup.RootPart))
                     ret.Remove(m_host.ParentGroup.RootPart);
                 return ret;
@@ -1272,12 +1281,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     if (group == null)
                         return;
                     bool allow = true;
-                    foreach (SceneObjectPart part in group.Children.Values)
+                    
+                    lock (group.Children)
                     {
-                        if (part.Scale.X > World.m_maxPhys || part.Scale.Y > World.m_maxPhys || part.Scale.Z > World.m_maxPhys)
+                        foreach (SceneObjectPart part in group.Children.Values)
                         {
-                            allow = false;
-                            break;
+                            if (part.Scale.X > World.m_maxPhys || part.Scale.Y > World.m_maxPhys || part.Scale.Z > World.m_maxPhys)
+                            {
+                                allow = false;
+                                break;
+                            }
                         }
                     }
 
@@ -2120,7 +2133,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
             if (part.ParentGroup.RootPart == part)
             {
-                if ((targetPos.z < ground) && disable_underground_movement)
+                if ((targetPos.z < ground) && disable_underground_movement && m_host.AttachmentPoint == 0)
                     targetPos.z = ground;
                 SceneObjectGroup parent = part.ParentGroup;
                 LSL_Vector real_vec = SetPosAdjust(currentPos, targetPos);
@@ -2152,18 +2165,27 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         protected LSL_Vector GetPartLocalPos(SceneObjectPart part)
         {
             m_host.AddScriptLPS(1);
-            if (part.ParentID != 0)
-            {
-                return new LSL_Vector(part.OffsetPosition.X,
-                                      part.OffsetPosition.Y,
-                                      part.OffsetPosition.Z);
-            }
-            else
+            if (part.ParentID == 0)
             {
                 return new LSL_Vector(part.AbsolutePosition.X,
                                       part.AbsolutePosition.Y,
                                       part.AbsolutePosition.Z);
             }
+            else
+            {
+                if (m_host.IsRoot)
+                {
+                    return new LSL_Vector(m_host.AttachedPos.X,
+                                          m_host.AttachedPos.Y,
+                                          m_host.AttachedPos.Z);
+                }
+                else
+                {
+                    return new LSL_Vector(part.OffsetPosition.X,
+                                          part.OffsetPosition.Y,
+                                          part.OffsetPosition.Z);
+                }
+            }
         }
 
         public void llSetRot(LSL_Rotation rot)
@@ -3748,7 +3770,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         {
             m_host.AddScriptLPS(1);
 
-            if (m_host.ParentGroup.Children.Count > 1)
+            if (m_host.ParentGroup.PrimCount > 1)
             {
                 return m_host.LinkNum;
             }
@@ -3869,15 +3891,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 case ScriptBaseClass.LINK_ALL_OTHERS:
                 case ScriptBaseClass.LINK_ALL_CHILDREN:
                 case ScriptBaseClass.LINK_THIS:
-                    foreach (SceneObjectPart part in parentPrim.Children.Values)
+                    lock (parentPrim.Children)
                     {
-                        if (part.UUID != m_host.UUID)
+                        foreach (SceneObjectPart part in parentPrim.Children.Values)
                         {
-                            childPrim = part;
-                            break;
+                            if (part.UUID != m_host.UUID)
+                            {
+                                childPrim = part;
+                                break;
+                            }
                         }
+                        break;
                     }
-                    break;
                 default:
                     childPrim = parentPrim.GetLinkNumPart(linknum);
                     if (childPrim.UUID == m_host.UUID)
@@ -3953,26 +3978,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             if (parentPrim.RootPart.AttachmentPoint != 0)
                 return; // Fail silently if attached
 
-            List<SceneObjectPart> parts = new List<SceneObjectPart>(parentPrim.Children.Values);
-            parts.Remove(parentPrim.RootPart);
-            if (parts.Count > 0)
+            lock (parentPrim.Children)
             {
-                try
-                {
-                    parts[0].ParentGroup.areUpdatesSuspended = true;
-                    foreach (SceneObjectPart part in parts)
-                    {
-                        parentPrim.DelinkFromGroup(part.LocalId, true);
-                        parentPrim.TriggerScriptChangedEvent(Changed.LINK);
-                    }
-                }
-                finally
+                List<SceneObjectPart> parts = new List<SceneObjectPart>(parentPrim.Children.Values);
+                parts.Remove(parentPrim.RootPart);
+    
+                foreach (SceneObjectPart part in parts)
                 {
-                    parts[0].ParentGroup.areUpdatesSuspended = false;
+                    parentPrim.DelinkFromGroup(part.LocalId, true);
+                    parentPrim.TriggerScriptChangedEvent(Changed.LINK);
                 }
+                parentPrim.HasGroupChanged = true;
+                parentPrim.ScheduleGroupForFullUpdate();
             }
-            parentPrim.HasGroupChanged = true;
-            parentPrim.ScheduleGroupForFullUpdate();
         }
 
         public LSL_String llGetLinkKey(int linknum)
@@ -4179,8 +4197,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 }
 
                 // destination is an avatar
-                InventoryItemBase agentItem =
-                        World.MoveTaskInventoryItem(destId, UUID.Zero, m_host, objId);
+                InventoryItemBase agentItem = World.MoveTaskInventoryItem(destId, UUID.Zero, m_host, objId);
 
                 if (agentItem == null)
                     return;
@@ -4190,7 +4207,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 byte[] objBytes = agentItem.ID.GetBytes();
                 Array.Copy(objBytes, 0, bucket, 1, 16);
 
-                Console.WriteLine("Giving inventory");
                 GridInstantMessage msg = new GridInstantMessage(World,
                         m_host.UUID, m_host.Name+", an object owned by "+
                         resolveName(m_host.OwnerID)+",", destId,
@@ -4538,7 +4554,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     {
                         partItemID = item.ItemID;
                         int linkNumber = m_host.LinkNum;
-                        if (m_host.ParentGroup.Children.Count == 1)
+                        if (m_host.ParentGroup.PrimCount == 1)
                             linkNumber = 0;
 
                         object[] resobj = new object[]
@@ -9595,8 +9611,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     // we send to all
                     landData.MediaID = new UUID(texture);
                     landData.MediaAutoScale = autoAlign ? (byte)1 : (byte)0;
-                    landData.MediaSize[0] = width;
-                    landData.MediaSize[1] = height;
+                    landData.MediaWidth = width;
+                    landData.MediaHeight = height;
                     landData.MediaType = mediaType;
 
                     // do that one last, it will cause a ParcelPropertiesUpdate
@@ -9682,8 +9698,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                             list.Add(new LSL_String(World.GetLandData(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y).MediaType));
                             break;
                         case ParcelMediaCommandEnum.Size:
-                            list.Add(new LSL_String(World.GetLandData(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y).MediaSize[0]));
-                            list.Add(new LSL_String(World.GetLandData(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y).MediaSize[1]));
+                            list.Add(new LSL_String(World.GetLandData(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y).MediaWidth));
+                            list.Add(new LSL_String(World.GetLandData(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y).MediaHeight));
                             break;
                         default:
                             ParcelMediaCommandEnum mediaCommandEnum = ParcelMediaCommandEnum.Url;
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs
index f0384f8..665b39f 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs
@@ -1,507 +1,502 @@
-/*

- * 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.Reflection;

-using System.Collections;

-using System.Collections.Generic;

-using System.Runtime.Remoting.Lifetime;

-using OpenMetaverse;

-using Nini.Config;

-using OpenSim;

-using OpenSim.Framework;

-using OpenSim.Region.CoreModules.World.LightShare;

-using OpenSim.Region.Framework.Interfaces;

-using OpenSim.Region.Framework.Scenes;

-using OpenSim.Region.ScriptEngine.Shared;

-using OpenSim.Region.ScriptEngine.Shared.Api.Plugins;

-using OpenSim.Region.ScriptEngine.Shared.ScriptBase;

-using OpenSim.Region.ScriptEngine.Interfaces;

-using OpenSim.Region.ScriptEngine.Shared.Api.Interfaces;

-

-using LSL_Float = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLFloat;

-using LSL_Integer = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLInteger;

-using LSL_Key = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLString;

-using LSL_List = OpenSim.Region.ScriptEngine.Shared.LSL_Types.list;

-using LSL_Rotation = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Quaternion;

-using LSL_String = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLString;

-using LSL_Vector = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Vector3;

-

-namespace OpenSim.Region.ScriptEngine.Shared.Api

-{

-    [Serializable]

-    public class LS_Api : MarshalByRefObject, ILS_Api, IScriptApi

-    {

-        internal IScriptEngine m_ScriptEngine;

-        internal SceneObjectPart m_host;

-        internal uint m_localID;

-        internal UUID m_itemID;

-        internal bool m_LSFunctionsEnabled = false;

-        internal IScriptModuleComms m_comms = null;

-

-        public void Initialize(IScriptEngine ScriptEngine, SceneObjectPart host, uint localID, UUID itemID)

-        {

-            m_ScriptEngine = ScriptEngine;

-            m_host = host;

-            m_localID = localID;

-            m_itemID = itemID;

-

-            if (m_ScriptEngine.Config.GetBoolean("AllowLightShareFunctions", false))

-                m_LSFunctionsEnabled = true;

-

-            if (m_ScriptEngine.Config.GetBoolean("AllowCareminsterFunctions", false))

-                m_LSFunctionsEnabled = true;

-            

-            m_comms = m_ScriptEngine.World.RequestModuleInterface<IScriptModuleComms>();

-            if (m_comms == null)

-                m_LSFunctionsEnabled = false;

-        }

-

-        public override Object InitializeLifetimeService()

-        {

-            ILease lease = (ILease)base.InitializeLifetimeService();

-

-            if (lease.CurrentState == LeaseState.Initial)

-            {

-                lease.InitialLeaseTime = TimeSpan.FromMinutes(0);

-                //                lease.RenewOnCallTime = TimeSpan.FromSeconds(10.0);

-                //                lease.SponsorshipTimeout = TimeSpan.FromMinutes(1.0);

-            }

-            return lease;

-        }

-

-        public Scene World

-        {

-            get { return m_ScriptEngine.World; }

-        }

-

-        //

-        //Dumps an error message on the debug console.

-        //

-

-        internal void LSShoutError(string message)

-        {

-            if (message.Length > 1023)

-                message = message.Substring(0, 1023);

-

-            World.SimChat(Utils.StringToBytes(message),

-                          ChatTypeEnum.Shout, ScriptBaseClass.DEBUG_CHANNEL, m_host.ParentGroup.RootPart.AbsolutePosition, m_host.Name, m_host.UUID, true);

-

-            IWorldComm wComm = m_ScriptEngine.World.RequestModuleInterface<IWorldComm>();

-            wComm.DeliverMessage(ChatTypeEnum.Shout, ScriptBaseClass.DEBUG_CHANNEL, m_host.Name, m_host.UUID, message);

-        }

-

-        /// <summary>

-        /// Get the current Windlight scene

-        /// </summary>

-        /// <returns>List of windlight parameters</returns>

-        public LSL_List lsGetWindlightScene(LSL_List rules)

-        {

-            if (!m_LSFunctionsEnabled)

-            {

-                LSShoutError("LightShare functions are not enabled.");

-                return new LSL_List();

-            }

-            m_host.AddScriptLPS(1);

-            RegionLightShareData wl = m_host.ParentGroup.Scene.RegionInfo.WindlightSettings;

-

-            LSL_List values = new LSL_List();

-            int idx = 0;

-            while (idx < rules.Length)

-            {

-                uint rule = (uint)rules.GetLSLIntegerItem(idx);

-                LSL_List toadd = new LSL_List();

-

-                switch (rule)

-                {

-                    case (int)ScriptBaseClass.WL_AMBIENT:

-                        toadd.Add(new LSL_Rotation(wl.ambient.X, wl.ambient.Y, wl.ambient.Z, wl.ambient.W));

-                        break;

-                    case (int)ScriptBaseClass.WL_BIG_WAVE_DIRECTION:

-                        toadd.Add(new LSL_Vector(wl.bigWaveDirection.X, wl.bigWaveDirection.Y, 0.0f));

-                        break;

-                    case (int)ScriptBaseClass.WL_BLUE_DENSITY:

-                        toadd.Add(new LSL_Rotation(wl.blueDensity.X, wl.blueDensity.Y, wl.blueDensity.Z, wl.blueDensity.W));

-                        break;

-                    case (int)ScriptBaseClass.WL_BLUR_MULTIPLIER:

-                        toadd.Add(new LSL_Float(wl.blurMultiplier));

-                        break;

-                    case (int)ScriptBaseClass.WL_CLOUD_COLOR:

-                        toadd.Add(new LSL_Rotation(wl.cloudColor.X, wl.cloudColor.Y, wl.cloudColor.Z, wl.cloudColor.W));

-                        break;

-                    case (int)ScriptBaseClass.WL_CLOUD_COVERAGE:

-                        toadd.Add(new LSL_Float(wl.cloudCoverage));

-                        break;

-                    case (int)ScriptBaseClass.WL_CLOUD_DETAIL_XY_DENSITY:

-                        toadd.Add(new LSL_Vector(wl.cloudDetailXYDensity.X, wl.cloudDetailXYDensity.Y, wl.cloudDetailXYDensity.Z));

-                        break;

-                    case (int)ScriptBaseClass.WL_CLOUD_SCALE:

-                        toadd.Add(new LSL_Float(wl.cloudScale));

-                        break;

-                    case (int)ScriptBaseClass.WL_CLOUD_SCROLL_X:

-                        toadd.Add(new LSL_Float(wl.cloudScrollX));

-                        break;

-                    case (int)ScriptBaseClass.WL_CLOUD_SCROLL_X_LOCK:

-                        toadd.Add(new LSL_Integer(wl.cloudScrollXLock ? 1 : 0));

-                        break;

-                    case (int)ScriptBaseClass.WL_CLOUD_SCROLL_Y:

-                        toadd.Add(new LSL_Float(wl.cloudScrollY));

-                        break;

-                    case (int)ScriptBaseClass.WL_CLOUD_SCROLL_Y_LOCK:

-                        toadd.Add(new LSL_Integer(wl.cloudScrollYLock ? 1 : 0));

-                        break;

-                    case (int)ScriptBaseClass.WL_CLOUD_XY_DENSITY:

-                        toadd.Add(new LSL_Vector(wl.cloudXYDensity.X, wl.cloudXYDensity.Y, wl.cloudXYDensity.Z));

-                        break;

-                    case (int)ScriptBaseClass.WL_DENSITY_MULTIPLIER:

-                        toadd.Add(new LSL_Float(wl.densityMultiplier));

-                        break;

-                    case (int)ScriptBaseClass.WL_DISTANCE_MULTIPLIER:

-                        toadd.Add(new LSL_Float(wl.distanceMultiplier));

-                        break;

-                    case (int)ScriptBaseClass.WL_DRAW_CLASSIC_CLOUDS:

-                        toadd.Add(new LSL_Integer(wl.drawClassicClouds ? 1 : 0));

-                        break;

-                    case (int)ScriptBaseClass.WL_EAST_ANGLE:

-                        toadd.Add(new LSL_Float(wl.eastAngle));

-                        break;

-                    case (int)ScriptBaseClass.WL_FRESNEL_OFFSET:

-                        toadd.Add(new LSL_Float(wl.fresnelOffset));

-                        break;

-                    case (int)ScriptBaseClass.WL_FRESNEL_SCALE:

-                        toadd.Add(new LSL_Float(wl.fresnelScale));

-                        break;

-                    case (int)ScriptBaseClass.WL_HAZE_DENSITY:

-                        toadd.Add(new LSL_Float(wl.hazeDensity));

-                        break;

-                    case (int)ScriptBaseClass.WL_HAZE_HORIZON:

-                        toadd.Add(new LSL_Float(wl.hazeHorizon));

-                        break;

-                    case (int)ScriptBaseClass.WL_HORIZON:

-                        toadd.Add(new LSL_Rotation(wl.horizon.X, wl.horizon.Y, wl.horizon.Z, wl.horizon.W));

-                        break;

-                    case (int)ScriptBaseClass.WL_LITTLE_WAVE_DIRECTION:

-                        toadd.Add(new LSL_Vector(wl.littleWaveDirection.X, wl.littleWaveDirection.Y, 0.0f));

-                        break;

-                    case (int)ScriptBaseClass.WL_MAX_ALTITUDE:

-                        toadd.Add(new LSL_Integer(wl.maxAltitude));

-                        break;

-                    case (int)ScriptBaseClass.WL_NORMAL_MAP_TEXTURE:

-                        toadd.Add(new LSL_Key(wl.normalMapTexture.ToString()));

-                        break;

-                    case (int)ScriptBaseClass.WL_REFLECTION_WAVELET_SCALE:

-                        toadd.Add(new LSL_Vector(wl.reflectionWaveletScale.X, wl.reflectionWaveletScale.Y, wl.reflectionWaveletScale.Z));

-                        break;

-                    case (int)ScriptBaseClass.WL_REFRACT_SCALE_ABOVE:

-                        toadd.Add(new LSL_Float(wl.refractScaleAbove));

-                        break;

-                    case (int)ScriptBaseClass.WL_REFRACT_SCALE_BELOW:

-                        toadd.Add(new LSL_Float(wl.refractScaleBelow));

-                        break;

-                    case (int)ScriptBaseClass.WL_SCENE_GAMMA:

-                        toadd.Add(new LSL_Float(wl.sceneGamma));

-                        break;

-                    case (int)ScriptBaseClass.WL_STAR_BRIGHTNESS:

-                        toadd.Add(new LSL_Float(wl.starBrightness));

-                        break;

-                    case (int)ScriptBaseClass.WL_SUN_GLOW_FOCUS:

-                        toadd.Add(new LSL_Float(wl.sunGlowFocus));

-                        break;

-                    case (int)ScriptBaseClass.WL_SUN_GLOW_SIZE:

-                        toadd.Add(new LSL_Float(wl.sunGlowSize));

-                        break;

-                    case (int)ScriptBaseClass.WL_SUN_MOON_COLOR:

-                        toadd.Add(new LSL_Rotation(wl.sunMoonColor.X, wl.sunMoonColor.Y, wl.sunMoonColor.Z, wl.sunMoonColor.W));

-                        break;

-                    case (int)ScriptBaseClass.WL_UNDERWATER_FOG_MODIFIER:

-                        toadd.Add(new LSL_Float(wl.underwaterFogModifier));

-                        break;

-                    case (int)ScriptBaseClass.WL_WATER_COLOR:

-                        toadd.Add(new LSL_Vector(wl.waterColor.X, wl.waterColor.Y, wl.waterColor.Z));

-                        break;

-                    case (int)ScriptBaseClass.WL_WATER_FOG_DENSITY_EXPONENT:

-                        toadd.Add(new LSL_Float(wl.waterFogDensityExponent));

-                        break;

-                }

-

-                if (toadd.Length > 0)

-                {

-                    values.Add(new LSL_Integer(rule));

-                    values.Add(toadd.Data[0]);

-                }

-                idx++;

-            }

-

-

-            return values;

-

-        }

-

-        private RegionLightShareData getWindlightProfileFromRules(LSL_List rules)

-        {

-            RegionLightShareData wl = (RegionLightShareData)m_host.ParentGroup.Scene.RegionInfo.WindlightSettings.Clone();

-

-            LSL_List values = new LSL_List();

-            int idx = 0;

-            while (idx < rules.Length)

-            {

-                uint rule = (uint)rules.GetLSLIntegerItem(idx);

-                LSL_Types.Quaternion iQ;

-                LSL_Types.Vector3 iV;

-                switch (rule)

-                {

-                    case (int)ScriptBaseClass.WL_SUN_MOON_POSITION:

-                        idx++;

-                        wl.sunMoonPosition = (float)rules.GetLSLFloatItem(idx);

-                        break;

-                    case (int)ScriptBaseClass.WL_AMBIENT:

-                        idx++;

-                        iQ = rules.GetQuaternionItem(idx);

-                        wl.ambient = new Vector4((float)iQ.x, (float)iQ.y, (float)iQ.z, (float)iQ.s);

-                        break;

-                    case (int)ScriptBaseClass.WL_BIG_WAVE_DIRECTION:

-                        idx++;

-                        iV = rules.GetVector3Item(idx);

-                        wl.bigWaveDirection = new Vector2((float)iV.x, (float)iV.y);

-                        break;

-                    case (int)ScriptBaseClass.WL_BLUE_DENSITY:

-                        idx++;

-                        iQ = rules.GetQuaternionItem(idx);

-                        wl.blueDensity = new Vector4((float)iQ.x, (float)iQ.y, (float)iQ.z, (float)iQ.s);

-                        break;

-                    case (int)ScriptBaseClass.WL_BLUR_MULTIPLIER:

-                        idx++;

-                        wl.blurMultiplier = (float)rules.GetLSLFloatItem(idx);

-                        break;

-                    case (int)ScriptBaseClass.WL_CLOUD_COLOR:

-                        idx++;

-                        iQ = rules.GetQuaternionItem(idx);

-                        wl.cloudColor = new Vector4((float)iQ.x, (float)iQ.y, (float)iQ.z, (float)iQ.s);

-                        break;

-                    case (int)ScriptBaseClass.WL_CLOUD_COVERAGE:

-                        idx++;

-                        wl.cloudCoverage = (float)rules.GetLSLFloatItem(idx);

-                        break;

-                    case (int)ScriptBaseClass.WL_CLOUD_DETAIL_XY_DENSITY:

-                        idx++;

-                        iV = rules.GetVector3Item(idx);

-                        wl.cloudDetailXYDensity = new Vector3((float)iV.x, (float)iV.y, (float)iV.z);

-                        break;

-                    case (int)ScriptBaseClass.WL_CLOUD_SCALE:

-                        idx++;

-                        wl.cloudScale = (float)rules.GetLSLFloatItem(idx);

-                        break;

-                    case (int)ScriptBaseClass.WL_CLOUD_SCROLL_X:

-                        idx++;

-                        wl.cloudScrollX = (float)rules.GetLSLFloatItem(idx);

-                        break;

-                    case (int)ScriptBaseClass.WL_CLOUD_SCROLL_X_LOCK:

-                        idx++;

-                        wl.cloudScrollXLock = rules.GetLSLIntegerItem(idx).value == 1 ? true : false;

-                        break;

-                    case (int)ScriptBaseClass.WL_CLOUD_SCROLL_Y:

-                        idx++;

-                        wl.cloudScrollY = (float)rules.GetLSLFloatItem(idx);

-                        break;

-                    case (int)ScriptBaseClass.WL_CLOUD_SCROLL_Y_LOCK:

-                        idx++;

-                        wl.cloudScrollYLock = rules.GetLSLIntegerItem(idx).value == 1 ? true : false;

-                        break;

-                    case (int)ScriptBaseClass.WL_CLOUD_XY_DENSITY:

-                        idx++;

-                        iV = rules.GetVector3Item(idx);

-                        wl.cloudXYDensity = new Vector3((float)iV.x, (float)iV.y, (float)iV.z);

-                        break;

-                    case (int)ScriptBaseClass.WL_DENSITY_MULTIPLIER:

-                        idx++;

-                        wl.densityMultiplier = (float)rules.GetLSLFloatItem(idx);

-                        break;

-                    case (int)ScriptBaseClass.WL_DISTANCE_MULTIPLIER:

-                        idx++;

-                        wl.distanceMultiplier = (float)rules.GetLSLFloatItem(idx);

-                        break;

-                    case (int)ScriptBaseClass.WL_DRAW_CLASSIC_CLOUDS:

-                        idx++;

-                        wl.drawClassicClouds = rules.GetLSLIntegerItem(idx).value == 1 ? true : false;

-                        break;

-                    case (int)ScriptBaseClass.WL_EAST_ANGLE:

-                        idx++;

-                        wl.eastAngle = (float)rules.GetLSLFloatItem(idx);

-                        break;

-                    case (int)ScriptBaseClass.WL_FRESNEL_OFFSET:

-                        idx++;

-                        wl.fresnelOffset = (float)rules.GetLSLFloatItem(idx);

-                        break;

-                    case (int)ScriptBaseClass.WL_FRESNEL_SCALE:

-                        idx++;

-                        wl.fresnelScale = (float)rules.GetLSLFloatItem(idx);

-                        break;

-                    case (int)ScriptBaseClass.WL_HAZE_DENSITY:

-                        idx++;

-                        wl.hazeDensity = (float)rules.GetLSLFloatItem(idx);

-                        break;

-                    case (int)ScriptBaseClass.WL_HAZE_HORIZON:

-                        idx++;

-                        wl.hazeHorizon = (float)rules.GetLSLFloatItem(idx);

-                        break;

-                    case (int)ScriptBaseClass.WL_HORIZON:

-                        idx++;

-                        iQ = rules.GetQuaternionItem(idx);

-                        wl.horizon = new Vector4((float)iQ.x, (float)iQ.y, (float)iQ.z, (float)iQ.s);

-                        break;

-                    case (int)ScriptBaseClass.WL_LITTLE_WAVE_DIRECTION:

-                        idx++;

-                        iV = rules.GetVector3Item(idx);

-                        wl.littleWaveDirection = new Vector2((float)iV.x, (float)iV.y);

-                        break;

-                    case (int)ScriptBaseClass.WL_MAX_ALTITUDE:

-                        idx++;

-                        wl.maxAltitude = (ushort)rules.GetLSLIntegerItem(idx).value;

-                        break;

-                    case (int)ScriptBaseClass.WL_NORMAL_MAP_TEXTURE:

-                        idx++;

-                        wl.normalMapTexture = new UUID(rules.GetLSLStringItem(idx).m_string);

-                        break;

-                    case (int)ScriptBaseClass.WL_REFLECTION_WAVELET_SCALE:

-                        idx++;

-                        iV = rules.GetVector3Item(idx);

-                        wl.reflectionWaveletScale = new Vector3((float)iV.x, (float)iV.y, (float)iV.z);

-                        break;

-                    case (int)ScriptBaseClass.WL_REFRACT_SCALE_ABOVE:

-                        idx++;

-                        wl.refractScaleAbove = (float)rules.GetLSLFloatItem(idx);

-                        break;

-                    case (int)ScriptBaseClass.WL_REFRACT_SCALE_BELOW:

-                        idx++;

-                        wl.refractScaleBelow = (float)rules.GetLSLFloatItem(idx);

-                        break;

-                    case (int)ScriptBaseClass.WL_SCENE_GAMMA:

-                        idx++;

-                        wl.sceneGamma = (float)rules.GetLSLFloatItem(idx);

-                        break;

-                    case (int)ScriptBaseClass.WL_STAR_BRIGHTNESS:

-                        idx++;

-                        wl.starBrightness = (float)rules.GetLSLFloatItem(idx);

-                        break;

-                    case (int)ScriptBaseClass.WL_SUN_GLOW_FOCUS:

-                        idx++;

-                        wl.sunGlowFocus = (float)rules.GetLSLFloatItem(idx);

-                        break;

-                    case (int)ScriptBaseClass.WL_SUN_GLOW_SIZE:

-                        idx++;

-                        wl.sunGlowSize = (float)rules.GetLSLFloatItem(idx);

-                        break;

-                    case (int)ScriptBaseClass.WL_SUN_MOON_COLOR:

-                        idx++;

-                        iQ = rules.GetQuaternionItem(idx);

-                        wl.sunMoonColor = new Vector4((float)iQ.x, (float)iQ.y, (float)iQ.z, (float)iQ.s);

-                        break;

-                    case (int)ScriptBaseClass.WL_UNDERWATER_FOG_MODIFIER:

-                        idx++;

-                        wl.underwaterFogModifier = (float)rules.GetLSLFloatItem(idx);

-                        break;

-                    case (int)ScriptBaseClass.WL_WATER_COLOR:

-                        idx++;

-                        iV = rules.GetVector3Item(idx);

-                        wl.waterColor = new Vector3((float)iV.x, (float)iV.y, (float)iV.z);

-                        break;

-                    case (int)ScriptBaseClass.WL_WATER_FOG_DENSITY_EXPONENT:

-                        idx++;

-                        wl.waterFogDensityExponent = (float)rules.GetLSLFloatItem(idx);

-                        break;

-                }

-                idx++;

-            }

-            return wl;

-        }

-        /// <summary>

-        /// Set the current Windlight scene

-        /// </summary>

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

-        /// <returns>success: true or false</returns>

-        public int lsSetWindlightScene(LSL_List rules)

-        {

-            if (!m_LSFunctionsEnabled)

-            {

-                LSShoutError("LightShare functions are not enabled.");

-                return 0;

-            }

-            if (!World.RegionInfo.EstateSettings.IsEstateManager(m_host.OwnerID) && World.GetScenePresence(m_host.OwnerID).GodLevel < 200)

-            {

-                LSShoutError("lsSetWindlightScene can only be used by estate managers or owners.");

-                return 0;

-            }

-            int success = 0;

-            m_host.AddScriptLPS(1);

-            if (LightShareModule.EnableWindlight)

-            {

-                RegionLightShareData wl = getWindlightProfileFromRules(rules);

-                m_host.ParentGroup.Scene.StoreWindlightProfile(wl);

-                success = 1;

-            }

-            else

-            {

-                LSShoutError("Windlight module is disabled");

-                return 0;

-            }

-            return success;

-        }

-        /// <summary>

-        /// Set the current Windlight scene to a target avatar

-        /// </summary>

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

-        /// <returns>success: true or false</returns>

-        public int lsSetWindlightSceneTargeted(LSL_List rules, LSL_Key target)

-        {

-            if (!m_LSFunctionsEnabled)

-            {

-                LSShoutError("LightShare functions are not enabled.");

-                return 0;

-            }

-            if (!World.RegionInfo.EstateSettings.IsEstateManager(m_host.OwnerID) && World.GetScenePresence(m_host.OwnerID).GodLevel < 200)

-            {

-                LSShoutError("lsSetWindlightSceneTargeted can only be used by estate managers or owners.");

-                return 0;

-            }

-            int success = 0;

-            m_host.AddScriptLPS(1);

-            if (LightShareModule.EnableWindlight)

-            { 

-                RegionLightShareData wl = getWindlightProfileFromRules(rules);

-                World.EventManager.TriggerOnSendNewWindlightProfileTargeted(wl, new UUID(target.m_string));

-                success = 1;

-            }

-            else

-            {

-                LSShoutError("Windlight module is disabled");

-                return 0;

-            }

-            return success;

-        }

-        

-    }

-}

+/*
+ * 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.Reflection;
+using System.Collections;
+using System.Collections.Generic;
+using System.Runtime.Remoting.Lifetime;
+using OpenMetaverse;
+using Nini.Config;
+using OpenSim;
+using OpenSim.Framework;
+using OpenSim.Region.CoreModules.World.LightShare;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Region.ScriptEngine.Shared;
+using OpenSim.Region.ScriptEngine.Shared.Api.Plugins;
+using OpenSim.Region.ScriptEngine.Shared.ScriptBase;
+using OpenSim.Region.ScriptEngine.Interfaces;
+using OpenSim.Region.ScriptEngine.Shared.Api.Interfaces;
+
+using LSL_Float = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLFloat;
+using LSL_Integer = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLInteger;
+using LSL_Key = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLString;
+using LSL_List = OpenSim.Region.ScriptEngine.Shared.LSL_Types.list;
+using LSL_Rotation = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Quaternion;
+using LSL_String = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLString;
+using LSL_Vector = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Vector3;
+
+namespace OpenSim.Region.ScriptEngine.Shared.Api
+{
+    [Serializable]
+    public class LS_Api : MarshalByRefObject, ILS_Api, IScriptApi
+    {
+        internal IScriptEngine m_ScriptEngine;
+        internal SceneObjectPart m_host;
+        internal uint m_localID;
+        internal UUID m_itemID;
+        internal bool m_LSFunctionsEnabled = false;
+        internal IScriptModuleComms m_comms = null;
+
+        public void Initialize(IScriptEngine ScriptEngine, SceneObjectPart host, uint localID, UUID itemID)
+        {
+            m_ScriptEngine = ScriptEngine;
+            m_host = host;
+            m_localID = localID;
+            m_itemID = itemID;
+
+            if (m_ScriptEngine.Config.GetBoolean("AllowLightShareFunctions", false))
+                m_LSFunctionsEnabled = true;
+
+            m_comms = m_ScriptEngine.World.RequestModuleInterface<IScriptModuleComms>();
+            if (m_comms == null)
+                m_LSFunctionsEnabled = false;
+        }
+
+        public override Object InitializeLifetimeService()
+        {
+            ILease lease = (ILease)base.InitializeLifetimeService();
+
+            if (lease.CurrentState == LeaseState.Initial)
+            {
+                lease.InitialLeaseTime = TimeSpan.FromMinutes(0);
+                //                lease.RenewOnCallTime = TimeSpan.FromSeconds(10.0);
+                //                lease.SponsorshipTimeout = TimeSpan.FromMinutes(1.0);
+            }
+            return lease;
+        }
+
+        public Scene World
+        {
+            get { return m_ScriptEngine.World; }
+        }
+
+        //
+        //Dumps an error message on the debug console.
+        //
+
+        internal void LSShoutError(string message)
+        {
+            if (message.Length > 1023)
+                message = message.Substring(0, 1023);
+
+            World.SimChat(Utils.StringToBytes(message),
+                          ChatTypeEnum.Shout, ScriptBaseClass.DEBUG_CHANNEL, m_host.ParentGroup.RootPart.AbsolutePosition, m_host.Name, m_host.UUID, true);
+
+            IWorldComm wComm = m_ScriptEngine.World.RequestModuleInterface<IWorldComm>();
+            wComm.DeliverMessage(ChatTypeEnum.Shout, ScriptBaseClass.DEBUG_CHANNEL, m_host.Name, m_host.UUID, message);
+        }
+
+        /// <summary>
+        /// Get the current Windlight scene
+        /// </summary>
+        /// <returns>List of windlight parameters</returns>
+        public LSL_List lsGetWindlightScene(LSL_List rules)
+        {
+            if (!m_LSFunctionsEnabled)
+            {
+                LSShoutError("LightShare functions are not enabled.");
+                return new LSL_List();
+            }
+            m_host.AddScriptLPS(1);
+            RegionLightShareData wl = m_host.ParentGroup.Scene.RegionInfo.WindlightSettings;
+
+            LSL_List values = new LSL_List();
+            int idx = 0;
+            while (idx < rules.Length)
+            {
+                uint rule = (uint)rules.GetLSLIntegerItem(idx);
+                LSL_List toadd = new LSL_List();
+
+                switch (rule)
+                {
+                    case (int)ScriptBaseClass.WL_AMBIENT:
+                        toadd.Add(new LSL_Rotation(wl.ambient.X, wl.ambient.Y, wl.ambient.Z, wl.ambient.W));
+                        break;
+                    case (int)ScriptBaseClass.WL_BIG_WAVE_DIRECTION:
+                        toadd.Add(new LSL_Vector(wl.bigWaveDirection.X, wl.bigWaveDirection.Y, 0.0f));
+                        break;
+                    case (int)ScriptBaseClass.WL_BLUE_DENSITY:
+                        toadd.Add(new LSL_Rotation(wl.blueDensity.X, wl.blueDensity.Y, wl.blueDensity.Z, wl.blueDensity.W));
+                        break;
+                    case (int)ScriptBaseClass.WL_BLUR_MULTIPLIER:
+                        toadd.Add(new LSL_Float(wl.blurMultiplier));
+                        break;
+                    case (int)ScriptBaseClass.WL_CLOUD_COLOR:
+                        toadd.Add(new LSL_Rotation(wl.cloudColor.X, wl.cloudColor.Y, wl.cloudColor.Z, wl.cloudColor.W));
+                        break;
+                    case (int)ScriptBaseClass.WL_CLOUD_COVERAGE:
+                        toadd.Add(new LSL_Float(wl.cloudCoverage));
+                        break;
+                    case (int)ScriptBaseClass.WL_CLOUD_DETAIL_XY_DENSITY:
+                        toadd.Add(new LSL_Vector(wl.cloudDetailXYDensity.X, wl.cloudDetailXYDensity.Y, wl.cloudDetailXYDensity.Z));
+                        break;
+                    case (int)ScriptBaseClass.WL_CLOUD_SCALE:
+                        toadd.Add(new LSL_Float(wl.cloudScale));
+                        break;
+                    case (int)ScriptBaseClass.WL_CLOUD_SCROLL_X:
+                        toadd.Add(new LSL_Float(wl.cloudScrollX));
+                        break;
+                    case (int)ScriptBaseClass.WL_CLOUD_SCROLL_X_LOCK:
+                        toadd.Add(new LSL_Integer(wl.cloudScrollXLock ? 1 : 0));
+                        break;
+                    case (int)ScriptBaseClass.WL_CLOUD_SCROLL_Y:
+                        toadd.Add(new LSL_Float(wl.cloudScrollY));
+                        break;
+                    case (int)ScriptBaseClass.WL_CLOUD_SCROLL_Y_LOCK:
+                        toadd.Add(new LSL_Integer(wl.cloudScrollYLock ? 1 : 0));
+                        break;
+                    case (int)ScriptBaseClass.WL_CLOUD_XY_DENSITY:
+                        toadd.Add(new LSL_Vector(wl.cloudXYDensity.X, wl.cloudXYDensity.Y, wl.cloudXYDensity.Z));
+                        break;
+                    case (int)ScriptBaseClass.WL_DENSITY_MULTIPLIER:
+                        toadd.Add(new LSL_Float(wl.densityMultiplier));
+                        break;
+                    case (int)ScriptBaseClass.WL_DISTANCE_MULTIPLIER:
+                        toadd.Add(new LSL_Float(wl.distanceMultiplier));
+                        break;
+                    case (int)ScriptBaseClass.WL_DRAW_CLASSIC_CLOUDS:
+                        toadd.Add(new LSL_Integer(wl.drawClassicClouds ? 1 : 0));
+                        break;
+                    case (int)ScriptBaseClass.WL_EAST_ANGLE:
+                        toadd.Add(new LSL_Float(wl.eastAngle));
+                        break;
+                    case (int)ScriptBaseClass.WL_FRESNEL_OFFSET:
+                        toadd.Add(new LSL_Float(wl.fresnelOffset));
+                        break;
+                    case (int)ScriptBaseClass.WL_FRESNEL_SCALE:
+                        toadd.Add(new LSL_Float(wl.fresnelScale));
+                        break;
+                    case (int)ScriptBaseClass.WL_HAZE_DENSITY:
+                        toadd.Add(new LSL_Float(wl.hazeDensity));
+                        break;
+                    case (int)ScriptBaseClass.WL_HAZE_HORIZON:
+                        toadd.Add(new LSL_Float(wl.hazeHorizon));
+                        break;
+                    case (int)ScriptBaseClass.WL_HORIZON:
+                        toadd.Add(new LSL_Rotation(wl.horizon.X, wl.horizon.Y, wl.horizon.Z, wl.horizon.W));
+                        break;
+                    case (int)ScriptBaseClass.WL_LITTLE_WAVE_DIRECTION:
+                        toadd.Add(new LSL_Vector(wl.littleWaveDirection.X, wl.littleWaveDirection.Y, 0.0f));
+                        break;
+                    case (int)ScriptBaseClass.WL_MAX_ALTITUDE:
+                        toadd.Add(new LSL_Integer(wl.maxAltitude));
+                        break;
+                    case (int)ScriptBaseClass.WL_NORMAL_MAP_TEXTURE:
+                        toadd.Add(new LSL_Key(wl.normalMapTexture.ToString()));
+                        break;
+                    case (int)ScriptBaseClass.WL_REFLECTION_WAVELET_SCALE:
+                        toadd.Add(new LSL_Vector(wl.reflectionWaveletScale.X, wl.reflectionWaveletScale.Y, wl.reflectionWaveletScale.Z));
+                        break;
+                    case (int)ScriptBaseClass.WL_REFRACT_SCALE_ABOVE:
+                        toadd.Add(new LSL_Float(wl.refractScaleAbove));
+                        break;
+                    case (int)ScriptBaseClass.WL_REFRACT_SCALE_BELOW:
+                        toadd.Add(new LSL_Float(wl.refractScaleBelow));
+                        break;
+                    case (int)ScriptBaseClass.WL_SCENE_GAMMA:
+                        toadd.Add(new LSL_Float(wl.sceneGamma));
+                        break;
+                    case (int)ScriptBaseClass.WL_STAR_BRIGHTNESS:
+                        toadd.Add(new LSL_Float(wl.starBrightness));
+                        break;
+                    case (int)ScriptBaseClass.WL_SUN_GLOW_FOCUS:
+                        toadd.Add(new LSL_Float(wl.sunGlowFocus));
+                        break;
+                    case (int)ScriptBaseClass.WL_SUN_GLOW_SIZE:
+                        toadd.Add(new LSL_Float(wl.sunGlowSize));
+                        break;
+                    case (int)ScriptBaseClass.WL_SUN_MOON_COLOR:
+                        toadd.Add(new LSL_Rotation(wl.sunMoonColor.X, wl.sunMoonColor.Y, wl.sunMoonColor.Z, wl.sunMoonColor.W));
+                        break;
+                    case (int)ScriptBaseClass.WL_UNDERWATER_FOG_MODIFIER:
+                        toadd.Add(new LSL_Float(wl.underwaterFogModifier));
+                        break;
+                    case (int)ScriptBaseClass.WL_WATER_COLOR:
+                        toadd.Add(new LSL_Vector(wl.waterColor.X, wl.waterColor.Y, wl.waterColor.Z));
+                        break;
+                    case (int)ScriptBaseClass.WL_WATER_FOG_DENSITY_EXPONENT:
+                        toadd.Add(new LSL_Float(wl.waterFogDensityExponent));
+                        break;
+                }
+
+                if (toadd.Length > 0)
+                {
+                    values.Add(rule);
+                    values.Add(toadd.Data[0]);
+                }
+                idx++;
+            }
+
+            return values;
+        }
+
+        private RegionLightShareData getWindlightProfileFromRules(LSL_List rules)
+        {
+            RegionLightShareData wl = (RegionLightShareData)m_host.ParentGroup.Scene.RegionInfo.WindlightSettings.Clone();
+
+//            LSL_List values = new LSL_List();
+            int idx = 0;
+            while (idx < rules.Length)
+            {
+                uint rule = (uint)rules.GetLSLIntegerItem(idx);
+                LSL_Types.Quaternion iQ;
+                LSL_Types.Vector3 iV;
+                switch (rule)
+                {
+                    case (int)ScriptBaseClass.WL_SUN_MOON_POSITION:
+                        idx++;
+                        wl.sunMoonPosition = (float)rules.GetLSLFloatItem(idx);
+                        break;
+                    case (int)ScriptBaseClass.WL_AMBIENT:
+                        idx++;
+                        iQ = rules.GetQuaternionItem(idx);
+                        wl.ambient = new Vector4((float)iQ.x, (float)iQ.y, (float)iQ.z, (float)iQ.s);
+                        break;
+                    case (int)ScriptBaseClass.WL_BIG_WAVE_DIRECTION:
+                        idx++;
+                        iV = rules.GetVector3Item(idx);
+                        wl.bigWaveDirection = new Vector2((float)iV.x, (float)iV.y);
+                        break;
+                    case (int)ScriptBaseClass.WL_BLUE_DENSITY:
+                        idx++;
+                        iQ = rules.GetQuaternionItem(idx);
+                        wl.blueDensity = new Vector4((float)iQ.x, (float)iQ.y, (float)iQ.z, (float)iQ.s);
+                        break;
+                    case (int)ScriptBaseClass.WL_BLUR_MULTIPLIER:
+                        idx++;
+                        wl.blurMultiplier = (float)rules.GetLSLFloatItem(idx);
+                        break;
+                    case (int)ScriptBaseClass.WL_CLOUD_COLOR:
+                        idx++;
+                        iQ = rules.GetQuaternionItem(idx);
+                        wl.cloudColor = new Vector4((float)iQ.x, (float)iQ.y, (float)iQ.z, (float)iQ.s);
+                        break;
+                    case (int)ScriptBaseClass.WL_CLOUD_COVERAGE:
+                        idx++;
+                        wl.cloudCoverage = (float)rules.GetLSLFloatItem(idx);
+                        break;
+                    case (int)ScriptBaseClass.WL_CLOUD_DETAIL_XY_DENSITY:
+                        idx++;
+                        iV = rules.GetVector3Item(idx);
+                        wl.cloudDetailXYDensity = new Vector3((float)iV.x, (float)iV.y, (float)iV.z);
+                        break;
+                    case (int)ScriptBaseClass.WL_CLOUD_SCALE:
+                        idx++;
+                        wl.cloudScale = (float)rules.GetLSLFloatItem(idx);
+                        break;
+                    case (int)ScriptBaseClass.WL_CLOUD_SCROLL_X:
+                        idx++;
+                        wl.cloudScrollX = (float)rules.GetLSLFloatItem(idx);
+                        break;
+                    case (int)ScriptBaseClass.WL_CLOUD_SCROLL_X_LOCK:
+                        idx++;
+                        wl.cloudScrollXLock = rules.GetLSLIntegerItem(idx).value == 1 ? true : false;
+                        break;
+                    case (int)ScriptBaseClass.WL_CLOUD_SCROLL_Y:
+                        idx++;
+                        wl.cloudScrollY = (float)rules.GetLSLFloatItem(idx);
+                        break;
+                    case (int)ScriptBaseClass.WL_CLOUD_SCROLL_Y_LOCK:
+                        idx++;
+                        wl.cloudScrollYLock = rules.GetLSLIntegerItem(idx).value == 1 ? true : false;
+                        break;
+                    case (int)ScriptBaseClass.WL_CLOUD_XY_DENSITY:
+                        idx++;
+                        iV = rules.GetVector3Item(idx);
+                        wl.cloudXYDensity = new Vector3((float)iV.x, (float)iV.y, (float)iV.z);
+                        break;
+                    case (int)ScriptBaseClass.WL_DENSITY_MULTIPLIER:
+                        idx++;
+                        wl.densityMultiplier = (float)rules.GetLSLFloatItem(idx);
+                        break;
+                    case (int)ScriptBaseClass.WL_DISTANCE_MULTIPLIER:
+                        idx++;
+                        wl.distanceMultiplier = (float)rules.GetLSLFloatItem(idx);
+                        break;
+                    case (int)ScriptBaseClass.WL_DRAW_CLASSIC_CLOUDS:
+                        idx++;
+                        wl.drawClassicClouds = rules.GetLSLIntegerItem(idx).value == 1 ? true : false;
+                        break;
+                    case (int)ScriptBaseClass.WL_EAST_ANGLE:
+                        idx++;
+                        wl.eastAngle = (float)rules.GetLSLFloatItem(idx);
+                        break;
+                    case (int)ScriptBaseClass.WL_FRESNEL_OFFSET:
+                        idx++;
+                        wl.fresnelOffset = (float)rules.GetLSLFloatItem(idx);
+                        break;
+                    case (int)ScriptBaseClass.WL_FRESNEL_SCALE:
+                        idx++;
+                        wl.fresnelScale = (float)rules.GetLSLFloatItem(idx);
+                        break;
+                    case (int)ScriptBaseClass.WL_HAZE_DENSITY:
+                        idx++;
+                        wl.hazeDensity = (float)rules.GetLSLFloatItem(idx);
+                        break;
+                    case (int)ScriptBaseClass.WL_HAZE_HORIZON:
+                        idx++;
+                        wl.hazeHorizon = (float)rules.GetLSLFloatItem(idx);
+                        break;
+                    case (int)ScriptBaseClass.WL_HORIZON:
+                        idx++;
+                        iQ = rules.GetQuaternionItem(idx);
+                        wl.horizon = new Vector4((float)iQ.x, (float)iQ.y, (float)iQ.z, (float)iQ.s);
+                        break;
+                    case (int)ScriptBaseClass.WL_LITTLE_WAVE_DIRECTION:
+                        idx++;
+                        iV = rules.GetVector3Item(idx);
+                        wl.littleWaveDirection = new Vector2((float)iV.x, (float)iV.y);
+                        break;
+                    case (int)ScriptBaseClass.WL_MAX_ALTITUDE:
+                        idx++;
+                        wl.maxAltitude = (ushort)rules.GetLSLIntegerItem(idx).value;
+                        break;
+                    case (int)ScriptBaseClass.WL_NORMAL_MAP_TEXTURE:
+                        idx++;
+                        wl.normalMapTexture = new UUID(rules.GetLSLStringItem(idx).m_string);
+                        break;
+                    case (int)ScriptBaseClass.WL_REFLECTION_WAVELET_SCALE:
+                        idx++;
+                        iV = rules.GetVector3Item(idx);
+                        wl.reflectionWaveletScale = new Vector3((float)iV.x, (float)iV.y, (float)iV.z);
+                        break;
+                    case (int)ScriptBaseClass.WL_REFRACT_SCALE_ABOVE:
+                        idx++;
+                        wl.refractScaleAbove = (float)rules.GetLSLFloatItem(idx);
+                        break;
+                    case (int)ScriptBaseClass.WL_REFRACT_SCALE_BELOW:
+                        idx++;
+                        wl.refractScaleBelow = (float)rules.GetLSLFloatItem(idx);
+                        break;
+                    case (int)ScriptBaseClass.WL_SCENE_GAMMA:
+                        idx++;
+                        wl.sceneGamma = (float)rules.GetLSLFloatItem(idx);
+                        break;
+                    case (int)ScriptBaseClass.WL_STAR_BRIGHTNESS:
+                        idx++;
+                        wl.starBrightness = (float)rules.GetLSLFloatItem(idx);
+                        break;
+                    case (int)ScriptBaseClass.WL_SUN_GLOW_FOCUS:
+                        idx++;
+                        wl.sunGlowFocus = (float)rules.GetLSLFloatItem(idx);
+                        break;
+                    case (int)ScriptBaseClass.WL_SUN_GLOW_SIZE:
+                        idx++;
+                        wl.sunGlowSize = (float)rules.GetLSLFloatItem(idx);
+                        break;
+                    case (int)ScriptBaseClass.WL_SUN_MOON_COLOR:
+                        idx++;
+                        iQ = rules.GetQuaternionItem(idx);
+                        wl.sunMoonColor = new Vector4((float)iQ.x, (float)iQ.y, (float)iQ.z, (float)iQ.s);
+                        break;
+                    case (int)ScriptBaseClass.WL_UNDERWATER_FOG_MODIFIER:
+                        idx++;
+                        wl.underwaterFogModifier = (float)rules.GetLSLFloatItem(idx);
+                        break;
+                    case (int)ScriptBaseClass.WL_WATER_COLOR:
+                        idx++;
+                        iV = rules.GetVector3Item(idx);
+                        wl.waterColor = new Vector3((float)iV.x, (float)iV.y, (float)iV.z);
+                        break;
+                    case (int)ScriptBaseClass.WL_WATER_FOG_DENSITY_EXPONENT:
+                        idx++;
+                        wl.waterFogDensityExponent = (float)rules.GetLSLFloatItem(idx);
+                        break;
+                }
+                idx++;
+            }
+            return wl;
+        }
+        /// <summary>
+        /// Set the current Windlight scene
+        /// </summary>
+        /// <param name="rules"></param>
+        /// <returns>success: true or false</returns>
+        public int lsSetWindlightScene(LSL_List rules)
+        {
+            if (!m_LSFunctionsEnabled)
+            {
+                LSShoutError("LightShare functions are not enabled.");
+                return 0;
+            }
+            if (!World.RegionInfo.EstateSettings.IsEstateManager(m_host.OwnerID) && World.GetScenePresence(m_host.OwnerID).GodLevel < 200)
+            {
+                LSShoutError("lsSetWindlightScene can only be used by estate managers or owners.");
+                return 0;
+            }
+            int success = 0;
+            m_host.AddScriptLPS(1);
+            if (LightShareModule.EnableWindlight)
+            {
+                RegionLightShareData wl = getWindlightProfileFromRules(rules);
+                m_host.ParentGroup.Scene.StoreWindlightProfile(wl);
+                success = 1;
+            }
+            else
+            {
+                LSShoutError("Windlight module is disabled");
+                return 0;
+            }
+            return success;
+        }
+        /// <summary>
+        /// Set the current Windlight scene to a target avatar
+        /// </summary>
+        /// <param name="rules"></param>
+        /// <returns>success: true or false</returns>
+        public int lsSetWindlightSceneTargeted(LSL_List rules, LSL_Key target)
+        {
+            if (!m_LSFunctionsEnabled)
+            {
+                LSShoutError("LightShare functions are not enabled.");
+                return 0;
+            }
+            if (!World.RegionInfo.EstateSettings.IsEstateManager(m_host.OwnerID) && World.GetScenePresence(m_host.OwnerID).GodLevel < 200)
+            {
+                LSShoutError("lsSetWindlightSceneTargeted can only be used by estate managers or owners.");
+                return 0;
+            }
+            int success = 0;
+            m_host.AddScriptLPS(1);
+            if (LightShareModule.EnableWindlight)
+            { 
+                RegionLightShareData wl = getWindlightProfileFromRules(rules);
+                World.EventManager.TriggerOnSendNewWindlightProfileTargeted(wl, new UUID(target.m_string));
+                success = 1;
+            }
+            else
+            {
+                LSShoutError("Windlight module is disabled");
+                return 0;
+            }
+            return success;
+        }
+        
+    }
+}
diff --git a/OpenSim/Region/ScriptEngine/Shared/Helpers.cs b/OpenSim/Region/ScriptEngine/Shared/Helpers.cs
index 4855d64..41501f2 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Helpers.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Helpers.cs
@@ -209,12 +209,15 @@ namespace OpenSim.Region.ScriptEngine.Shared
             else
                 Type = 0x02; // Passive
 
-            foreach (SceneObjectPart p in part.ParentGroup.Children.Values)
+            lock (part.ParentGroup.Children)
             {
-                if (p.Inventory.ContainsScripts())
+                foreach (SceneObjectPart p in part.ParentGroup.Children.Values)
                 {
-                    Type |= 0x08; // Scripted
-                    break;
+                    if (p.Inventory.ContainsScripts())
+                    {
+                        Type |= 0x08; // Scripted
+                        break;
+                    }
                 }
             }
 
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index 0f274f3..e5e8a56 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -1373,7 +1373,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
             {
                 sdoc.LoadXml(xml);
             }
-            catch (System.Xml.XmlException e)
+            catch (System.Xml.XmlException)
             {
                 loadedState = false;
             }
diff --git a/OpenSim/Services/Connectors/Friends/FriendsServiceConnector.cs b/OpenSim/Services/Connectors/Friends/FriendsServiceConnector.cs
index d7a5731..36b5083 100644
--- a/OpenSim/Services/Connectors/Friends/FriendsServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Friends/FriendsServiceConnector.cs
@@ -156,8 +156,6 @@ namespace OpenSim.Services.Connectors
 
             sendData["METHOD"] = "storefriend";
 
-            string reqString = ServerUtils.BuildQueryString(sendData);
-
             string reply = string.Empty;
             try
             {
@@ -199,8 +197,6 @@ namespace OpenSim.Services.Connectors
             sendData["FRIEND"] = Friend;
             sendData["METHOD"] = "deletefriend";
 
-            string reqString = ServerUtils.BuildQueryString(sendData);
-
             string reply = string.Empty;
             try
             {
@@ -232,10 +228,8 @@ namespace OpenSim.Services.Connectors
                 m_log.DebugFormat("[FRIENDS CONNECTOR]: DeleteFriend received null reply");
 
             return false;
-
         }
 
         #endregion
-
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs
index cabee4c..8d0f7be 100644
--- a/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs
@@ -31,11 +31,9 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.Net;
 using System.Reflection;
-
 using OpenSim.Framework;
 using OpenSim.Services.Interfaces;
 using GridRegion = OpenSim.Services.Interfaces.GridRegion;
-
 using OpenMetaverse;
 using OpenMetaverse.Imaging;
 using OpenMetaverse.StructuredData;
@@ -50,7 +48,7 @@ namespace OpenSim.Services.Connectors.Hypergrid
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        private static UUID m_HGMapImage = new UUID("00000000-0000-1111-9999-000000000013");
+//        private static UUID m_HGMapImage = new UUID("00000000-0000-1111-9999-000000000013");
 
         private IAssetService m_AssetService;
 
diff --git a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs
index c1e5949..4501937 100644
--- a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs
@@ -32,12 +32,10 @@ using System.IO;
 using System.Net;
 using System.Reflection;
 using System.Text;
-
 using OpenSim.Framework;
 using OpenSim.Services.Interfaces;
 using OpenSim.Services.Connectors.Simulation;
 using GridRegion = OpenSim.Services.Interfaces.GridRegion;
-
 using OpenMetaverse;
 using OpenMetaverse.StructuredData;
 using log4net;
@@ -243,7 +241,7 @@ namespace OpenSim.Services.Connectors.Hypergrid
             {
                 response = request.Send(m_ServerURL, 10000);
             }
-            catch (Exception e)
+            catch (Exception)
             {
                 return null;
             }
@@ -308,13 +306,12 @@ namespace OpenSim.Services.Connectors.Hypergrid
                 }
 
             }
-            catch (Exception e)
+            catch (Exception)
             {
                 return null;
             }
 
             return null;
-
         }
 
         public bool AgentIsComingHome(UUID sessionID, string thisGridExternalName)
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs
index a47f32c..734bdd2 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) Contributors, http://opensimulator.org/
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
@@ -53,7 +53,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
         private static readonly ILog m_log =
                 LogManager.GetLogger(
                 MethodBase.GetCurrentMethod().DeclaringType);
-        private static string ZeroID = UUID.Zero.ToString();
+//        private static string ZeroID = UUID.Zero.ToString();
 
         private string m_serverUrl = String.Empty;
 
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs
index 2b6d29c..89c1a5a 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) Contributors, http://opensimulator.org/
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
@@ -69,7 +69,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
 
         private string m_serverUrl = String.Empty;
         private string m_userServerUrl = String.Empty;
-        private object m_gestureSyncRoot = new object();
+//        private object m_gestureSyncRoot = new object();
 
         #region ISharedRegionModule
 
@@ -687,12 +687,12 @@ namespace OpenSim.Services.Connectors.SimianGrid
             for (int i = 0; i < items.Count; i++)
                 itemIDs[i] = items[i].AsUUID().ToString();
 
-            NameValueCollection requestArgs = new NameValueCollection
-            {
-                { "RequestMethod", "GetInventoryNodes" },
-                { "OwnerID", userID.ToString() },
-                { "Items", String.Join(",", itemIDs) }
-            };
+//            NameValueCollection requestArgs = new NameValueCollection
+//            {
+//                { "RequestMethod", "GetInventoryNodes" },
+//                { "OwnerID", userID.ToString() },
+//                { "Items", String.Join(",", itemIDs) }
+//            };
 
             // FIXME: Implement this in SimianGrid
             return new List<InventoryItemBase>(0);
@@ -708,12 +708,12 @@ namespace OpenSim.Services.Connectors.SimianGrid
         /// the user's inventory</returns>
         public int GetAssetPermissions(UUID userID, UUID assetID)
         {
-            NameValueCollection requestArgs = new NameValueCollection
-            {
-                { "RequestMethod", "GetInventoryNodes" },
-                { "OwnerID", userID.ToString() },
-                { "AssetID", assetID.ToString() }
-            };
+//            NameValueCollection requestArgs = new NameValueCollection
+//            {
+//                { "RequestMethod", "GetInventoryNodes" },
+//                { "OwnerID", userID.ToString() },
+//                { "AssetID", assetID.ToString() }
+//            };
 
             // FIXME: Implement this in SimianGrid
             return (int)PermissionMask.All;
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs
index 6f17931..ca23e27 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) Contributors, http://opensimulator.org/
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
@@ -349,24 +349,24 @@ namespace OpenSim.Services.Connectors.SimianGrid
             return null;
         }
 
-        private OSDMap GetSessionData(UUID sessionID)
-        {
-            m_log.DebugFormat("[SIMIAN PRESENCE CONNECTOR]: Requesting session data for session " + sessionID);
-
-            NameValueCollection requestArgs = new NameValueCollection
-            {
-                { "RequestMethod", "GetSession" },
-                { "SessionID", sessionID.ToString() }
-            };
-
-            OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
-            if (response["Success"].AsBoolean())
-                return response;
-            else
-                m_log.Warn("[SIMIAN PRESENCE CONNECTOR]: Failed to retrieve session data for session " + sessionID);
-
-            return null;
-        }
+//        private OSDMap GetSessionData(UUID sessionID)
+//        {
+//            m_log.DebugFormat("[SIMIAN PRESENCE CONNECTOR]: Requesting session data for session " + sessionID);
+//
+//            NameValueCollection requestArgs = new NameValueCollection
+//            {
+//                { "RequestMethod", "GetSession" },
+//                { "SessionID", sessionID.ToString() }
+//            };
+//
+//            OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
+//            if (response["Success"].AsBoolean())
+//                return response;
+//            else
+//                m_log.Warn("[SIMIAN PRESENCE CONNECTOR]: Failed to retrieve session data for session " + sessionID);
+//
+//            return null;
+//        }
 
         private List<PresenceInfo> GetSessions(UUID userID)
         {
diff --git a/OpenSim/Services/Interfaces/IInventoryService.cs b/OpenSim/Services/Interfaces/IInventoryService.cs
index 1b78fb3..d19faed 100644
--- a/OpenSim/Services/Interfaces/IInventoryService.cs
+++ b/OpenSim/Services/Interfaces/IInventoryService.cs
@@ -141,8 +141,11 @@ namespace OpenSim.Services.Interfaces
         /// <summary>
         /// Add a new item to the user's inventory
         /// </summary>
-        /// <param name="item"></param>
-        /// <returns>true if the item was successfully added</returns>
+        /// <param name="item">
+        /// The item to be added.  If item.FolderID == UUID.Zero then the item is added to the most suitable system
+        /// folder.  If there is no suitable folder then the item is added to the user's root inventory folder.
+        /// </param>
+        /// <returns>true if the item was successfully added, false if it was not</returns>
         bool AddItem(InventoryItemBase item);
 
         /// <summary>
diff --git a/OpenSim/Services/InventoryService/InventoryService.cs b/OpenSim/Services/InventoryService/InventoryService.cs
index fbcd663..86bca79 100644
--- a/OpenSim/Services/InventoryService/InventoryService.cs
+++ b/OpenSim/Services/InventoryService/InventoryService.cs
@@ -268,15 +268,22 @@ namespace OpenSim.Services.InventoryService
 
         public InventoryFolderBase GetFolderForType(UUID userID, AssetType type)
         {
+//            m_log.DebugFormat("[INVENTORY SERVICE]: Looking for folder type {0} for user {1}", type, userID);
+            
             InventoryFolderBase root = m_Database.getUserRootFolder(userID);
             if (root != null)
             {
                 List<InventoryFolderBase> folders = RequestSubFolders(root.ID);
 
                 foreach (InventoryFolderBase folder in folders)
-                {
+                {                   
                     if (folder.Type == (short)type)
+                    {
+//                        m_log.DebugFormat(
+//                            "[INVENTORY SERVICE]: Found folder {0} type {1}", folder.Name, (AssetType)folder.Type);                        
+                        
                         return folder;
+                    }
                 }
             }
 
diff --git a/OpenSim/Services/InventoryService/XInventoryService.cs b/OpenSim/Services/InventoryService/XInventoryService.cs
index f63ab16..84306e7 100644
--- a/OpenSim/Services/InventoryService/XInventoryService.cs
+++ b/OpenSim/Services/InventoryService/XInventoryService.cs
@@ -157,6 +157,8 @@ namespace OpenSim.Services.InventoryService
 
         protected virtual XInventoryFolder[] GetSystemFolders(UUID principalID)
         {
+//            m_log.DebugFormat("[XINVENTORY SERVICE]: Getting system folders for {0}", principalID);
+            
             XInventoryFolder[] allFolders = m_Database.GetFolders(
                     new string[] { "agentID" },
                     new string[] { principalID.ToString() });
@@ -170,6 +172,9 @@ namespace OpenSim.Services.InventoryService
                         return false;
                     });
 
+//            m_log.DebugFormat(
+//                "[XINVENTORY SERVICE]: Found {0} system folders for {1}", sysFolders.Length, principalID);
+            
             return sysFolders;
         }
 
@@ -186,7 +191,7 @@ namespace OpenSim.Services.InventoryService
 
             foreach (XInventoryFolder x in allFolders)
             {
-                //m_log.DebugFormat("[XINVENTORY]: Adding folder {0} to skeleton", x.folderName);
+                //m_log.DebugFormat("[XINVENTORY SERVICE]: Adding folder {0} to skeleton", x.folderName);
                 folders.Add(ConvertToOpenSim(x));
             }
 
@@ -214,12 +219,21 @@ namespace OpenSim.Services.InventoryService
 
         public virtual InventoryFolderBase GetFolderForType(UUID principalID, AssetType type)
         {
+//            m_log.DebugFormat("[XINVENTORY SERVICE]: Getting folder type {0} for user {1}", type, principalID);
+            
             XInventoryFolder[] folders = m_Database.GetFolders(
                     new string[] { "agentID", "type"},
                     new string[] { principalID.ToString(), ((int)type).ToString() });
 
             if (folders.Length == 0)
+            {
+//                m_log.WarnFormat("[XINVENTORY SERVICE]: Found no folder for type {0} for user {1}", type, principalID);
                 return null;
+            }
+            
+//            m_log.DebugFormat(
+//                "[XINVENTORY SERVICE]: Found folder {0} {1} for type {2} for user {3}", 
+//                folders[0].folderName, folders[0].folderID, type, principalID);
 
             return ConvertToOpenSim(folders[0]);
         }
@@ -230,7 +244,7 @@ namespace OpenSim.Services.InventoryService
             // connector. So we disregard the principal and look
             // by ID.
             //
-            m_log.DebugFormat("[XINVENTORY]: Fetch contents for folder {0}", folderID.ToString());
+            m_log.DebugFormat("[XINVENTORY SERVICE]: Fetch contents for folder {0}", folderID.ToString());
             InventoryCollection inventory = new InventoryCollection();
             inventory.UserID = principalID;
             inventory.Folders = new List<InventoryFolderBase>();
@@ -349,6 +363,9 @@ namespace OpenSim.Services.InventoryService
 
         public virtual bool AddItem(InventoryItemBase item)
         {
+//            m_log.DebugFormat(
+//                "[XINVENTORY SERVICE]: Adding item {0} to folder {1} for {2}", item.ID, item.Folder, item.Owner);
+            
             return m_Database.StoreItem(ConvertFromOpenSim(item));
         }
 
diff --git a/OpenSim/Tests/Common/Mock/MockInventoryService.cs b/OpenSim/Tests/Common/Mock/MockInventoryService.cs
index 1ea4bc1..4ac1078 100644
--- a/OpenSim/Tests/Common/Mock/MockInventoryService.cs
+++ b/OpenSim/Tests/Common/Mock/MockInventoryService.cs
@@ -37,13 +37,9 @@ namespace OpenSim.Tests.Common.Mock
 {
     public class MockInventoryService : IInventoryService
     {
-        public MockInventoryService()
-        {
-        }
+        public MockInventoryService() {}
         
-        public MockInventoryService(IConfigSource config)
-        {
-        }
+        public MockInventoryService(IConfigSource config) {}
 
         /// <summary>
         /// <see cref="OpenSim.Framework.Communications.IInterServiceInventoryServices"/>
@@ -140,7 +136,7 @@ namespace OpenSim.Tests.Common.Mock
 
         public bool AddItem(InventoryItemBase item)
         {
-            return false;
+            return true;
         }
 
         public bool UpdateItem(InventoryItemBase item)
@@ -187,4 +183,4 @@ namespace OpenSim.Tests.Common.Mock
             return 1;
         }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Tests/Common/Mock/TestInventoryDataPlugin.cs b/OpenSim/Tests/Common/Mock/TestInventoryDataPlugin.cs
index 7c4f689..b70b47d 100644
--- a/OpenSim/Tests/Common/Mock/TestInventoryDataPlugin.cs
+++ b/OpenSim/Tests/Common/Mock/TestInventoryDataPlugin.cs
@@ -42,7 +42,7 @@ namespace OpenSim.Tests.Common.Mock
     /// </summary>
     public class TestInventoryDataPlugin : IInventoryDataPlugin
     {
-//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         
         /// <value>
         /// Inventory folders
@@ -84,14 +84,19 @@ namespace OpenSim.Tests.Common.Mock
 
         public List<InventoryItemBase> getInventoryInFolder(UUID folderID)
         {
-//            m_log.DebugFormat("[MOCK INV DB]: Getting items in folder {0}", folderID);
+            InventoryFolderBase folder = m_folders[folderID];
+            
+//            m_log.DebugFormat("[MOCK INV DB]: Getting items in folder {0} {1}", folder.Name, folder.ID);
             
             List<InventoryItemBase> items = new List<InventoryItemBase>();
 
             foreach (InventoryItemBase item in m_items.Values)
             {
                 if (item.Folder == folderID)
+                {
+//                    m_log.DebugFormat("[MOCK INV DB]: getInventoryInFolder() adding item {0}", item.Name);
                     items.Add(item);
+                }
             }
             
             return items;
@@ -111,12 +116,22 @@ namespace OpenSim.Tests.Common.Mock
 
         public List<InventoryFolderBase> getInventoryFolders(UUID parentID)
         {
+            InventoryFolderBase parentFolder = m_folders[parentID];
+            
+//            m_log.DebugFormat("[MOCK INV DB]: Getting folders in folder {0} {1}", parentFolder.Name, parentFolder.ID);
+            
             List<InventoryFolderBase> folders = new List<InventoryFolderBase>();
 
             foreach (InventoryFolderBase folder in m_folders.Values)
             {
                 if (folder.ParentID == parentID)
+                {
+//                    m_log.DebugFormat(
+//                        "[MOCK INV DB]: Found folder {0} {1} in {2} {3}", 
+//                        folder.Name, folder.ID, parentFolder.Name, parentFolder.ID);
+                    
                     folders.Add(folder);
+                }
             }
 
             return folders;
@@ -137,6 +152,10 @@ namespace OpenSim.Tests.Common.Mock
 
         public void addInventoryFolder(InventoryFolderBase folder)
         {
+//            m_log.DebugFormat(
+//                "[MOCK INV DB]: Adding inventory folder {0} {1} type {2}", 
+//                folder.Name, folder.ID, (AssetType)folder.Type);
+            
             m_folders[folder.ID] = folder;
 
             if (folder.ParentID == UUID.Zero)
@@ -166,8 +185,10 @@ namespace OpenSim.Tests.Common.Mock
 
         public void addInventoryItem(InventoryItemBase item) 
         {
+            InventoryFolderBase folder = m_folders[item.Folder];
+            
 //            m_log.DebugFormat(
-//                "[MOCK INV DB]: Adding inventory item {0} {1} in {2}", item.Name, item.ID, item.Folder);
+//                "[MOCK INV DB]: Adding inventory item {0} {1} in {2} {3}", item.Name, item.ID, folder.Name, folder.ID);
             
             m_items[item.ID] = item;
         }
diff --git a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
index eaa0d33..d9ded2d 100644
--- a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
+++ b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
@@ -285,10 +285,16 @@ namespace OpenSim.Tests.Common.Setup
             config.AddConfig("Modules");
             config.AddConfig("InventoryService");
             config.Configs["Modules"].Set("InventoryServices", "LocalInventoryServicesConnector");
+            
             if (real)
+            {
                 config.Configs["InventoryService"].Set("LocalServiceModule", "OpenSim.Services.InventoryService.dll:InventoryService");
+            }
             else
+            {
                 config.Configs["InventoryService"].Set("LocalServiceModule", "OpenSim.Tests.Common.dll:MockInventoryService");
+            }
+            
             config.Configs["InventoryService"].Set("StorageProvider", "OpenSim.Tests.Common.dll");
             inventoryService.Initialise(config);
             inventoryService.AddRegion(testScene);
diff --git a/OpenSim/Tests/Common/Setup/UserProfileTestUtils.cs b/OpenSim/Tests/Common/Setup/UserProfileTestUtils.cs
index 380f258..26156f3 100644
--- a/OpenSim/Tests/Common/Setup/UserProfileTestUtils.cs
+++ b/OpenSim/Tests/Common/Setup/UserProfileTestUtils.cs
@@ -127,12 +127,19 @@ namespace OpenSim.Tests.Common.Setup
         {
             UserAccount ua 
                 = new UserAccount(userId) 
-                    { FirstName = firstName, LastName = lastName, ServiceURLs = new Dictionary<string, object>() };
+                    { FirstName = firstName, LastName = lastName };
+            CreateUserWithInventory(scene, ua, pw);
+            return ua;
+        }
+        
+        public static void CreateUserWithInventory(Scene scene, UserAccount ua, string pw)
+        {
+            // FIXME: This should really be set up by UserAccount itself
+            ua.ServiceURLs = new Dictionary<string, object>();
+                
             scene.UserAccountService.StoreUserAccount(ua);
             scene.InventoryService.CreateUserInventory(ua.PrincipalID);
             scene.AuthenticationService.SetPassword(ua.PrincipalID, pw);
-
-            return ua;
-        }        
+        }             
     }
 }
\ No newline at end of file