diff options
| author | Melanie | 2010-03-30 21:34:27 +0100 |
|---|---|---|
| committer | Melanie | 2010-03-30 21:34:27 +0100 |
| commit | 5693870fe26fae35a28f2d5103780434f4f40e57 (patch) | |
| tree | 0e070fb6f11ab8763ac4f1f9a851a0061101d4d6 /OpenSim/Framework/IScene.cs | |
| parent | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... (diff) | |
| parent | minor: commented out code removal (diff) | |
| download | opensim-SC-5693870fe26fae35a28f2d5103780434f4f40e57.zip opensim-SC-5693870fe26fae35a28f2d5103780434f4f40e57.tar.gz opensim-SC-5693870fe26fae35a28f2d5103780434f4f40e57.tar.bz2 opensim-SC-5693870fe26fae35a28f2d5103780434f4f40e57.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Framework/IScene.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/IScene.cs b/OpenSim/Framework/IScene.cs index 86d63f8..19ab409 100644 --- a/OpenSim/Framework/IScene.cs +++ b/OpenSim/Framework/IScene.cs | |||
| @@ -91,7 +91,7 @@ namespace OpenSim.Framework | |||
| 91 | /// </exception> | 91 | /// </exception> |
| 92 | bool PresenceChildStatus(UUID agentId); | 92 | bool PresenceChildStatus(UUID agentId); |
| 93 | 93 | ||
| 94 | bool TryGetAvatar(UUID agentID, out object scenePresence); | 94 | bool TryGetScenePresence(UUID agentID, out object scenePresence); |
| 95 | 95 | ||
| 96 | T RequestModuleInterface<T>(); | 96 | T RequestModuleInterface<T>(); |
| 97 | T[] RequestModuleInterfaces<T>(); | 97 | T[] RequestModuleInterfaces<T>(); |