aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs16
1 files changed, 11 insertions, 5 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index dec8bf4..54ccaad 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -504,11 +504,10 @@ namespace OpenSim.Region.Environment.Scenes
504 /// <summary> 504 /// <summary>
505 /// Constructor. This object is added to the scene later via AttachToScene() 505 /// Constructor. This object is added to the scene later via AttachToScene()
506 /// </summary> 506 /// </summary>
507 public SceneObjectGroup(UUID ownerID, uint localID, Vector3 pos, Quaternion rot, PrimitiveBaseShape shape) 507 public SceneObjectGroup(UUID ownerID, Vector3 pos, Quaternion rot, PrimitiveBaseShape shape)
508 { 508 {
509 Vector3 rootOffset = new Vector3(0, 0, 0); 509 Vector3 rootOffset = new Vector3(0, 0, 0);
510 SceneObjectPart newPart = 510 SceneObjectPart newPart = new SceneObjectPart(this, ownerID, shape, pos, rot, rootOffset);
511 new SceneObjectPart(this, ownerID, localID, shape, pos, rot, rootOffset);
512 newPart.LinkNum = 0; 511 newPart.LinkNum = 0;
513 m_parts.Add(newPart.UUID, newPart); 512 m_parts.Add(newPart.UUID, newPart);
514 SetPartAsRoot(newPart); 513 SetPartAsRoot(newPart);
@@ -517,8 +516,8 @@ namespace OpenSim.Region.Environment.Scenes
517 /// <summary> 516 /// <summary>
518 /// Constructor. 517 /// Constructor.
519 /// </summary> 518 /// </summary>
520 public SceneObjectGroup(UUID ownerID, uint localID, Vector3 pos, PrimitiveBaseShape shape) 519 public SceneObjectGroup(UUID ownerID, Vector3 pos, PrimitiveBaseShape shape)
521 : this(ownerID, localID, pos, Quaternion.Identity, shape) 520 : this(ownerID, pos, Quaternion.Identity, shape)
522 { 521 {
523 } 522 }
524 523
@@ -1927,6 +1926,12 @@ namespace OpenSim.Region.Environment.Scenes
1927 DelinkFromGroup(partID, true); 1926 DelinkFromGroup(partID, true);
1928 } 1927 }
1929 1928
1929 /// <summary>
1930 /// Delink the given prim from this group. The delinked prim is established as
1931 /// an independent SceneObjectGroup.
1932 /// </summary>
1933 /// <param name="partID"></param>
1934 /// <param name="sendEvents"></param>
1930 public void DelinkFromGroup(uint partID, bool sendEvents) 1935 public void DelinkFromGroup(uint partID, bool sendEvents)
1931 { 1936 {
1932 SceneObjectPart linkPart = GetChildPart(partID); 1937 SceneObjectPart linkPart = GetChildPart(partID);
@@ -2006,6 +2011,7 @@ namespace OpenSim.Region.Environment.Scenes
2006 { 2011 {
2007 if (m_isBackedUp) 2012 if (m_isBackedUp)
2008 m_scene.EventManager.OnBackup -= ProcessBackup; 2013 m_scene.EventManager.OnBackup -= ProcessBackup;
2014
2009 m_isBackedUp = false; 2015 m_isBackedUp = false;
2010 } 2016 }
2011 2017