diff options
Applied ldvoipeng's patch [#360], sorry for it taking so long to apply it. If in future anyone's patch hasn't been applied within a few days, please can someone kick one of the developers with svn access.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs index 2122a4f..81c759d 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | |||
@@ -10,7 +10,7 @@ using libsecondlife.Packets; | |||
10 | using OpenSim.Framework.Interfaces; | 10 | using OpenSim.Framework.Interfaces; |
11 | using OpenSim.Framework.Types; | 11 | using OpenSim.Framework.Types; |
12 | using OpenSim.Region.Environment.Scenes.Scripting; | 12 | using OpenSim.Region.Environment.Scenes.Scripting; |
13 | using OpenSim.Framework.Utilities; | 13 | using OpenSim.Framework; |
14 | using OpenSim.Region.Physics.Manager; | 14 | using OpenSim.Region.Physics.Manager; |
15 | using OpenSim.Region.Environment.Interfaces; | 15 | using OpenSim.Region.Environment.Interfaces; |
16 | 16 | ||
@@ -29,7 +29,6 @@ namespace OpenSim.Region.Environment.Scenes | |||
29 | 29 | ||
30 | protected Dictionary<LLUUID, TaskInventoryItem> TaskInventory = new Dictionary<LLUUID, TaskInventoryItem>(); | 30 | protected Dictionary<LLUUID, TaskInventoryItem> TaskInventory = new Dictionary<LLUUID, TaskInventoryItem>(); |
31 | 31 | ||
32 | public LLUUID CreatorID; | ||
33 | public LLUUID OwnerID; | 32 | public LLUUID OwnerID; |
34 | public LLUUID GroupID; | 33 | public LLUUID GroupID; |
35 | public LLUUID LastOwnerID; | 34 | public LLUUID LastOwnerID; |
@@ -56,6 +55,9 @@ namespace OpenSim.Region.Environment.Scenes | |||
56 | 55 | ||
57 | #region Properties | 56 | #region Properties |
58 | 57 | ||
58 | public LLUUID CreatorID; | ||
59 | public LLUUID ObjectCreator { get { return CreatorID; } } | ||
60 | |||
59 | /// <summary> | 61 | /// <summary> |
60 | /// Serial count for inventory file , used to tell if inventory has changed | 62 | /// Serial count for inventory file , used to tell if inventory has changed |
61 | /// no need for this to be part of Database backup | 63 | /// no need for this to be part of Database backup |
@@ -210,6 +212,11 @@ namespace OpenSim.Region.Environment.Scenes | |||
210 | get { return OwnerID; } | 212 | get { return OwnerID; } |
211 | } | 213 | } |
212 | 214 | ||
215 | public SceneObjectGroup ParentGroup | ||
216 | { | ||
217 | get { return m_parentGroup; } | ||
218 | } | ||
219 | |||
213 | #region Constructors | 220 | #region Constructors |
214 | /// <summary> | 221 | /// <summary> |
215 | /// | 222 | /// |
@@ -324,6 +331,15 @@ namespace OpenSim.Region.Environment.Scenes | |||
324 | 331 | ||
325 | } | 332 | } |
326 | 333 | ||
334 | public LLUUID GetRootPartUUID() | ||
335 | { | ||
336 | if (m_parentGroup != null) | ||
337 | { | ||
338 | return m_parentGroup.UUID; | ||
339 | } | ||
340 | return LLUUID.Zero; | ||
341 | } | ||
342 | |||
327 | #region Copying | 343 | #region Copying |
328 | /// <summary> | 344 | /// <summary> |
329 | /// | 345 | /// |
@@ -615,12 +631,14 @@ namespace OpenSim.Region.Environment.Scenes | |||
615 | for (int i = 0; i < avatars.Count; i++) | 631 | for (int i = 0; i < avatars.Count; i++) |
616 | { | 632 | { |
617 | avatars[i].AddFullPart(this); | 633 | avatars[i].AddFullPart(this); |
634 | // avatars[i].QueuePartForUpdate(this); | ||
618 | } | 635 | } |
619 | } | 636 | } |
620 | 637 | ||
621 | public void AddFullUpdateToAvatar(ScenePresence presence) | 638 | public void AddFullUpdateToAvatar(ScenePresence presence) |
622 | { | 639 | { |
623 | presence.AddFullPart(this); | 640 | presence.AddFullPart(this); |
641 | //presence.QueuePartForUpdate(this); | ||
624 | } | 642 | } |
625 | 643 | ||
626 | /// <summary> | 644 | /// <summary> |
@@ -677,12 +695,14 @@ namespace OpenSim.Region.Environment.Scenes | |||
677 | for (int i = 0; i < avatars.Count; i++) | 695 | for (int i = 0; i < avatars.Count; i++) |
678 | { | 696 | { |
679 | avatars[i].AddTersePart(this); | 697 | avatars[i].AddTersePart(this); |
698 | // avatars[i].QueuePartForUpdate(this); | ||
680 | } | 699 | } |
681 | } | 700 | } |
682 | 701 | ||
683 | public void AddTerseUpdateToAvatar(ScenePresence presence) | 702 | public void AddTerseUpdateToAvatar(ScenePresence presence) |
684 | { | 703 | { |
685 | presence.AddTersePart(this); | 704 | presence.AddTersePart(this); |
705 | // presence.QueuePartForUpdate(this); | ||
686 | } | 706 | } |
687 | 707 | ||
688 | /// <summary> | 708 | /// <summary> |