aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneBase.cs
diff options
context:
space:
mode:
authorMelanie2011-12-08 03:37:48 +0100
committerMelanie2011-12-08 03:37:48 +0100
commit7c7dd6269a0efff5b4619028825a46fcab84de63 (patch)
treecbe6c622fc1c069f3a33636fd1174d314dec074a /OpenSim/Region/Framework/Scenes/SceneBase.cs
parentRecover from an internal mess-up in the outgoing packet queues by creating (diff)
parentMerge branch 'master' into bigmerge (diff)
downloadopensim-SC-7c7dd6269a0efff5b4619028825a46fcab84de63.zip
opensim-SC-7c7dd6269a0efff5b4619028825a46fcab84de63.tar.gz
opensim-SC-7c7dd6269a0efff5b4619028825a46fcab84de63.tar.bz2
opensim-SC-7c7dd6269a0efff5b4619028825a46fcab84de63.tar.xz
Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneBase.cs6
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneBase.cs b/OpenSim/Region/Framework/Scenes/SceneBase.cs
index 0fd5164..29ab071 100644
--- a/OpenSim/Region/Framework/Scenes/SceneBase.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneBase.cs
@@ -193,6 +193,12 @@ namespace OpenSim.Region.Framework.Scenes
193 return false; 193 return false;
194 } 194 }
195 195
196 /// <summary>
197 /// Try to get a scene presence from the scene
198 /// </summary>
199 /// <param name="agentID"></param>
200 /// <param name="scenePresence">null if there is no scene presence with the given agent id</param>
201 /// <returns>true if there was a scene presence with the given id, false otherwise.</returns>
196 public abstract bool TryGetScenePresence(UUID agentID, out ScenePresence scenePresence); 202 public abstract bool TryGetScenePresence(UUID agentID, out ScenePresence scenePresence);
197 203
198 #endregion 204 #endregion