From 68406ab8f9fad40636a9e3576e80c1086b1f48f2 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Thu, 2 Aug 2012 22:34:46 +0100
Subject: Initialize the Rezzing object to UUID.Zero
---
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
(limited to 'OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs')
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 @@
*/
using System;
+using System.ComponentModel;
using System.Collections.Generic;
using System.Drawing;
using System.IO;
@@ -641,6 +642,7 @@ namespace OpenSim.Region.Framework.Scenes
///
public SceneObjectGroup()
{
+ RezzingObjectID = UUID.Zero;
}
///
@@ -648,7 +650,7 @@ namespace OpenSim.Region.Framework.Scenes
/// The original SceneObjectPart will be used rather than a copy, preserving
/// its existing localID and UUID.
///
- public SceneObjectGroup(SceneObjectPart part)
+ public SceneObjectGroup(SceneObjectPart part) : this()
{
SetRootPart(part);
}
@@ -656,9 +658,8 @@ namespace OpenSim.Region.Framework.Scenes
///
/// Constructor. This object is added to the scene later via AttachToScene()
///
- public SceneObjectGroup(UUID ownerID, Vector3 pos, Quaternion rot, PrimitiveBaseShape shape)
+ public SceneObjectGroup(UUID ownerID, Vector3 pos, Quaternion rot, PrimitiveBaseShape shape) :this(new SceneObjectPart(ownerID, shape, pos, rot, Vector3.Zero))
{
- SetRootPart(new SceneObjectPart(ownerID, shape, pos, rot, Vector3.Zero));
}
///
--
cgit v1.1