aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs6
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs16
-rw-r--r--OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs20
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
1491// m_log.DebugFormat( 1491// m_log.DebugFormat(
1492// "[PRIM INVENTORY]: Updating item {0} in {1} for UpdateTaskInventory()", 1492// "[PRIM INVENTORY]: Updating item {0} in {1} for UpdateTaskInventory()",
1493// currentItem.Name, part.Name); 1493// currentItem.Name, part.Name);
1494
1495 IAgentAssetTransactions agentTransactions = this.RequestModuleInterface<IAgentAssetTransactions>(); 1494 IAgentAssetTransactions agentTransactions = this.RequestModuleInterface<IAgentAssetTransactions>();
1496 if (agentTransactions != null) 1495 if (agentTransactions != null)
1497 { 1496 {
1498 agentTransactions.HandleTaskItemUpdateFromTransaction( 1497 agentTransactions.HandleTaskItemUpdateFromTransaction(
1499 remoteClient, part, transactionID, currentItem); 1498 remoteClient, part, transactionID, currentItem);
1500 } 1499 }
1501
1502 // Base ALWAYS has move 1500 // Base ALWAYS has move
1503 currentItem.BasePermissions |= (uint)PermissionMask.Move; 1501 currentItem.BasePermissions |= (uint)PermissionMask.Move;
1504 1502
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
538 } 538 }
539 } 539 }
540 540
541 public UUID LastOwnerID
542 {
543 get { return m_rootPart.LastOwnerID; }
544 set { m_rootPart.LastOwnerID = value; }
545 }
546
541 public UUID OwnerID 547 public UUID OwnerID
542 { 548 {
543 get { return m_rootPart.OwnerID; } 549 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
4579 /// <summary> 4579 /// <summary>
4580 /// Update the texture entry for this part. 4580 /// Update the texture entry for this part.
4581 /// </summary> 4581 /// </summary>
4582 /// <param name="textureEntry"></param> 4582 /// <param name="serializedTextureEntry"></param>
4583 public void UpdateTextureEntry(byte[] textureEntry) 4583 public void UpdateTextureEntry(byte[] serializedTextureEntry)
4584 {
4585 UpdateTextureEntry(new Primitive.TextureEntry(serializedTextureEntry, 0, serializedTextureEntry.Length));
4586 }
4587
4588 /// <summary>
4589 /// Update the texture entry for this part.
4590 /// </summary>
4591 /// <param name="newTex"></param>
4592 public void UpdateTextureEntry(Primitive.TextureEntry newTex)
4584 { 4593 {
4585 Primitive.TextureEntry newTex = new Primitive.TextureEntry(textureEntry, 0, textureEntry.Length);
4586 Primitive.TextureEntry oldTex = Shape.Textures; 4594 Primitive.TextureEntry oldTex = Shape.Textures;
4587 4595
4588 Changed changeFlags = 0; 4596 Changed changeFlags = 0;
@@ -4614,7 +4622,7 @@ namespace OpenSim.Region.Framework.Scenes
4614 break; 4622 break;
4615 } 4623 }
4616 4624
4617 m_shape.TextureEntry = textureEntry; 4625 m_shape.TextureEntry = newTex.GetBytes();
4618 if (changeFlags != 0) 4626 if (changeFlags != 0)
4619 TriggerScriptChangedEvent(changeFlags); 4627 TriggerScriptChangedEvent(changeFlags);
4620 UpdateFlag = UpdateRequired.FULL; 4628 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
1205 writer.WriteElementString("ObjectSaleType", sop.ObjectSaleType.ToString()); 1205 writer.WriteElementString("ObjectSaleType", sop.ObjectSaleType.ToString());
1206 writer.WriteElementString("OwnershipCost", sop.OwnershipCost.ToString()); 1206 writer.WriteElementString("OwnershipCost", sop.OwnershipCost.ToString());
1207 WriteUUID(writer, "GroupID", sop.GroupID, options); 1207 WriteUUID(writer, "GroupID", sop.GroupID, options);
1208 WriteUUID(writer, "OwnerID", sop.OwnerID, options); 1208
1209 WriteUUID(writer, "LastOwnerID", sop.LastOwnerID, options); 1209 UUID ownerID = options.ContainsKey("wipe-owners") ? UUID.Zero : sop.OwnerID;
1210 WriteUUID(writer, "OwnerID", ownerID, options);
1211
1212 UUID lastOwnerID = options.ContainsKey("wipe-owners") ? UUID.Zero : sop.LastOwnerID;
1213 WriteUUID(writer, "LastOwnerID", lastOwnerID, options);
1214
1210 writer.WriteElementString("BaseMask", sop.BaseMask.ToString()); 1215 writer.WriteElementString("BaseMask", sop.BaseMask.ToString());
1211 writer.WriteElementString("OwnerMask", sop.OwnerMask.ToString()); 1216 writer.WriteElementString("OwnerMask", sop.OwnerMask.ToString());
1212 writer.WriteElementString("GroupMask", sop.GroupMask.ToString()); 1217 writer.WriteElementString("GroupMask", sop.GroupMask.ToString());
@@ -1293,7 +1298,6 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
1293 writer.WriteElementString("BasePermissions", item.BasePermissions.ToString()); 1298 writer.WriteElementString("BasePermissions", item.BasePermissions.ToString());
1294 writer.WriteElementString("CreationDate", item.CreationDate.ToString()); 1299 writer.WriteElementString("CreationDate", item.CreationDate.ToString());
1295 1300
1296
1297 WriteUUID(writer, "CreatorID", item.CreatorID, options); 1301 WriteUUID(writer, "CreatorID", item.CreatorID, options);
1298 1302
1299 if (item.CreatorData != null && item.CreatorData != string.Empty) 1303 if (item.CreatorData != null && item.CreatorData != string.Empty)
@@ -1314,10 +1318,16 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
1314 writer.WriteElementString("InvType", item.InvType.ToString()); 1318 writer.WriteElementString("InvType", item.InvType.ToString());
1315 WriteUUID(writer, "ItemID", item.ItemID, options); 1319 WriteUUID(writer, "ItemID", item.ItemID, options);
1316 WriteUUID(writer, "OldItemID", item.OldItemID, options); 1320 WriteUUID(writer, "OldItemID", item.OldItemID, options);
1317 WriteUUID(writer, "LastOwnerID", item.LastOwnerID, options); 1321
1322 UUID lastOwnerID = options.ContainsKey("wipe-owners") ? UUID.Zero : item.LastOwnerID;
1323 WriteUUID(writer, "LastOwnerID", lastOwnerID, options);
1324
1318 writer.WriteElementString("Name", item.Name); 1325 writer.WriteElementString("Name", item.Name);
1319 writer.WriteElementString("NextPermissions", item.NextPermissions.ToString()); 1326 writer.WriteElementString("NextPermissions", item.NextPermissions.ToString());
1320 WriteUUID(writer, "OwnerID", item.OwnerID, options); 1327
1328 UUID ownerID = options.ContainsKey("wipe-owners") ? UUID.Zero : item.OwnerID;
1329 WriteUUID(writer, "OwnerID", ownerID, options);
1330
1321 writer.WriteElementString("CurrentPermissions", item.CurrentPermissions.ToString()); 1331 writer.WriteElementString("CurrentPermissions", item.CurrentPermissions.ToString());
1322 WriteUUID(writer, "ParentID", item.ParentID, options); 1332 WriteUUID(writer, "ParentID", item.ParentID, options);
1323 WriteUUID(writer, "ParentPartID", item.ParentPartID, options); 1333 WriteUUID(writer, "ParentPartID", item.ParentPartID, options);