From 1615e7d29fb6961a3ffe791fde4318f819c1a4b7 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 27 Aug 2011 00:33:24 +0100
Subject: Eliminate duplicate AttachmentPoint properties by always using the
one stored in the root part's state field.
---
.../Region/Framework/Scenes/SceneObjectGroup.cs | 36 +++++++++++-----------
1 file changed, 18 insertions(+), 18 deletions(-)
(limited to 'OpenSim/Region/Framework')
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 34f484d..c453366 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -166,7 +166,24 @@ namespace OpenSim.Region.Framework.Scenes
///
/// 0 if we're not attached to anything
///
- public uint AttachmentPoint;
+ public uint AttachmentPoint
+ {
+ get
+ {
+ return m_rootPart.Shape.State;
+ }
+
+ set
+ {
+ IsAttachment = value != 0;
+ m_rootPart.Shape.State = (byte)value;
+ }
+ }
+
+ public void ClearPartAttachmentData()
+ {
+ AttachmentPoint = 0;
+ }
///
/// Is this scene object phantom?
@@ -976,23 +993,6 @@ namespace OpenSim.Region.Framework.Scenes
}
}
- public byte GetAttachmentPoint()
- {
- return m_rootPart.Shape.State;
- }
-
- public void SetAttachmentPoint(uint point)
- {
- AttachmentPoint = point;
- IsAttachment = point != 0;
- m_rootPart.Shape.State = (byte)point;
- }
-
- public void ClearPartAttachmentData()
- {
- SetAttachmentPoint((Byte)0);
- }
-
///
///
///
--
cgit v1.1