diff options
author | Tom | 2011-09-04 07:06:36 -0700 |
---|---|---|
committer | Tom | 2011-09-04 07:06:36 -0700 |
commit | 66dec3b8742eff04fbbcc6e3249fe4ba87986500 (patch) | |
tree | 76cc708a821d35fac5cdbbce2de304b47064e732 /OpenSim/Region/Framework/Scenes/SceneBase.cs | |
parent | Guard another nullref (diff) | |
parent | Fixed BulletSim config files for Linux *.so libraries. (diff) | |
download | opensim-SC_OLD-66dec3b8742eff04fbbcc6e3249fe4ba87986500.zip opensim-SC_OLD-66dec3b8742eff04fbbcc6e3249fe4ba87986500.tar.gz opensim-SC_OLD-66dec3b8742eff04fbbcc6e3249fe4ba87986500.tar.bz2 opensim-SC_OLD-66dec3b8742eff04fbbcc6e3249fe4ba87986500.tar.xz |
Resolve merge commits, stage 1
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneBase.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneBase.cs | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneBase.cs b/OpenSim/Region/Framework/Scenes/SceneBase.cs index f343bc8..bf861b8 100644 --- a/OpenSim/Region/Framework/Scenes/SceneBase.cs +++ b/OpenSim/Region/Framework/Scenes/SceneBase.cs | |||
@@ -177,18 +177,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
177 | 177 | ||
178 | #region Add/Remove Agent/Avatar | 178 | #region Add/Remove Agent/Avatar |
179 | 179 | ||
180 | /// <summary> | 180 | public abstract void AddNewClient(IClientAPI client, PresenceType type); |
181 | /// Register the new client with the scene. The client starts off as a child agent - the later agent crossing | 181 | public abstract void RemoveClient(UUID agentID, bool closeChildAgents); |
182 | /// will promote it to a root agent during login. | ||
183 | /// </summary> | ||
184 | /// <param name="client"></param | ||
185 | public abstract void AddNewClient(IClientAPI client); | ||
186 | |||
187 | /// <summary> | ||
188 | /// Remove a client from the scene | ||
189 | /// </summary> | ||
190 | /// <param name="agentID"></param> | ||
191 | public abstract void RemoveClient(UUID agentID); | ||
192 | 182 | ||
193 | public bool TryGetScenePresence(UUID agentID, out object scenePresence) | 183 | public bool TryGetScenePresence(UUID agentID, out object scenePresence) |
194 | { | 184 | { |