aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-08-02 23:54:32 +0100
committerJustin Clark-Casey (justincc)2012-08-02 23:54:32 +0100
commit0dfccfc1d9f1e2096eb05508f3e0b60c7b339c81 (patch)
tree88d593f56cbaca2c2ba796d87d91f3b5c17c22de /OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
parentAdd simple draw test for the VectorRenderModule (diff)
parentInitialize the Rezzing object to UUID.Zero (diff)
downloadopensim-SC_OLD-0dfccfc1d9f1e2096eb05508f3e0b60c7b339c81.zip
opensim-SC_OLD-0dfccfc1d9f1e2096eb05508f3e0b60c7b339c81.tar.gz
opensim-SC_OLD-0dfccfc1d9f1e2096eb05508f3e0b60c7b339c81.tar.bz2
opensim-SC_OLD-0dfccfc1d9f1e2096eb05508f3e0b60c7b339c81.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs15
1 files changed, 12 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 52469a2..13cc5cd 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -26,6 +26,7 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.ComponentModel;
29using System.Collections.Generic; 30using System.Collections.Generic;
30using System.Drawing; 31using System.Drawing;
31using System.IO; 32using System.IO;
@@ -611,6 +612,14 @@ namespace OpenSim.Region.Framework.Scenes
611 public UUID FromItemID { get; set; } 612 public UUID FromItemID { get; set; }
612 613
613 /// <summary> 614 /// <summary>
615 /// Refers to the SceneObjectPart.UUID property of the object that this object was rezzed from, if applicable.
616 /// </summary>
617 /// <remarks>
618 /// If not applicable will be UUID.Zero
619 /// </remarks>
620 public UUID RezzingObjectID { get; set; }
621
622 /// <summary>
614 /// The folder ID that this object was rezzed from, if applicable. 623 /// The folder ID that this object was rezzed from, if applicable.
615 /// </summary> 624 /// </summary>
616 /// <remarks> 625 /// <remarks>
@@ -633,6 +642,7 @@ namespace OpenSim.Region.Framework.Scenes
633 /// </summary> 642 /// </summary>
634 public SceneObjectGroup() 643 public SceneObjectGroup()
635 { 644 {
645 RezzingObjectID = UUID.Zero;
636 } 646 }
637 647
638 /// <summary> 648 /// <summary>
@@ -640,7 +650,7 @@ namespace OpenSim.Region.Framework.Scenes
640 /// The original SceneObjectPart will be used rather than a copy, preserving 650 /// The original SceneObjectPart will be used rather than a copy, preserving
641 /// its existing localID and UUID. 651 /// its existing localID and UUID.
642 /// </summary> 652 /// </summary>
643 public SceneObjectGroup(SceneObjectPart part) 653 public SceneObjectGroup(SceneObjectPart part) : this()
644 { 654 {
645 SetRootPart(part); 655 SetRootPart(part);
646 } 656 }
@@ -648,9 +658,8 @@ namespace OpenSim.Region.Framework.Scenes
648 /// <summary> 658 /// <summary>
649 /// Constructor. This object is added to the scene later via AttachToScene() 659 /// Constructor. This object is added to the scene later via AttachToScene()
650 /// </summary> 660 /// </summary>
651 public SceneObjectGroup(UUID ownerID, Vector3 pos, Quaternion rot, PrimitiveBaseShape shape) 661 public SceneObjectGroup(UUID ownerID, Vector3 pos, Quaternion rot, PrimitiveBaseShape shape) :this(new SceneObjectPart(ownerID, shape, pos, rot, Vector3.Zero))
652 { 662 {
653 SetRootPart(new SceneObjectPart(ownerID, shape, pos, rot, Vector3.Zero));
654 } 663 }
655 664
656 /// <summary> 665 /// <summary>