diff options
author | Melanie | 2010-03-06 20:05:33 +0000 |
---|---|---|
committer | Melanie | 2010-03-06 20:05:33 +0000 |
commit | 2e5f7ec926c7a016d124ba1e44b6b861f8c3a364 (patch) | |
tree | ccb8688f516ddc3652f88b65c6336daf7b41d3d4 /OpenSim/Region/Framework/Scenes | |
parent | - supporting llTextBox (diff) | |
parent | Bug fix: store correct position information upon logout. Fixes mantis #4608 (diff) | |
download | opensim-SC_OLD-2e5f7ec926c7a016d124ba1e44b6b861f8c3a364.zip opensim-SC_OLD-2e5f7ec926c7a016d124ba1e44b6b861f8c3a364.tar.gz opensim-SC_OLD-2e5f7ec926c7a016d124ba1e44b6b861f8c3a364.tar.bz2 opensim-SC_OLD-2e5f7ec926c7a016d124ba1e44b6b861f8c3a364.tar.xz |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneBase.cs | 15 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Tests/SceneBaseTests.cs | 5 |
3 files changed, 21 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 30c69a8..1eb3117 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -4216,7 +4216,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
4216 | return m_sceneGraph.GetGroupByPrim(localID); | 4216 | return m_sceneGraph.GetGroupByPrim(localID); |
4217 | } | 4217 | } |
4218 | 4218 | ||
4219 | public bool TryGetAvatar(UUID avatarId, out ScenePresence avatar) | 4219 | public override bool TryGetAvatar(UUID avatarId, out ScenePresence avatar) |
4220 | { | 4220 | { |
4221 | return m_sceneGraph.TryGetAvatar(avatarId, out avatar); | 4221 | return m_sceneGraph.TryGetAvatar(avatarId, out avatar); |
4222 | } | 4222 | } |
diff --git a/OpenSim/Region/Framework/Scenes/SceneBase.cs b/OpenSim/Region/Framework/Scenes/SceneBase.cs index 4f6e824..74476ed 100644 --- a/OpenSim/Region/Framework/Scenes/SceneBase.cs +++ b/OpenSim/Region/Framework/Scenes/SceneBase.cs | |||
@@ -190,6 +190,21 @@ namespace OpenSim.Region.Framework.Scenes | |||
190 | /// <param name="agentID"></param> | 190 | /// <param name="agentID"></param> |
191 | public abstract void RemoveClient(UUID agentID); | 191 | public abstract void RemoveClient(UUID agentID); |
192 | 192 | ||
193 | public bool TryGetAvatar(UUID agentID, out object scenePresence) | ||
194 | { | ||
195 | scenePresence = null; | ||
196 | ScenePresence sp = null; | ||
197 | if (TryGetAvatar(agentID, out sp)) | ||
198 | { | ||
199 | scenePresence = sp; | ||
200 | return true; | ||
201 | } | ||
202 | |||
203 | return false; | ||
204 | } | ||
205 | |||
206 | public abstract bool TryGetAvatar(UUID agentID, out ScenePresence scenePresence); | ||
207 | |||
193 | #endregion | 208 | #endregion |
194 | 209 | ||
195 | /// <summary> | 210 | /// <summary> |
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneBaseTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneBaseTests.cs index 8230f32..840039c 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/SceneBaseTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/SceneBaseTests.cs | |||
@@ -65,6 +65,11 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
65 | { | 65 | { |
66 | throw new NotImplementedException(); | 66 | throw new NotImplementedException(); |
67 | } | 67 | } |
68 | |||
69 | public override bool TryGetAvatar(UUID agentID, out ScenePresence scenePresence) | ||
70 | { | ||
71 | throw new NotImplementedException(); | ||
72 | } | ||
68 | } | 73 | } |
69 | 74 | ||
70 | [Test] | 75 | [Test] |