Merge branch 'master-core' into mantis5110

17 files changed, 307 insertions, 99 deletions

diff --git a/OpenSim/Data/SQLite/SQLiteSimulationData.cs b/OpenSim/Data/SQLite/SQLiteSimulationData.cs
index 0bfd73a..8d93354 100644
--- a/OpenSim/Data/SQLite/SQLiteSimulationData.cs
+++ b/OpenSim/Data/SQLite/SQLiteSimulationData.cs
@@ -697,6 +697,7 @@ namespace OpenSim.Data.SQLite
                 DataRow landRow = land.Rows.Find(globalID.ToString());
                 if (landRow != null)
                 {
+                    landRow.Delete();
                     land.Rows.Remove(landRow);
                 }
                 List<DataRow> rowsToDelete = new List<DataRow>();
@@ -707,6 +708,7 @@ namespace OpenSim.Data.SQLite
                 }
                 for (int iter = 0; iter < rowsToDelete.Count; iter++)
                 {
+                    rowsToDelete[iter].Delete();
                     landaccesslist.Rows.Remove(rowsToDelete[iter]);
                 }
             }
@@ -755,6 +757,7 @@ namespace OpenSim.Data.SQLite
                 }
                 for (int iter = 0; iter < rowsToDelete.Count; iter++)
                 {
+                    rowsToDelete[iter].Delete();
                     landaccesslist.Rows.Remove(rowsToDelete[iter]);
                 }
                 rowsToDelete.Clear();
diff --git a/OpenSim/Data/SQLiteLegacy/SQLiteSimulationData.cs b/OpenSim/Data/SQLiteLegacy/SQLiteSimulationData.cs
index 1ad1e66..644864a 100644
--- a/OpenSim/Data/SQLiteLegacy/SQLiteSimulationData.cs
+++ b/OpenSim/Data/SQLiteLegacy/SQLiteSimulationData.cs
@@ -657,6 +657,7 @@ namespace OpenSim.Data.SQLiteLegacy
                 DataRow landRow = land.Rows.Find(globalID.ToString());
                 if (landRow != null)
                 {
+                    landRow.Delete();
                     land.Rows.Remove(landRow);
                 }
                 List<DataRow> rowsToDelete = new List<DataRow>();
@@ -667,6 +668,7 @@ namespace OpenSim.Data.SQLiteLegacy
                 }
                 for (int iter = 0; iter < rowsToDelete.Count; iter++)
                 {
+                    rowsToDelete[iter].Delete();
                     landaccesslist.Rows.Remove(rowsToDelete[iter]);
                 }
 
@@ -717,6 +719,7 @@ namespace OpenSim.Data.SQLiteLegacy
                 }
                 for (int iter = 0; iter < rowsToDelete.Count; iter++)
                 {
+                    rowsToDelete[iter].Delete();
                     landaccesslist.Rows.Remove(rowsToDelete[iter]);
                 }
                 rowsToDelete.Clear();
diff --git a/OpenSim/Data/Tests/InventoryTests.cs b/OpenSim/Data/Tests/InventoryTests.cs
index 3205bfa..dc03259 100644
--- a/OpenSim/Data/Tests/InventoryTests.cs
+++ b/OpenSim/Data/Tests/InventoryTests.cs
@@ -323,7 +323,8 @@ namespace OpenSim.Data.Tests
                                     .IgnoreProperty(x => x.InvType)
                                     .IgnoreProperty(x => x.CreatorIdAsUuid)
                                     .IgnoreProperty(x => x.Description)
-                                    .IgnoreProperty(x => x.CreatorId));
+                                    .IgnoreProperty(x => x.CreatorId)
+                                    .IgnoreProperty(x => x.CreatorData));
 
             inventoryScrambler.Scramble(expected);
             db.updateInventoryItem(expected);
@@ -333,7 +334,8 @@ namespace OpenSim.Data.Tests
                                     .IgnoreProperty(x => x.InvType)
                                     .IgnoreProperty(x => x.CreatorIdAsUuid)
                                     .IgnoreProperty(x => x.Description)
-                                    .IgnoreProperty(x => x.CreatorId));
+                                    .IgnoreProperty(x => x.CreatorId)
+                                    .IgnoreProperty(x => x.CreatorData));
         }
 
         [Test]
diff --git a/OpenSim/Framework/Capabilities/Caps.cs b/OpenSim/Framework/Capabilities/Caps.cs
index 7b0e053..e7f2e13 100644
--- a/OpenSim/Framework/Capabilities/Caps.cs
+++ b/OpenSim/Framework/Capabilities/Caps.cs
@@ -967,6 +967,7 @@ namespace OpenSim.Framework.Capabilities
             InventoryItemBase item = new InventoryItemBase();
             item.Owner = m_agentID;
             item.CreatorId = m_agentID.ToString();
+            item.CreatorData = String.Empty;
             item.ID = inventoryItem;
             item.AssetID = asset.FullID;
             item.Description = assetDescription;
diff --git a/OpenSim/Framework/InventoryItemBase.cs b/OpenSim/Framework/InventoryItemBase.cs
index ce4fc38..a663680 100644
--- a/OpenSim/Framework/InventoryItemBase.cs
+++ b/OpenSim/Framework/InventoryItemBase.cs
@@ -117,7 +117,7 @@ namespace OpenSim.Framework
         }
         protected UUID m_creatorIdAsUuid = UUID.Zero;
 
-        protected string m_creatorData;
+        protected string m_creatorData = string.Empty;
         public string CreatorData // = <profile url>;<name>
         {
             get { return m_creatorData; }
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index 1744fb3..1f49a01 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -111,7 +111,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                     return;
 
                 if (!m_scene.Permissions.CanTakeObject(part.UUID, remoteClient.AgentId))
+                {
+                    remoteClient.SendAgentAlertMessage(
+                        "You don't have sufficient permissions to attach this object", false);
+                    
                     return;
+                }
 
                 // TODO: this short circuits multiple attachments functionality  in  LL viewer 2.1+ and should
                 // be removed when that functionality is implemented in opensim
@@ -141,76 +146,66 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
         {
             Vector3 attachPos = group.AbsolutePosition;
 
-            if (m_scene.Permissions.CanTakeObject(group.UUID, remoteClient.AgentId))
+            // TODO: this short circuits multiple attachments functionality  in  LL viewer 2.1+ and should
+            // be removed when that functionality is implemented in opensim
+            AttachmentPt &= 0x7f;
+            
+            // If the attachment point isn't the same as the one previously used
+            // set it's offset position = 0 so that it appears on the attachment point
+            // and not in a weird location somewhere unknown.
+            if (AttachmentPt != 0 && AttachmentPt != (uint)group.GetAttachmentPoint())
             {
-                // TODO: this short circuits multiple attachments functionality  in  LL viewer 2.1+ and should
-                // be removed when that functionality is implemented in opensim
-                AttachmentPt &= 0x7f;
-                
-                // If the attachment point isn't the same as the one previously used
-                // set it's offset position = 0 so that it appears on the attachment point
-                // and not in a weird location somewhere unknown.
-                if (AttachmentPt != 0 && AttachmentPt != (uint)group.GetAttachmentPoint())
-                {
-                    attachPos = Vector3.Zero;
-                }
+                attachPos = Vector3.Zero;
+            }
 
-                // AttachmentPt 0 means the client chose to 'wear' the attachment.
-                if (AttachmentPt == 0)
-                {
-                    // Check object for stored attachment point
-                    AttachmentPt = (uint)group.GetAttachmentPoint();
-                }
+            // AttachmentPt 0 means the client chose to 'wear' the attachment.
+            if (AttachmentPt == 0)
+            {
+                // Check object for stored attachment point
+                AttachmentPt = (uint)group.GetAttachmentPoint();
+            }
 
-                // if we still didn't find a suitable attachment point.......
-                if (AttachmentPt == 0)
-                {
-                    // Stick it on left hand with Zero Offset from the attachment point.
-                    AttachmentPt = (uint)AttachmentPoint.LeftHand;
-                    attachPos = Vector3.Zero;
-                }
+            // if we still didn't find a suitable attachment point.......
+            if (AttachmentPt == 0)
+            {
+                // Stick it on left hand with Zero Offset from the attachment point.
+                AttachmentPt = (uint)AttachmentPoint.LeftHand;
+                attachPos = Vector3.Zero;
+            }
 
-                group.SetAttachmentPoint((byte)AttachmentPt);
-                group.AbsolutePosition = attachPos;
+            group.SetAttachmentPoint((byte)AttachmentPt);
+            group.AbsolutePosition = attachPos;
 
-                // Remove any previous attachments
-                ScenePresence sp = m_scene.GetScenePresence(remoteClient.AgentId);
-                UUID itemID = UUID.Zero;
-                if (sp != null)
+            // Remove any previous attachments
+            ScenePresence sp = m_scene.GetScenePresence(remoteClient.AgentId);
+            UUID itemID = UUID.Zero;
+            if (sp != null)
+            {
+                foreach (SceneObjectGroup grp in sp.Attachments)
                 {
-                    foreach (SceneObjectGroup grp in sp.Attachments)
+                    if (grp.GetAttachmentPoint() == (byte)AttachmentPt)
                     {
-                        if (grp.GetAttachmentPoint() == (byte)AttachmentPt)
-                        {
-                            itemID = grp.GetFromItemID();
-                            break;
-                        }
+                        itemID = grp.GetFromItemID();
+                        break;
                     }
-                    if (itemID != UUID.Zero)
-                        DetachSingleAttachmentToInv(itemID, remoteClient);
                 }
+                if (itemID != UUID.Zero)
+                    DetachSingleAttachmentToInv(itemID, remoteClient);
+            }
 
-                if (group.GetFromItemID() == UUID.Zero)
-                {
-                    m_scene.attachObjectAssetStore(remoteClient, group, remoteClient.AgentId, out itemID);
-                }
-                else
-                {
-                    itemID = group.GetFromItemID();
-                }
-
-                ShowAttachInUserInventory(remoteClient, AttachmentPt, itemID, group);
-
-                AttachToAgent(sp, group, AttachmentPt, attachPos, silent);
+            if (group.GetFromItemID() == UUID.Zero)
+            {
+                m_scene.attachObjectAssetStore(remoteClient, group, remoteClient.AgentId, out itemID);
             }
             else
             {
-                remoteClient.SendAgentAlertMessage(
-                    "You don't have sufficient permissions to attach this object", false);
-                
-                return false;
+                itemID = group.GetFromItemID();
             }
 
+            ShowAttachInUserInventory(remoteClient, AttachmentPt, itemID, group);
+
+            AttachToAgent(sp, group, AttachmentPt, attachPos, silent);
+
             return true;
         }
 
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs
index 358d0a7..2d7244e 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs
@@ -130,7 +130,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
 
             List<string> mainParams = ops.Parse(cmdparams);
 
-            if (cmdparams.Length > 2)
+            if (mainParams.Count > 2)
             {
                 ArchiveRegion(mainParams[2], options);
             }
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index a29b7f1..06f8ac1 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -1733,7 +1733,12 @@ namespace OpenSim.Region.Framework.Scenes
                     // Autoreturn has a null client. Nothing else does. So
                     // allow only returns
                     if (action != DeRezAction.Return)
+                    {
+                        m_log.WarnFormat(
+                            "[AGENT INVENTORY]: Ignoring attempt to {0} {1} {2} without a client", 
+                            action, grp.Name, grp.UUID);
                         return;
+                    }
 
                     permissionToTakeCopy = false;
                 }
@@ -1741,13 +1746,13 @@ namespace OpenSim.Region.Framework.Scenes
                 {
                     if (!Permissions.CanTakeCopyObject(grp.UUID, remoteClient.AgentId))
                         permissionToTakeCopy = false;
+                    
                     if (!Permissions.CanTakeObject(grp.UUID, remoteClient.AgentId))
                         permissionToTake = false;
-
+                    
                     if (!Permissions.CanDeleteObject(grp.UUID, remoteClient.AgentId))
                         permissionToDelete = false;
                 }
-
             }
 
             // Handle god perms
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs b/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs
index 06890a0..d67638a 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs
@@ -27,13 +27,15 @@
 
 using System;
 using System.Collections.Generic;
+using System.Reflection;
 using System.Text;
+using log4net;
 using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 
 namespace OpenSim.Region.Framework.Scenes
-{
+{        
     #region Delegates
     public delegate uint GenerateClientFlagsHandler(UUID userID, UUID objectID);
     public delegate void SetBypassPermissionsHandler(bool value);
@@ -88,6 +90,8 @@ namespace OpenSim.Region.Framework.Scenes
 
     public class ScenePermissions
     {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        
         private Scene m_scene;
 
         public ScenePermissions(Scene scene)
@@ -242,6 +246,8 @@ namespace OpenSim.Region.Framework.Scenes
         #region DELETE OBJECT
         public bool CanDeleteObject(UUID objectID, UUID deleter)
         {
+            bool result = true;
+            
             DeleteObjectHandler handler = OnDeleteObject;
             if (handler != null)
             {
@@ -249,10 +255,18 @@ namespace OpenSim.Region.Framework.Scenes
                 foreach (DeleteObjectHandler h in list)
                 {
                     if (h(objectID, deleter, m_scene) == false)
-                        return false;
+                    {
+                        result = false;
+                        break;
+                    }
                 }
             }
-            return true;
+            
+//            m_log.DebugFormat(
+//                "[SCENE PERMISSIONS]: CanDeleteObject() fired for object {0}, deleter {1}, result {2}", 
+//                objectID, deleter, result);
+                        
+            return result;
         }
 
         #endregion
@@ -260,6 +274,8 @@ namespace OpenSim.Region.Framework.Scenes
         #region TAKE OBJECT
         public bool CanTakeObject(UUID objectID, UUID AvatarTakingUUID)
         {
+            bool result = true;
+            
             TakeObjectHandler handler = OnTakeObject;
             if (handler != null)
             {
@@ -267,10 +283,18 @@ namespace OpenSim.Region.Framework.Scenes
                 foreach (TakeObjectHandler h in list)
                 {
                     if (h(objectID, AvatarTakingUUID, m_scene) == false)
-                        return false;
+                    {
+                        result = false;
+                        break;
+                    }
                 }
             }
-            return true;
+            
+//            m_log.DebugFormat(
+//                "[SCENE PERMISSIONS]: CanTakeObject() fired for object {0}, taker {1}, result {2}", 
+//                objectID, AvatarTakingUUID, result);
+                        
+            return result;
         }
 
         #endregion
@@ -278,6 +302,8 @@ namespace OpenSim.Region.Framework.Scenes
         #region TAKE COPY OBJECT
         public bool CanTakeCopyObject(UUID objectID, UUID userID)
         {
+            bool result = true;
+            
             TakeCopyObjectHandler handler = OnTakeCopyObject;
             if (handler != null)
             {
@@ -285,10 +311,18 @@ namespace OpenSim.Region.Framework.Scenes
                 foreach (TakeCopyObjectHandler h in list)
                 {
                     if (h(objectID, userID, m_scene) == false)
-                        return false;
+                    {
+                        result = false;
+                        break;
+                    }
                 }
             }
-            return true;
+            
+//            m_log.DebugFormat(
+//                "[SCENE PERMISSIONS]: CanTakeCopyObject() fired for object {0}, user {1}, result {2}", 
+//                objectID, userID, result);
+            
+            return result;
         }
 
         #endregion
@@ -383,6 +417,8 @@ namespace OpenSim.Region.Framework.Scenes
         #region RETURN OBJECT
         public bool CanReturnObjects(ILandObject land, UUID user, List<SceneObjectGroup> objects)
         {
+            bool result = true;
+            
             ReturnObjectsHandler handler = OnReturnObjects;
             if (handler != null)
             {
@@ -390,10 +426,18 @@ namespace OpenSim.Region.Framework.Scenes
                 foreach (ReturnObjectsHandler h in list)
                 {
                     if (h(land, user, objects, m_scene) == false)
-                        return false;
+                    {
+                        result = false;
+                        break;
+                    }
                 }
             }
-            return true;
+            
+//            m_log.DebugFormat(
+//                "[SCENE PERMISSIONS]: CanReturnObjects() fired for user {0} for {1} objects on {2}, result {3}", 
+//                user, objects.Count, land.LandData.Name, result);
+                        
+            return result;
         }
 
         #endregion
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index c2810b2..4ec530e 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -2607,6 +2607,7 @@ namespace OpenSim.Region.Framework.Scenes
                 //if (part.UUID != m_rootPart.UUID)
 
                 HasGroupChanged = true;
+                part.TriggerScriptChangedEvent(Changed.SCALE);
                 ScheduleGroupForFullUpdate();
 
                 //if (part.UUID == m_rootPart.UUID)
@@ -2758,6 +2759,7 @@ namespace OpenSim.Region.Framework.Scenes
                 part.IgnoreUndoUpdate = false;
                 part.StoreUndoState();
                 HasGroupChanged = true;
+                m_rootPart.TriggerScriptChangedEvent(Changed.SCALE);
                 ScheduleGroupForTerseUpdate();
             }
         }
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 2155e26..ba592c4 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -1002,21 +1002,7 @@ namespace OpenSim.Region.Framework.Scenes
         public PrimitiveBaseShape Shape
         {
             get { return m_shape; }
-            set
-            {
-                bool shape_changed = false;
-                // TODO: this should really be restricted to the right
-                // set of attributes on shape change.  For instance,
-                // changing the lighting on a shape shouldn't cause
-                // this.
-                if (m_shape != null)
-                    shape_changed = true;
-
-                m_shape = value;
-
-                if (shape_changed)
-                    TriggerScriptChangedEvent(Changed.SHAPE);
-            }
+            set { m_shape = value; }
         }
         
         public Vector3 Scale
@@ -4570,6 +4556,7 @@ namespace OpenSim.Region.Framework.Scenes
                 ParentGroup.RootPart.Rezzed = DateTime.UtcNow;
 
             ParentGroup.HasGroupChanged = true;
+            TriggerScriptChangedEvent(Changed.SHAPE);
             ScheduleFullUpdate();
         }
 
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUserTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUserTests.cs
new file mode 100644
index 0000000..b3b99f4
--- /dev/null
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUserTests.cs
@@ -0,0 +1,129 @@
+/*
+ * 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 Nini.Config;
+using NUnit.Framework;
+using NUnit.Framework.SyntaxHelpers;
+using OpenMetaverse;
+using OpenSim.Framework;
+using OpenSim.Framework.Communications;
+using OpenSim.Region.CoreModules.World.Permissions;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Tests.Common;
+using OpenSim.Tests.Common.Mock;
+using OpenSim.Tests.Common.Setup;
+
+namespace OpenSim.Region.Framework.Scenes.Tests
+{
+    /// <summary>
+    /// Tests manipulation of scene objects by users.
+    /// </summary>
+    /// 
+    /// This is at a level above the SceneObjectBasicTests, which act on the scene directly.
+    /// FIXME: These tests are very incomplete - they only test for a few conditions.
+    [TestFixture]
+    public class SceneObjectUserTests
+    {
+        /// <summary>
+        /// Test deleting an object from a scene.
+        /// </summary>
+        [Test]
+        public void TestDeRezSceneObject()
+        {
+            TestHelper.InMethod();
+//            log4net.Config.XmlConfigurator.Configure();
+                        
+            UUID userId = UUID.Parse("10000000-0000-0000-0000-000000000001");
+            
+            TestScene scene = SceneSetupHelpers.SetupScene();
+            IConfigSource configSource = new IniConfigSource();
+            IConfig config = configSource.AddConfig("Startup");
+            config.Set("serverside_object_permissions", true);
+            SceneSetupHelpers.SetupSceneModules(scene, configSource, new object[] { new PermissionsModule() });
+            TestClient client = SceneSetupHelpers.AddRootAgent(scene, userId);
+            
+            // Turn off the timer on the async sog deleter - we'll crank it by hand for this test.
+            AsyncSceneObjectGroupDeleter sogd = scene.SceneObjectGroupDeleter;
+            sogd.Enabled = false;            
+            
+            SceneObjectPart part
+                = new SceneObjectPart(userId, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero);
+            part.Name = "obj1";
+            scene.AddNewSceneObject(new SceneObjectGroup(part), false);
+            List<uint> localIds = new List<uint>();
+            localIds.Add(part.LocalId);
+
+            scene.DeRezObjects(client, localIds, UUID.Zero, DeRezAction.Delete, UUID.Zero);
+            sogd.InventoryDeQueueAndDelete();
+            
+            SceneObjectPart retrievedPart = scene.GetSceneObjectPart(part.LocalId);
+            Assert.That(retrievedPart, Is.Null);
+        }
+        
+        /// <summary>
+        /// Test deleting an object from a scene where the deleter is not the owner
+        /// </summary>
+        /// 
+        /// This test assumes that the deleter is not a god.       
+        [Test]
+        public void TestDeRezSceneObjectNotOwner()
+        {
+            TestHelper.InMethod();
+//            log4net.Config.XmlConfigurator.Configure();
+                        
+            UUID userId = UUID.Parse("10000000-0000-0000-0000-000000000001");
+            UUID objectOwnerId = UUID.Parse("20000000-0000-0000-0000-000000000001");
+            
+            TestScene scene = SceneSetupHelpers.SetupScene();
+            IConfigSource configSource = new IniConfigSource();
+            IConfig config = configSource.AddConfig("Startup");
+            config.Set("serverside_object_permissions", true);
+            SceneSetupHelpers.SetupSceneModules(scene, configSource, new object[] { new PermissionsModule() });            
+            TestClient client = SceneSetupHelpers.AddRootAgent(scene, userId);
+            
+            // Turn off the timer on the async sog deleter - we'll crank it by hand for this test.
+            AsyncSceneObjectGroupDeleter sogd = scene.SceneObjectGroupDeleter;
+            sogd.Enabled = false;            
+            
+            SceneObjectPart part
+                = new SceneObjectPart(objectOwnerId, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero);
+            part.Name = "obj1";
+            scene.AddNewSceneObject(new SceneObjectGroup(part), false);
+            List<uint> localIds = new List<uint>();
+            localIds.Add(part.LocalId);            
+
+            scene.DeRezObjects(client, localIds, UUID.Zero, DeRezAction.Delete, UUID.Zero);
+            sogd.InventoryDeQueueAndDelete();
+            
+            SceneObjectPart retrievedPart = scene.GetSceneObjectPart(part.LocalId);
+            Assert.That(retrievedPart.UUID, Is.EqualTo(part.UUID));
+        }        
+    }
+}
\ No newline at end of file
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs
index ab5968c..ef52363 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs
@@ -65,6 +65,8 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         [TestFixtureSetUp]
         public void Init()
         {
+            TestHelper.InMethod();
+            
             scene = SceneSetupHelpers.SetupScene("Neighbour x", UUID.Random(), 1000, 1000);
             scene2 = SceneSetupHelpers.SetupScene("Neighbour x+1", UUID.Random(), 1001, 1000);
             scene3 = SceneSetupHelpers.SetupScene("Neighbour x-1", UUID.Random(), 999, 1000);
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
index 294d4f0..a583cca 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
@@ -58,7 +58,7 @@ using OSDMap = OpenMetaverse.StructuredData.OSDMap;
 namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
 {
     [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "FreeSwitchVoiceModule")]
-    public class FreeSwitchVoiceModule : INonSharedRegionModule, IVoiceModule
+    public class FreeSwitchVoiceModule : ISharedRegionModule, IVoiceModule
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
@@ -97,8 +97,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
         private readonly Dictionary<string, string> m_UUIDName = new Dictionary<string, string>();
         private Dictionary<string, string> m_ParcelAddress = new Dictionary<string, string>();
 
-        private Scene m_Scene;
-
         private IConfig m_Config;
 
         private IFreeswitchService m_FreeswitchService;
@@ -165,6 +163,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
                 MainServer.Instance.AddHTTPHandler(String.Format("{0}/viv_get_prelogin.php", m_freeSwitchAPIPrefix),
                                                      FreeSwitchSLVoiceGetPreloginHTTPHandler);
 
+                MainServer.Instance.AddHTTPHandler(String.Format("{0}/freeswitch-config", m_freeSwitchAPIPrefix), FreeSwitchConfigHTTPHandler);
+
                 // RestStreamHandler h = new
                 // RestStreamHandler("GET",
                 // String.Format("{0}/viv_get_prelogin.php", m_freeSwitchAPIPrefix), FreeSwitchSLVoiceGetPreloginHTTPHandler);
@@ -214,15 +214,17 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
             }
         }
 
-        public void AddRegion(Scene scene)
+        public void PostInitialise()
         {
-            m_Scene = scene;
+        }
 
+        public void AddRegion(Scene scene)
+        {
             // We generate these like this: The region's external host name
             // as defined in Regions.ini is a good address to use. It's a
             // dotted quad (or should be!) and it can reach this host from
             // a client. The port is grabbed from the region's HTTP server.
-            m_openSimWellKnownHTTPAddress = m_Scene.RegionInfo.ExternalHostName;
+            m_openSimWellKnownHTTPAddress = scene.RegionInfo.ExternalHostName;
             m_freeSwitchServicePort = MainServer.Instance.Port;
 
             if (m_Enabled)
@@ -601,7 +603,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
             response["str_response_string"] = string.Empty;
             response["content-type"] = "text/xml";
 
-            Hashtable requestBody = parseRequestBody((string)request["body"]);
+            Hashtable requestBody = ParseRequestBody((string)request["body"]);
 
             if (!requestBody.ContainsKey("auth_token"))
                 return response;
@@ -673,7 +675,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
             string uri = (string)request["uri"];
             string contenttype = (string)request["content-type"];
 
-            Hashtable requestBody = parseRequestBody((string)request["body"]);
+            Hashtable requestBody = ParseRequestBody((string)request["body"]);
 
             //string pwd = (string) requestBody["pwd"];
             string userid = (string) requestBody["userid"];
@@ -717,7 +719,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
             return response;
         }
 
-        public Hashtable parseRequestBody(string body)
+        public Hashtable ParseRequestBody(string body)
         {
             Hashtable bodyParams = new Hashtable();
             // split string
@@ -790,6 +792,28 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
         {
             return true;
         }
+
+        public Hashtable FreeSwitchConfigHTTPHandler(Hashtable request)
+        {
+            Hashtable response = new Hashtable();
+            response["str_response_string"] = string.Empty;
+            response["content_type"] = "text/plain";
+            response["keepalive"] = false;
+            response["int_response_code"] = 500;
+
+            Hashtable requestBody = ParseRequestBody((string) request["body"]);
+
+            string section = (string) requestBody["section"];
+
+            if (section == "directory")
+                response = m_FreeswitchService.HandleDirectoryRequest(requestBody);
+            else if (section == "dialplan")
+                response = m_FreeswitchService.HandleDialplanRequest(requestBody);
+            else
+                m_log.WarnFormat("[FreeSwitchVoice]: section was {0}", section);
+
+            return response;
+        }
     }
 
     public class MonoCert : ICertificatePolicy
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
index 6663aa5..660e9a3 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
@@ -392,13 +392,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
                 {
 //                    m_log.Debug("[Script] Posted changed(CHANGED_REGION_RESTART) to script");
                     PostEvent(new EventParams("changed",
-                                              new Object[] { (int)Changed.REGION_RESTART }, new DetectParams[0]));
+                                              new Object[] { new LSL_Types.LSLInteger((int)Changed.REGION_RESTART) },
+                                              new DetectParams[0]));
                 }
                 else if (m_stateSource == StateSource.PrimCrossing)
                 {
                     // CHANGED_REGION
                     PostEvent(new EventParams("changed",
-                                              new Object[] { (int)Changed.REGION }, new DetectParams[0]));
+                                              new Object[] { new LSL_Types.LSLInteger((int)Changed.REGION) },
+                                              new DetectParams[0]));
                 }
             } 
             else 
diff --git a/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs b/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs
index 23ae5b4..22a718a 100644
--- a/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs
+++ b/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs
@@ -600,8 +600,10 @@ namespace OpenSim.Server.Handlers.Asset
             ret["AssetType"] = item.AssetType.ToString();
             ret["BasePermissions"] = item.BasePermissions.ToString();
             ret["CreationDate"] = item.CreationDate.ToString();
-            ret["CreatorId"] = item.CreatorId.ToString();
-            ret["CreatorData"] = item.CreatorData.ToString();
+            if (item.CreatorId != null)
+                ret["CreatorId"] = item.CreatorId.ToString();
+            else
+                ret["CreatorId"] = String.Empty;
             ret["CurrentPermissions"] = item.CurrentPermissions.ToString();
             ret["Description"] = item.Description.ToString();
             ret["EveryOnePermissions"] = item.EveryOnePermissions.ToString();
diff --git a/OpenSim/Services/Connectors/Inventory/XInventoryConnector.cs b/OpenSim/Services/Connectors/Inventory/XInventoryConnector.cs
index 88fbda3..b3bfcc2 100644
--- a/OpenSim/Services/Connectors/Inventory/XInventoryConnector.cs
+++ b/OpenSim/Services/Connectors/Inventory/XInventoryConnector.cs
@@ -302,6 +302,8 @@ namespace OpenSim.Services.Connectors
 
         public bool AddItem(InventoryItemBase item)
         {
+            if (item.CreatorData == null)
+                item.CreatorData = String.Empty;
             Dictionary<string,object> ret = MakeRequest("ADDITEM",
                     new Dictionary<string,object> {
                         { "AssetID", item.AssetID.ToString() },
@@ -335,6 +337,8 @@ namespace OpenSim.Services.Connectors
 
         public bool UpdateItem(InventoryItemBase item)
         {
+            if (item.CreatorData == null)
+                item.CreatorData = String.Empty;
             Dictionary<string,object> ret = MakeRequest("UPDATEITEM",
                     new Dictionary<string,object> {
                         { "AssetID", item.AssetID.ToString() },
@@ -558,7 +562,10 @@ namespace OpenSim.Services.Connectors
                 item.InvType = int.Parse(data["InvType"].ToString());
                 item.Folder = new UUID(data["Folder"].ToString());
                 item.CreatorId = data["CreatorId"].ToString();
-                item.CreatorData = data["CreatorData"].ToString();
+                if (data.ContainsKey("CreatorData"))
+                    item.CreatorData = data["CreatorData"].ToString();
+                else
+                    item.CreatorData = String.Empty;
                 item.Description = data["Description"].ToString();
                 item.NextPermissions = uint.Parse(data["NextPermissions"].ToString());
                 item.CurrentPermissions = uint.Parse(data["CurrentPermissions"].ToString());