From af3cd00048fb6476eb5140bcfccda926627363f2 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 9 Dec 2011 23:07:53 +0000
Subject: Get rid of IScene.PresenceChildStatus() which always had to execute a
 lookup in favour of IClientAPI.ISceneAgent.IsChildAgent instead.

---
 OpenSim/Region/Framework/Scenes/Scene.cs         | 11 -----------
 OpenSim/Region/Framework/Scenes/SceneBase.cs     |  5 -----
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 15 ++-------------
 3 files changed, 2 insertions(+), 29 deletions(-)

(limited to 'OpenSim/Region/Framework')

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
         }
 
         /// <summary>
-        /// Returns true if scene presence is a child (no avatar in this scene)
-        /// </summary>
-        /// <param name="avatarID"></param>
-        /// <returns></returns>
-        public override bool PresenceChildStatus(UUID avatarID)
-        {
-            ScenePresence sp;
-            return TryGetScenePresence(avatarID, out sp) && sp.IsChildAgent;
-        }
-
-        /// <summary>
         /// Performs action on all avatars in the scene (root scene presences)
         /// Avatars may be an NPC or a 'real' client.
         /// </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
         }
 
         #region admin stuff
-
-        public virtual bool PresenceChildStatus(UUID avatarID)
-        {
-            return false;
-        }
         
         public abstract void OtherRegionUp(GridRegion otherRegion);
 
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
             }
         }
 
-        /// <summary>
-        /// If this is true, agent doesn't have a representation in this scene.
-        ///    this is an agent 'looking into' this scene from a nearby scene(region)
-        ///
-        /// if False, this agent has a representation in this scene
-        /// </summary>
-        private bool m_isChildAgent = true;
-
-        public bool IsChildAgent
-        {
-            get { return m_isChildAgent; }
-            set { m_isChildAgent = value; }
-        }
+        public bool IsChildAgent { get; set; }
 
         public uint ParentID
         {
@@ -741,6 +729,7 @@ namespace OpenSim.Region.Framework.Scenes
         {
             AttachmentsSyncLock = new Object();
 
+            IsChildAgent = true;
             m_sendCourseLocationsMethod = SendCoarseLocationsDefault;
             Animator = new ScenePresenceAnimator(this);
             PresenceType = type;
-- 
cgit v1.1