Merge branch 'master' into careminster-presence-refactor

1 files changed, 3 insertions, 3 deletions

diff --git a/OpenSim/Region/Framework/Scenes/SceneBase.cs b/OpenSim/Region/Framework/Scenes/SceneBase.cs
index 74476ed..3218dad 100644
--- a/OpenSim/Region/Framework/Scenes/SceneBase.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneBase.cs
@@ -190,11 +190,11 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="agentID"></param>
         public abstract void RemoveClient(UUID agentID);
 
-        public bool TryGetAvatar(UUID agentID, out object scenePresence)
+        public bool TryGetScenePresence(UUID agentID, out object scenePresence)
         {
             scenePresence = null;
             ScenePresence sp = null;
-            if (TryGetAvatar(agentID, out sp))
+            if (TryGetScenePresence(agentID, out sp))
             {
                 scenePresence = sp;
                 return true;
@@ -203,7 +203,7 @@ namespace OpenSim.Region.Framework.Scenes
             return false;
         }
 
-        public abstract bool TryGetAvatar(UUID agentID, out ScenePresence scenePresence);
+        public abstract bool TryGetScenePresence(UUID agentID, out ScenePresence scenePresence);
 
         #endregion