diff options
Merge branch 'master' into bulletsim
Conflicts:
OpenSim/Region/Framework/Scenes/SceneManager.cs
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/IScene.cs | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/OpenSim/Framework/IScene.cs b/OpenSim/Framework/IScene.cs index 1298f26..8f7a2e5 100644 --- a/OpenSim/Framework/IScene.cs +++ b/OpenSim/Framework/IScene.cs | |||
@@ -70,8 +70,20 @@ namespace OpenSim.Framework | |||
70 | 70 | ||
71 | event restart OnRestart; | 71 | event restart OnRestart; |
72 | 72 | ||
73 | void AddNewClient(IClientAPI client); | 73 | /// <summary> |
74 | void RemoveClient(UUID agentID); | 74 | /// Register the new client with the scene. The client starts off as a child agent - the later agent crossing |
75 | /// will promote it to a root agent. | ||
76 | /// </summary> | ||
77 | /// <param name="client"></param> | ||
78 | /// <param name="type">The type of agent to add.</param> | ||
79 | void AddNewClient(IClientAPI client, PresenceType type); | ||
80 | |||
81 | /// <summary> | ||
82 | /// Remove the given client from the scene. | ||
83 | /// </summary> | ||
84 | /// <param name="agentID"></param> | ||
85 | /// <param name="closeChildAgents">Close the neighbour child agents associated with this client.</param> | ||
86 | void RemoveClient(UUID agentID, bool closeChildAgents); | ||
75 | 87 | ||
76 | void Restart(); | 88 | void Restart(); |
77 | //RegionInfo OtherRegionUp(RegionInfo thisRegion); | 89 | //RegionInfo OtherRegionUp(RegionInfo thisRegion); |