Merge branch 'master' of ssh://3dhosting.de/var/git/careminster

4 files changed, 33 insertions, 11 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 764bd2f..817736f 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -1491,14 +1491,12 @@ namespace OpenSim.Region.Framework.Scenes
 //                    m_log.DebugFormat(
 //                        "[PRIM INVENTORY]: Updating item {0} in {1} for UpdateTaskInventory()", 
 //                        currentItem.Name, part.Name);
-                    
                     IAgentAssetTransactions agentTransactions = this.RequestModuleInterface<IAgentAssetTransactions>();
                     if (agentTransactions != null)
                     {
                         agentTransactions.HandleTaskItemUpdateFromTransaction(
                             remoteClient, part, transactionID, currentItem);
                     }
-
                     // Base ALWAYS has move
                     currentItem.BasePermissions |= (uint)PermissionMask.Move;
 
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 3b0d1cd..cf7bf16 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -538,6 +538,12 @@ namespace OpenSim.Region.Framework.Scenes
             }
         }
 
+        public UUID LastOwnerID
+        {
+            get { return m_rootPart.LastOwnerID; }
+            set { m_rootPart.LastOwnerID = value; }
+        }
+
         public UUID OwnerID
         {
             get { return m_rootPart.OwnerID; }
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index b232855..5576ec9 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -4579,10 +4579,18 @@ namespace OpenSim.Region.Framework.Scenes
         /// <summary>
         /// Update the texture entry for this part.
         /// </summary>
-        /// <param name="textureEntry"></param>
-        public void UpdateTextureEntry(byte[] textureEntry)
+        /// <param name="serializedTextureEntry"></param>
+        public void UpdateTextureEntry(byte[] serializedTextureEntry)
+        {
+            UpdateTextureEntry(new Primitive.TextureEntry(serializedTextureEntry, 0, serializedTextureEntry.Length));
+        }
+
+        /// <summary>
+        /// Update the texture entry for this part.
+        /// </summary>
+        /// <param name="newTex"></param>
+        public void UpdateTextureEntry(Primitive.TextureEntry newTex)
         {
-            Primitive.TextureEntry newTex = new Primitive.TextureEntry(textureEntry, 0, textureEntry.Length);
             Primitive.TextureEntry oldTex = Shape.Textures;
 
             Changed changeFlags = 0;
@@ -4614,7 +4622,7 @@ namespace OpenSim.Region.Framework.Scenes
                     break;
             }
 
-            m_shape.TextureEntry = textureEntry;
+            m_shape.TextureEntry = newTex.GetBytes();
             if (changeFlags != 0)
                 TriggerScriptChangedEvent(changeFlags);
             UpdateFlag = UpdateRequired.FULL;
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
index c776fa5..2b0e115 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
@@ -1205,8 +1205,13 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
             writer.WriteElementString("ObjectSaleType", sop.ObjectSaleType.ToString());
             writer.WriteElementString("OwnershipCost", sop.OwnershipCost.ToString());
             WriteUUID(writer, "GroupID", sop.GroupID, options);
-            WriteUUID(writer, "OwnerID", sop.OwnerID, options);
-            WriteUUID(writer, "LastOwnerID", sop.LastOwnerID, options);
+
+            UUID ownerID = options.ContainsKey("wipe-owners") ? UUID.Zero : sop.OwnerID;
+            WriteUUID(writer, "OwnerID", ownerID, options);
+
+            UUID lastOwnerID = options.ContainsKey("wipe-owners") ? UUID.Zero : sop.LastOwnerID;
+            WriteUUID(writer, "LastOwnerID", lastOwnerID, options);
+
             writer.WriteElementString("BaseMask", sop.BaseMask.ToString());
             writer.WriteElementString("OwnerMask", sop.OwnerMask.ToString());
             writer.WriteElementString("GroupMask", sop.GroupMask.ToString());
@@ -1293,7 +1298,6 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
                     writer.WriteElementString("BasePermissions", item.BasePermissions.ToString());
                     writer.WriteElementString("CreationDate", item.CreationDate.ToString());
 
-                    
                     WriteUUID(writer, "CreatorID", item.CreatorID, options);
 
                     if (item.CreatorData != null && item.CreatorData != string.Empty)
@@ -1314,10 +1318,16 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
                     writer.WriteElementString("InvType", item.InvType.ToString());
                     WriteUUID(writer, "ItemID", item.ItemID, options);
                     WriteUUID(writer, "OldItemID", item.OldItemID, options);
-                    WriteUUID(writer, "LastOwnerID", item.LastOwnerID, options);
+
+                    UUID lastOwnerID = options.ContainsKey("wipe-owners") ? UUID.Zero : item.LastOwnerID;
+                    WriteUUID(writer, "LastOwnerID", lastOwnerID, options);
+
                     writer.WriteElementString("Name", item.Name);
                     writer.WriteElementString("NextPermissions", item.NextPermissions.ToString());
-                    WriteUUID(writer, "OwnerID", item.OwnerID, options);
+
+                    UUID ownerID = options.ContainsKey("wipe-owners") ? UUID.Zero : item.OwnerID;
+                    WriteUUID(writer, "OwnerID", ownerID, options);
+
                     writer.WriteElementString("CurrentPermissions", item.CurrentPermissions.ToString());
                     WriteUUID(writer, "ParentID", item.ParentID, options);
                     WriteUUID(writer, "ParentPartID", item.ParentPartID, options);