aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs39
1 files changed, 23 insertions, 16 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 87fdc41..17f3be7 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -571,7 +571,9 @@ namespace OpenSim.Region.Framework.Scenes
571 set { m_LoopSoundSlavePrims = value; } 571 set { m_LoopSoundSlavePrims = value; }
572 } 572 }
573 573
574 // The UUID for the Region this Object is in. 574 /// <summary>
575 /// The UUID for the region this object is in.
576 /// </summary>
575 public UUID RegionUUID 577 public UUID RegionUUID
576 { 578 {
577 get 579 get
@@ -584,6 +586,22 @@ namespace OpenSim.Region.Framework.Scenes
584 } 586 }
585 } 587 }
586 588
589 /// <summary>
590 /// The item ID that this object was rezzed from, if applicable.
591 /// </summary>
592 /// <remarks>
593 /// If not applicable will be UUID.Zero
594 /// </remarks>
595 public UUID FromItemID { get; set; }
596
597 /// <summary>
598 /// The folder ID that this object was rezzed from, if applicable.
599 /// </summary>
600 /// <remarks>
601 /// If not applicable will be UUID.Zero
602 /// </remarks>
603 public UUID FromFolderID { get; set; }
604
587 #endregion 605 #endregion
588 606
589// ~SceneObjectGroup() 607// ~SceneObjectGroup()
@@ -646,18 +664,6 @@ namespace OpenSim.Region.Framework.Scenes
646 } 664 }
647 } 665 }
648 666
649 public void SetFromItemID(UUID AssetId)
650 {
651 SceneObjectPart[] parts = m_parts.GetArray();
652 for (int i = 0; i < parts.Length; i++)
653 parts[i].FromItemID = AssetId;
654 }
655
656 public UUID GetFromItemID()
657 {
658 return m_rootPart.FromItemID;
659 }
660
661 /// <summary> 667 /// <summary>
662 /// Hooks this object up to the backup event so that it is persisted to the database when the update thread executes. 668 /// Hooks this object up to the backup event so that it is persisted to the database when the update thread executes.
663 /// </summary> 669 /// </summary>
@@ -2687,6 +2693,7 @@ namespace OpenSim.Region.Framework.Scenes
2687 { 2693 {
2688 m_rootPart.AttachedPos = pos; 2694 m_rootPart.AttachedPos = pos;
2689 } 2695 }
2696
2690 if (RootPart.GetStatusSandbox()) 2697 if (RootPart.GetStatusSandbox())
2691 { 2698 {
2692 if (Util.GetDistanceTo(RootPart.StatusSandboxPos, pos) > 10) 2699 if (Util.GetDistanceTo(RootPart.StatusSandboxPos, pos) > 10)
@@ -2697,8 +2704,8 @@ namespace OpenSim.Region.Framework.Scenes
2697 ChatTypeEnum.DebugChannel, 0x7FFFFFFF, RootPart.AbsolutePosition, Name, UUID, false); 2704 ChatTypeEnum.DebugChannel, 0x7FFFFFFF, RootPart.AbsolutePosition, Name, UUID, false);
2698 } 2705 }
2699 } 2706 }
2700 AbsolutePosition = pos;
2701 2707
2708 AbsolutePosition = pos;
2702 HasGroupChanged = true; 2709 HasGroupChanged = true;
2703 } 2710 }
2704 2711
@@ -3270,7 +3277,7 @@ namespace OpenSim.Region.Framework.Scenes
3270 3277
3271 public virtual string ExtraToXmlString() 3278 public virtual string ExtraToXmlString()
3272 { 3279 {
3273 return "<ExtraFromItemID>" + GetFromItemID().ToString() + "</ExtraFromItemID>"; 3280 return "<ExtraFromItemID>" + FromItemID.ToString() + "</ExtraFromItemID>";
3274 } 3281 }
3275 3282
3276 public virtual void ExtraFromXmlString(string xmlstr) 3283 public virtual void ExtraFromXmlString(string xmlstr)
@@ -3282,7 +3289,7 @@ namespace OpenSim.Region.Framework.Scenes
3282 UUID uuid = UUID.Zero; 3289 UUID uuid = UUID.Zero;
3283 UUID.TryParse(id, out uuid); 3290 UUID.TryParse(id, out uuid);
3284 3291
3285 SetFromItemID(uuid); 3292 FromItemID = uuid;
3286 } 3293 }
3287 3294
3288 #endregion 3295 #endregion