diff options
author | Melanie | 2012-08-02 22:34:46 +0100 |
---|---|---|
committer | Melanie | 2012-08-02 22:34:46 +0100 |
commit | 68406ab8f9fad40636a9e3576e80c1086b1f48f2 (patch) | |
tree | 6f32dc2dfbdf2246e3c2e0e619f5251a18ccaafa /OpenSim/Region | |
parent | reduced-complexity implementation of function to get rezzing object key (diff) | |
download | opensim-SC-68406ab8f9fad40636a9e3576e80c1086b1f48f2.zip opensim-SC-68406ab8f9fad40636a9e3576e80c1086b1f48f2.tar.gz opensim-SC-68406ab8f9fad40636a9e3576e80c1086b1f48f2.tar.bz2 opensim-SC-68406ab8f9fad40636a9e3576e80c1086b1f48f2.tar.xz |
Initialize the Rezzing object to UUID.Zero
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index c9345e5..13cc5cd 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
@@ -26,6 +26,7 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.ComponentModel; | ||
29 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
30 | using System.Drawing; | 31 | using System.Drawing; |
31 | using System.IO; | 32 | using System.IO; |
@@ -641,6 +642,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
641 | /// </summary> | 642 | /// </summary> |
642 | public SceneObjectGroup() | 643 | public SceneObjectGroup() |
643 | { | 644 | { |
645 | RezzingObjectID = UUID.Zero; | ||
644 | } | 646 | } |
645 | 647 | ||
646 | /// <summary> | 648 | /// <summary> |
@@ -648,7 +650,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
648 | /// The original SceneObjectPart will be used rather than a copy, preserving | 650 | /// The original SceneObjectPart will be used rather than a copy, preserving |
649 | /// its existing localID and UUID. | 651 | /// its existing localID and UUID. |
650 | /// </summary> | 652 | /// </summary> |
651 | public SceneObjectGroup(SceneObjectPart part) | 653 | public SceneObjectGroup(SceneObjectPart part) : this() |
652 | { | 654 | { |
653 | SetRootPart(part); | 655 | SetRootPart(part); |
654 | } | 656 | } |
@@ -656,9 +658,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
656 | /// <summary> | 658 | /// <summary> |
657 | /// Constructor. This object is added to the scene later via AttachToScene() | 659 | /// Constructor. This object is added to the scene later via AttachToScene() |
658 | /// </summary> | 660 | /// </summary> |
659 | 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)) |
660 | { | 662 | { |
661 | SetRootPart(new SceneObjectPart(ownerID, shape, pos, rot, Vector3.Zero)); | ||
662 | } | 663 | } |
663 | 664 | ||
664 | /// <summary> | 665 | /// <summary> |