aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-08-24 22:34:26 +0100
committerJustin Clark-Casey (justincc)2011-08-24 22:34:26 +0100
commit6d4432f44009d7f7f3e52c56e8ccc994494ec529 (patch)
tree197fa7cf8ae1c4f3a07b9598fb242519a80ef55a /OpenSim/Region/Framework
parentextend initial rez regression test to check that attachment is phantom (diff)
downloadopensim-SC-6d4432f44009d7f7f3e52c56e8ccc994494ec529.zip
opensim-SC-6d4432f44009d7f7f3e52c56e8ccc994494ec529.tar.gz
opensim-SC-6d4432f44009d7f7f3e52c56e8ccc994494ec529.tar.bz2
opensim-SC-6d4432f44009d7f7f3e52c56e8ccc994494ec529.tar.xz
refactor: simplify EntityBase.IsDeleted property
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/EntityBase.cs7
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs6
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs2
3 files changed, 5 insertions, 10 deletions
diff --git a/OpenSim/Region/Framework/Scenes/EntityBase.cs b/OpenSim/Region/Framework/Scenes/EntityBase.cs
index 6fd38e5..213431a 100644
--- a/OpenSim/Region/Framework/Scenes/EntityBase.cs
+++ b/OpenSim/Region/Framework/Scenes/EntityBase.cs
@@ -66,12 +66,7 @@ namespace OpenSim.Region.Framework.Scenes
66 /// <summary> 66 /// <summary>
67 /// Signals whether this entity was in a scene but has since been removed from it. 67 /// Signals whether this entity was in a scene but has since been removed from it.
68 /// </summary> 68 /// </summary>
69 public bool IsDeleted 69 public bool IsDeleted { get; protected internal set; }
70 {
71 get { return m_isDeleted; }
72 set { m_isDeleted = value; }
73 }
74 protected bool m_isDeleted;
75 70
76 protected Vector3 m_pos; 71 protected Vector3 m_pos;
77 72
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 079148f..8f0fa55 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -1832,7 +1832,7 @@ namespace OpenSim.Region.Framework.Scenes
1832 // an object has been deleted from a scene before update was processed. 1832 // an object has been deleted from a scene before update was processed.
1833 // A more fundamental overhaul of the update mechanism is required to eliminate all 1833 // A more fundamental overhaul of the update mechanism is required to eliminate all
1834 // the race conditions. 1834 // the race conditions.
1835 if (m_isDeleted) 1835 if (IsDeleted)
1836 return; 1836 return;
1837 1837
1838 // Even temporary objects take part in physics (e.g. temp-on-rez bullets) 1838 // Even temporary objects take part in physics (e.g. temp-on-rez bullets)
@@ -2142,7 +2142,7 @@ namespace OpenSim.Region.Framework.Scenes
2142 } 2142 }
2143 2143
2144 m_scene.UnlinkSceneObject(objectGroup, true); 2144 m_scene.UnlinkSceneObject(objectGroup, true);
2145 objectGroup.m_isDeleted = true; 2145 objectGroup.IsDeleted = true;
2146 2146
2147 objectGroup.m_parts.Clear(); 2147 objectGroup.m_parts.Clear();
2148 2148
@@ -3385,7 +3385,7 @@ namespace OpenSim.Region.Framework.Scenes
3385 public virtual ISceneObject CloneForNewScene() 3385 public virtual ISceneObject CloneForNewScene()
3386 { 3386 {
3387 SceneObjectGroup sog = Copy(false); 3387 SceneObjectGroup sog = Copy(false);
3388 sog.m_isDeleted = false; 3388 sog.IsDeleted = false;
3389 return sog; 3389 return sog;
3390 } 3390 }
3391 3391
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 9518161..def4ecb 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -3809,7 +3809,7 @@ namespace OpenSim.Region.Framework.Scenes
3809 List<AvatarAttachment> attachments = m_appearance.GetAttachments(); 3809 List<AvatarAttachment> attachments = m_appearance.GetAttachments();
3810 foreach (AvatarAttachment attach in attachments) 3810 foreach (AvatarAttachment attach in attachments)
3811 { 3811 {
3812 if (m_isDeleted) 3812 if (IsDeleted)
3813 return; 3813 return;
3814 3814
3815 int p = attach.AttachPoint; 3815 int p = attach.AttachPoint;