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/Scene.cs | |
| 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/Scene.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 2 |
1 files changed, 1 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 | } |