diff options
author | Mandarinka Tasty | 2016-12-04 07:10:13 +0100 |
---|---|---|
committer | UbitUmarov | 2016-12-04 17:18:56 +0000 |
commit | 7c566dca5a41cd3a9cb0336b00bdf7d63e24d2e9 (patch) | |
tree | b065a6dc4641b3d0ff1b805fdcb76bd4a2248518 /OpenSim/Region/Framework/Scenes | |
parent | a few changes to new GetDisplaynames and friends (diff) | |
download | opensim-SC_OLD-7c566dca5a41cd3a9cb0336b00bdf7d63e24d2e9.zip opensim-SC_OLD-7c566dca5a41cd3a9cb0336b00bdf7d63e24d2e9.tar.gz opensim-SC_OLD-7c566dca5a41cd3a9cb0336b00bdf7d63e24d2e9.tar.bz2 opensim-SC_OLD-7c566dca5a41cd3a9cb0336b00bdf7d63e24d2e9.tar.xz |
The new Constant: integer OBJECT_REZZER_KEY = 32;
Signed-off-by: Mandarinka Tasty <mandarinka.tasty@gmail.com>
Signed-off-by: UbitUmarov <ajlduarte@sapo.pt>
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
5 files changed, 27 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index 339fc15..daf7741 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
@@ -2625,6 +2625,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
2625 | } | 2625 | } |
2626 | 2626 | ||
2627 | group.FromPartID = sourcePart.UUID; | 2627 | group.FromPartID = sourcePart.UUID; |
2628 | group.RezzerID = group.FromPartID; | ||
2629 | |||
2628 | if( i == 0) | 2630 | if( i == 0) |
2629 | AddNewSceneObject(group, true, curpos, rot, vel); | 2631 | AddNewSceneObject(group, true, curpos, rot, vel); |
2630 | else | 2632 | else |
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs index f5f83ca..579874a 100755 --- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs +++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs | |||
@@ -1942,6 +1942,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1942 | else | 1942 | else |
1943 | { | 1943 | { |
1944 | part.LastOwnerID = part.ParentGroup.RootPart.LastOwnerID; | 1944 | part.LastOwnerID = part.ParentGroup.RootPart.LastOwnerID; |
1945 | part.RezzerID = part.ParentGroup.RootPart.RezzerID; | ||
1945 | childParts.Add(part); | 1946 | childParts.Add(part); |
1946 | } | 1947 | } |
1947 | } | 1948 | } |
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index 6cdbac5..fcbcc3f 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
@@ -886,6 +886,12 @@ namespace OpenSim.Region.Framework.Scenes | |||
886 | set { m_rootPart.LastOwnerID = value; } | 886 | set { m_rootPart.LastOwnerID = value; } |
887 | } | 887 | } |
888 | 888 | ||
889 | public UUID RezzerID | ||
890 | { | ||
891 | get { return m_rootPart.RezzerID; } | ||
892 | set { m_rootPart.RezzerID = value; } | ||
893 | } | ||
894 | |||
889 | public UUID OwnerID | 895 | public UUID OwnerID |
890 | { | 896 | { |
891 | get { return m_rootPart.OwnerID; } | 897 | get { return m_rootPart.OwnerID; } |
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index 3a06e7d..b95b5be 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -460,7 +460,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
460 | m_name = "Object"; | 460 | m_name = "Object"; |
461 | 461 | ||
462 | CreationDate = (int)Utils.DateTimeToUnixTime(Rezzed); | 462 | CreationDate = (int)Utils.DateTimeToUnixTime(Rezzed); |
463 | LastOwnerID = CreatorID = OwnerID = ownerID; | 463 | RezzerID = LastOwnerID = CreatorID = OwnerID = ownerID; |
464 | UUID = UUID.Random(); | 464 | UUID = UUID.Random(); |
465 | Shape = shape; | 465 | Shape = shape; |
466 | OwnershipCost = 0; | 466 | OwnershipCost = 0; |
@@ -484,6 +484,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
484 | 484 | ||
485 | #region XML Schema | 485 | #region XML Schema |
486 | 486 | ||
487 | private UUID _rezzerID; | ||
487 | private UUID _lastOwnerID; | 488 | private UUID _lastOwnerID; |
488 | private UUID _ownerID; | 489 | private UUID _ownerID; |
489 | private UUID _groupID; | 490 | private UUID _groupID; |
@@ -1385,6 +1386,12 @@ namespace OpenSim.Region.Framework.Scenes | |||
1385 | set { _lastOwnerID = value; } | 1386 | set { _lastOwnerID = value; } |
1386 | } | 1387 | } |
1387 | 1388 | ||
1389 | public UUID RezzerID | ||
1390 | { | ||
1391 | get { return _rezzerID; } | ||
1392 | set { _rezzerID = value; } | ||
1393 | } | ||
1394 | |||
1388 | public uint BaseMask | 1395 | public uint BaseMask |
1389 | { | 1396 | { |
1390 | get { return _baseMask; } | 1397 | get { return _baseMask; } |
@@ -2222,6 +2229,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2222 | 2229 | ||
2223 | // This may be wrong... it might have to be applied in SceneObjectGroup to the object that's being duplicated. | 2230 | // This may be wrong... it might have to be applied in SceneObjectGroup to the object that's being duplicated. |
2224 | dupe.LastOwnerID = OwnerID; | 2231 | dupe.LastOwnerID = OwnerID; |
2232 | dupe.RezzerID = RezzerID; | ||
2225 | 2233 | ||
2226 | byte[] extraP = new byte[Shape.ExtraParams.Length]; | 2234 | byte[] extraP = new byte[Shape.ExtraParams.Length]; |
2227 | Array.Copy(Shape.ExtraParams, extraP, extraP.Length); | 2235 | Array.Copy(Shape.ExtraParams, extraP, extraP.Length); |
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs index 7d3a168..0b7379b 100644 --- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs +++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs | |||
@@ -428,6 +428,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
428 | m_SOPXmlProcessors.Add("GroupID", ProcessGroupID); | 428 | m_SOPXmlProcessors.Add("GroupID", ProcessGroupID); |
429 | m_SOPXmlProcessors.Add("OwnerID", ProcessOwnerID); | 429 | m_SOPXmlProcessors.Add("OwnerID", ProcessOwnerID); |
430 | m_SOPXmlProcessors.Add("LastOwnerID", ProcessLastOwnerID); | 430 | m_SOPXmlProcessors.Add("LastOwnerID", ProcessLastOwnerID); |
431 | m_SOPXmlProcessors.Add("RezzerID", ProcessRezzerID); | ||
431 | m_SOPXmlProcessors.Add("BaseMask", ProcessBaseMask); | 432 | m_SOPXmlProcessors.Add("BaseMask", ProcessBaseMask); |
432 | m_SOPXmlProcessors.Add("OwnerMask", ProcessOwnerMask); | 433 | m_SOPXmlProcessors.Add("OwnerMask", ProcessOwnerMask); |
433 | m_SOPXmlProcessors.Add("GroupMask", ProcessGroupMask); | 434 | m_SOPXmlProcessors.Add("GroupMask", ProcessGroupMask); |
@@ -864,6 +865,11 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
864 | obj.LastOwnerID = Util.ReadUUID(reader, "LastOwnerID"); | 865 | obj.LastOwnerID = Util.ReadUUID(reader, "LastOwnerID"); |
865 | } | 866 | } |
866 | 867 | ||
868 | private static void ProcessRezzerID(SceneObjectPart obj, XmlReader reader) | ||
869 | { | ||
870 | obj.RezzerID = Util.ReadUUID(reader, "RezzerID"); | ||
871 | } | ||
872 | |||
867 | private static void ProcessBaseMask(SceneObjectPart obj, XmlReader reader) | 873 | private static void ProcessBaseMask(SceneObjectPart obj, XmlReader reader) |
868 | { | 874 | { |
869 | obj.BaseMask = (uint)reader.ReadElementContentAsInt("BaseMask", String.Empty); | 875 | obj.BaseMask = (uint)reader.ReadElementContentAsInt("BaseMask", String.Empty); |
@@ -1452,6 +1458,9 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
1452 | UUID lastOwnerID = options.ContainsKey("wipe-owners") ? UUID.Zero : sop.LastOwnerID; | 1458 | UUID lastOwnerID = options.ContainsKey("wipe-owners") ? UUID.Zero : sop.LastOwnerID; |
1453 | WriteUUID(writer, "LastOwnerID", lastOwnerID, options); | 1459 | WriteUUID(writer, "LastOwnerID", lastOwnerID, options); |
1454 | 1460 | ||
1461 | UUID rezzerID = options.ContainsKey("wipe-owners") ? UUID.Zero : sop.RezzerID; | ||
1462 | WriteUUID(writer, "RezzerID", rezzerID, options); | ||
1463 | |||
1455 | writer.WriteElementString("BaseMask", sop.BaseMask.ToString()); | 1464 | writer.WriteElementString("BaseMask", sop.BaseMask.ToString()); |
1456 | writer.WriteElementString("OwnerMask", sop.OwnerMask.ToString()); | 1465 | writer.WriteElementString("OwnerMask", sop.OwnerMask.ToString()); |
1457 | writer.WriteElementString("GroupMask", sop.GroupMask.ToString()); | 1466 | writer.WriteElementString("GroupMask", sop.GroupMask.ToString()); |