aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/InnerScene.cs
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-05-24 22:45:13 +0000
committerJustin Clarke Casey2008-05-24 22:45:13 +0000
commitf3067ce6f9f2ea992f0e601ab120f3a1ff89cf94 (patch)
tree0ec2ccf815cba335f42b9a64f6a9cc18b0c78230 /OpenSim/Region/Environment/Scenes/InnerScene.cs
parent* Refactor: Renaming various *Entity*() methods to *Object*() methods on the ... (diff)
downloadopensim-SC_OLD-f3067ce6f9f2ea992f0e601ab120f3a1ff89cf94.zip
opensim-SC_OLD-f3067ce6f9f2ea992f0e601ab120f3a1ff89cf94.tar.gz
opensim-SC_OLD-f3067ce6f9f2ea992f0e601ab120f3a1ff89cf94.tar.bz2
opensim-SC_OLD-f3067ce6f9f2ea992f0e601ab120f3a1ff89cf94.tar.xz
* Refactor: Change previous commits Object methods to SceneObject methods instead, on the basis that this is less likely to cause confusion with c#'s base object type
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/InnerScene.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/InnerScene.cs11
1 files changed, 6 insertions, 5 deletions
diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs
index 4088746..4885d6d 100644
--- a/OpenSim/Region/Environment/Scenes/InnerScene.cs
+++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs
@@ -186,7 +186,7 @@ namespace OpenSim.Region.Environment.Scenes
186 /// Add an object into the scene that has come from storage 186 /// Add an object into the scene that has come from storage
187 /// </summary> 187 /// </summary>
188 /// <param name="sceneObject"></param> 188 /// <param name="sceneObject"></param>
189 public void AddObjectFromStorage(SceneObjectGroup sceneObject) 189 public void AddSceneObjectFromStorage(SceneObjectGroup sceneObject)
190 { 190 {
191 sceneObject.RegionHandle = m_regInfo.RegionHandle; 191 sceneObject.RegionHandle = m_regInfo.RegionHandle;
192 sceneObject.SetScene(m_parentScene); 192 sceneObject.SetScene(m_parentScene);
@@ -197,18 +197,18 @@ namespace OpenSim.Region.Environment.Scenes
197 } 197 }
198 sceneObject.UpdateParentIDs(); 198 sceneObject.UpdateParentIDs();
199 199
200 AddObject(sceneObject); 200 AddSceneObject(sceneObject);
201 } 201 }
202 202
203 /// <summary> 203 /// <summary>
204 /// Add an object to the scene. 204 /// Add an object to the scene.
205 /// </summary> 205 /// </summary>
206 /// <param name="sceneObject"></param> 206 /// <param name="sceneObject"></param>
207 public void AddObject(SceneObjectGroup sceneObject) 207 public void AddSceneObject(SceneObjectGroup sceneObject)
208 { 208 {
209 if (!Entities.ContainsKey(sceneObject.UUID)) 209 if (!Entities.ContainsKey(sceneObject.UUID))
210 { 210 {
211 // QuadTree.AddObject(sceneObject); 211 // QuadTree.AddSceneObject(sceneObject);
212 lock (Entities) 212 lock (Entities)
213 { 213 {
214 Entities.Add(sceneObject.UUID, sceneObject); 214 Entities.Add(sceneObject.UUID, sceneObject);
@@ -299,7 +299,7 @@ namespace OpenSim.Region.Environment.Scenes
299 { 299 {
300 if (m_parentScene.ExternalChecks.ExternalChecksCanDeleteObject(((SceneObjectGroup)obj).UUID, avatar_deleter)) 300 if (m_parentScene.ExternalChecks.ExternalChecksCanDeleteObject(((SceneObjectGroup)obj).UUID, avatar_deleter))
301 { 301 {
302 m_parentScene.RemoveObject((SceneObjectGroup)obj); 302 m_parentScene.RemoveSceneObject((SceneObjectGroup)obj);
303 m_numPrim--; 303 m_numPrim--;
304 } 304 }
305 return; 305 return;
@@ -307,6 +307,7 @@ namespace OpenSim.Region.Environment.Scenes
307 } 307 }
308 } 308 }
309 } 309 }
310
310 public void DetachObject(uint objectLocalID, IClientAPI remoteClient) 311 public void DetachObject(uint objectLocalID, IClientAPI remoteClient)
311 { 312 {
312 List<EntityBase> EntityList = GetEntities(); 313 List<EntityBase> EntityList = GetEntities();