aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-05-24 22:48:21 +0000
committerJustin Clarke Casey2008-05-24 22:48:21 +0000
commit10564469c82aecc3eeb6b5ec83cd2206cf772547 (patch)
tree6e515aac8ab14befd57ec9a9731c1c5f7a2094dc
parent* Refactor: Change previous commits Object methods to SceneObject methods ins... (diff)
downloadopensim-SC-10564469c82aecc3eeb6b5ec83cd2206cf772547.zip
opensim-SC-10564469c82aecc3eeb6b5ec83cd2206cf772547.tar.gz
opensim-SC-10564469c82aecc3eeb6b5ec83cd2206cf772547.tar.bz2
opensim-SC-10564469c82aecc3eeb6b5ec83cd2206cf772547.tar.xz
* Refactor: Remove some unused methods in Scene/InnerScene
-rw-r--r--OpenSim/Region/Environment/Scenes/InnerScene.cs21
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs5
2 files changed, 0 insertions, 26 deletions
diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs
index 4885d6d..63f7f17 100644
--- a/OpenSim/Region/Environment/Scenes/InnerScene.cs
+++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs
@@ -286,27 +286,6 @@ namespace OpenSim.Region.Environment.Scenes
286 { 286 {
287 m_activeScripts += number; 287 m_activeScripts += number;
288 } 288 }
289
290 public void RemovePrim(uint localID, LLUUID avatar_deleter)
291 {
292 List<EntityBase> EntityList = GetEntities();
293
294 foreach (EntityBase obj in EntityList)
295 {
296 if (obj is SceneObjectGroup)
297 {
298 if (((SceneObjectGroup)obj).LocalId == localID)
299 {
300 if (m_parentScene.ExternalChecks.ExternalChecksCanDeleteObject(((SceneObjectGroup)obj).UUID, avatar_deleter))
301 {
302 m_parentScene.RemoveSceneObject((SceneObjectGroup)obj);
303 m_numPrim--;
304 }
305 return;
306 }
307 }
308 }
309 }
310 289
311 public void DetachObject(uint objectLocalID, IClientAPI remoteClient) 290 public void DetachObject(uint objectLocalID, IClientAPI remoteClient)
312 { 291 {
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index e3f219f..bbe8bd9 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -1319,11 +1319,6 @@ namespace OpenSim.Region.Environment.Scenes
1319 return AddNewPrim(uuid, position, rotation, treeShape); 1319 return AddNewPrim(uuid, position, rotation, treeShape);
1320 } 1320 }
1321 1321
1322 public void RemovePrim(uint localID, LLUUID avatar_deleter)
1323 {
1324 m_innerScene.RemovePrim(localID, avatar_deleter);
1325 }
1326
1327 /// <summary> 1322 /// <summary>
1328 /// Add an object into the scene that has come from storage 1323 /// Add an object into the scene that has come from storage
1329 /// </summary> 1324 /// </summary>