diff options
| author | Melanie | 2010-03-09 22:46:17 +0000 |
|---|---|---|
| committer | Melanie | 2010-03-09 22:46:17 +0000 |
| commit | 40873504dcde19a3738cf4d3a4928a59b811e8f0 (patch) | |
| tree | 605d2c2575e21496b05eeabd0a5755b8fa788efd /OpenSim/Framework/IScene.cs | |
| parent | - parcel blocking, region crossing blocking, teleport blocking (diff) | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC-40873504dcde19a3738cf4d3a4928a59b811e8f0.zip opensim-SC-40873504dcde19a3738cf4d3a4928a59b811e8f0.tar.gz opensim-SC-40873504dcde19a3738cf4d3a4928a59b811e8f0.tar.bz2 opensim-SC-40873504dcde19a3738cf4d3a4928a59b811e8f0.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Framework/IScene.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Framework/IScene.cs b/OpenSim/Framework/IScene.cs index 27b3d47..86d63f8 100644 --- a/OpenSim/Framework/IScene.cs +++ b/OpenSim/Framework/IScene.cs | |||
| @@ -91,6 +91,8 @@ 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); | ||
| 95 | |||
| 94 | T RequestModuleInterface<T>(); | 96 | T RequestModuleInterface<T>(); |
| 95 | T[] RequestModuleInterfaces<T>(); | 97 | T[] RequestModuleInterfaces<T>(); |
| 96 | 98 | ||