aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-12-09 23:07:53 +0000
committerJustin Clark-Casey (justincc)2011-12-09 23:07:53 +0000
commitaf3cd00048fb6476eb5140bcfccda926627363f2 (patch)
treea795ef16e7d6db97bd2cddf8737027c1e95ff853 /OpenSim/Region/Framework
parentremove some unused fields in ScenePresence (diff)
downloadopensim-SC_OLD-af3cd00048fb6476eb5140bcfccda926627363f2.zip
opensim-SC_OLD-af3cd00048fb6476eb5140bcfccda926627363f2.tar.gz
opensim-SC_OLD-af3cd00048fb6476eb5140bcfccda926627363f2.tar.bz2
opensim-SC_OLD-af3cd00048fb6476eb5140bcfccda926627363f2.tar.xz
Get rid of IScene.PresenceChildStatus() which always had to execute a lookup in favour of IClientAPI.ISceneAgent.IsChildAgent instead.
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs11
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneBase.cs5
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs15
3 files changed, 2 insertions, 29 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 11505cc..9fdf395 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -4193,17 +4193,6 @@ namespace OpenSim.Region.Framework.Scenes
4193 } 4193 }
4194 4194
4195 /// <summary> 4195 /// <summary>
4196 /// Returns true if scene presence is a child (no avatar in this scene)
4197 /// </summary>
4198 /// <param name="avatarID"></param>
4199 /// <returns></returns>
4200 public override bool PresenceChildStatus(UUID avatarID)
4201 {
4202 ScenePresence sp;
4203 return TryGetScenePresence(avatarID, out sp) && sp.IsChildAgent;
4204 }
4205
4206 /// <summary>
4207 /// Performs action on all avatars in the scene (root scene presences) 4196 /// Performs action on all avatars in the scene (root scene presences)
4208 /// Avatars may be an NPC or a 'real' client. 4197 /// Avatars may be an NPC or a 'real' client.
4209 /// </summary> 4198 /// </summary>
diff --git a/OpenSim/Region/Framework/Scenes/SceneBase.cs b/OpenSim/Region/Framework/Scenes/SceneBase.cs
index da15491..712e094 100644
--- a/OpenSim/Region/Framework/Scenes/SceneBase.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneBase.cs
@@ -211,11 +211,6 @@ namespace OpenSim.Region.Framework.Scenes
211 } 211 }
212 212
213 #region admin stuff 213 #region admin stuff
214
215 public virtual bool PresenceChildStatus(UUID avatarID)
216 {
217 return false;
218 }
219 214
220 public abstract void OtherRegionUp(GridRegion otherRegion); 215 public abstract void OtherRegionUp(GridRegion otherRegion);
221 216
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index cebf51b..fa731a7 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -612,19 +612,7 @@ namespace OpenSim.Region.Framework.Scenes
612 } 612 }
613 } 613 }
614 614
615 /// <summary> 615 public bool IsChildAgent { get; set; }
616 /// If this is true, agent doesn't have a representation in this scene.
617 /// this is an agent 'looking into' this scene from a nearby scene(region)
618 ///
619 /// if False, this agent has a representation in this scene
620 /// </summary>
621 private bool m_isChildAgent = true;
622
623 public bool IsChildAgent
624 {
625 get { return m_isChildAgent; }
626 set { m_isChildAgent = value; }
627 }
628 616
629 public uint ParentID 617 public uint ParentID
630 { 618 {
@@ -741,6 +729,7 @@ namespace OpenSim.Region.Framework.Scenes
741 { 729 {
742 AttachmentsSyncLock = new Object(); 730 AttachmentsSyncLock = new Object();
743 731
732 IsChildAgent = true;
744 m_sendCourseLocationsMethod = SendCoarseLocationsDefault; 733 m_sendCourseLocationsMethod = SendCoarseLocationsDefault;
745 Animator = new ScenePresenceAnimator(this); 734 Animator = new ScenePresenceAnimator(this);
746 PresenceType = type; 735 PresenceType = type;