1 files changed, 22 insertions, 9 deletions

diff --git a/OpenSim/Region/Framework/Scenes/SceneManager.cs b/OpenSim/Region/Framework/Scenes/SceneManager.cs
index 82458e2..d73a959 100644
--- a/OpenSim/Region/Framework/Scenes/SceneManager.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneManager.cs
@@ -545,23 +545,20 @@ namespace OpenSim.Region.Framework.Scenes
             return false;
         }
 
-        public bool TryGetAvatarsScene(UUID avatarId, out Scene scene)
+        public bool TryGetRootScenePresence(UUID avatarId, out ScenePresence avatar)
         {
-            ScenePresence avatar = null;
-
             lock (m_localScenes)
             {
-                foreach (Scene mScene in m_localScenes)
+                foreach (Scene scene in m_localScenes)
                 {
-                    if (mScene.TryGetScenePresence(avatarId, out avatar))
-                    {
-                        scene = mScene;
+                    avatar = scene.GetScenePresence(avatarId);
+
+                    if (avatar != null && !avatar.IsChildAgent)
                         return true;
-                    }
                 }
             }
 
-            scene = null;
+            avatar = null;
             return false;
         }
 
@@ -590,6 +587,22 @@ namespace OpenSim.Region.Framework.Scenes
             return false;
         }
 
+        public bool TryGetRootScenePresenceByName(string firstName, string lastName, out ScenePresence sp)
+        {
+            lock (m_localScenes)
+            {
+                foreach (Scene scene in m_localScenes)
+                {
+                    sp = scene.GetScenePresence(firstName, lastName);
+                    if (sp != null && !sp.IsChildAgent)
+                        return true;
+                }
+            }
+
+            sp = null;
+            return false;
+        }
+
         public void ForEachScene(Action<Scene> action)
         {
             lock (m_localScenes)