diff options
| author | Melanie | 2011-12-08 18:29:19 +0000 |
|---|---|---|
| committer | Melanie | 2011-12-08 18:29:19 +0000 |
| commit | 96539ffc79c1654feddc17592170f0e4b57f5b8d (patch) | |
| tree | d500df1c7a7b37cae6e74d52b67f51aa7bfad46d /OpenSim/Region/Framework/Scenes/SceneBase.cs | |
| parent | Merge branch 'master' into bigmerge (diff) | |
| parent | When a client connects to a scene, send other avatar appearance data asynchro... (diff) | |
| download | opensim-SC-96539ffc79c1654feddc17592170f0e4b57f5b8d.zip opensim-SC-96539ffc79c1654feddc17592170f0e4b57f5b8d.tar.gz opensim-SC-96539ffc79c1654feddc17592170f0e4b57f5b8d.tar.bz2 opensim-SC-96539ffc79c1654feddc17592170f0e4b57f5b8d.tar.xz | |
Merge branch 'master' into bigmerge
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneBase.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneBase.cs b/OpenSim/Region/Framework/Scenes/SceneBase.cs index 29ab071..84da700 100644 --- a/OpenSim/Region/Framework/Scenes/SceneBase.cs +++ b/OpenSim/Region/Framework/Scenes/SceneBase.cs | |||
| @@ -177,7 +177,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 177 | 177 | ||
| 178 | #region Add/Remove Agent/Avatar | 178 | #region Add/Remove Agent/Avatar |
| 179 | 179 | ||
| 180 | public abstract void AddNewClient(IClientAPI client, PresenceType type); | 180 | public abstract ISceneAgent AddNewClient(IClientAPI client, PresenceType type); |
| 181 | public abstract void RemoveClient(UUID agentID, bool closeChildAgents); | 181 | public abstract void RemoveClient(UUID agentID, bool closeChildAgents); |
| 182 | 182 | ||
| 183 | public bool TryGetScenePresence(UUID agentID, out object scenePresence) | 183 | public bool TryGetScenePresence(UUID agentID, out object scenePresence) |