aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-08-27 00:33:24 +0100
committerJustin Clark-Casey (justincc)2011-08-27 00:33:24 +0100
commit1615e7d29fb6961a3ffe791fde4318f819c1a4b7 (patch)
tree5daf5feb054615ff95ec17f7226a377f03df31ab /OpenSim/Region/Framework/Scenes
parentrefactor: camel case AttachmentPoint method arg as per code standards (diff)
downloadopensim-SC_OLD-1615e7d29fb6961a3ffe791fde4318f819c1a4b7.zip
opensim-SC_OLD-1615e7d29fb6961a3ffe791fde4318f819c1a4b7.tar.gz
opensim-SC_OLD-1615e7d29fb6961a3ffe791fde4318f819c1a4b7.tar.bz2
opensim-SC_OLD-1615e7d29fb6961a3ffe791fde4318f819c1a4b7.tar.xz
Eliminate duplicate AttachmentPoint properties by always using the one stored in the root part's state field.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs36
1 files changed, 18 insertions, 18 deletions
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
166 /// <remarks> 166 /// <remarks>
167 /// 0 if we're not attached to anything 167 /// 0 if we're not attached to anything
168 /// </remarks> 168 /// </remarks>
169 public uint AttachmentPoint; 169 public uint AttachmentPoint
170 {
171 get
172 {
173 return m_rootPart.Shape.State;
174 }
175
176 set
177 {
178 IsAttachment = value != 0;
179 m_rootPart.Shape.State = (byte)value;
180 }
181 }
182
183 public void ClearPartAttachmentData()
184 {
185 AttachmentPoint = 0;
186 }
170 187
171 /// <summary> 188 /// <summary>
172 /// Is this scene object phantom? 189 /// Is this scene object phantom?
@@ -976,23 +993,6 @@ namespace OpenSim.Region.Framework.Scenes
976 } 993 }
977 } 994 }
978 995
979 public byte GetAttachmentPoint()
980 {
981 return m_rootPart.Shape.State;
982 }
983
984 public void SetAttachmentPoint(uint point)
985 {
986 AttachmentPoint = point;
987 IsAttachment = point != 0;
988 m_rootPart.Shape.State = (byte)point;
989 }
990
991 public void ClearPartAttachmentData()
992 {
993 SetAttachmentPoint((Byte)0);
994 }
995
996 /// <summary> 996 /// <summary>
997 /// 997 ///
998 /// </summary> 998 /// </summary>