aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-01-24 22:04:28 +0000
committerJustin Clark-Casey (justincc)2012-01-24 22:04:28 +0000
commitab8956d58f8dd4ece01ea9eba6549b8d814fdc0c (patch)
tree8aba7de821a48dfc0fdf1fa3729195c4fa7639a8 /OpenSim/Region
parentComment out inventory statistics section from periodic stats, since this only... (diff)
parentRemoved unused events in SceneGraph: OnObjectCreate, OnObjectRemove, OnObject... (diff)
downloadopensim-SC-ab8956d58f8dd4ece01ea9eba6549b8d814fdc0c.zip
opensim-SC-ab8956d58f8dd4ece01ea9eba6549b8d814fdc0c.tar.gz
opensim-SC-ab8956d58f8dd4ece01ea9eba6549b8d814fdc0c.tar.bz2
opensim-SC-ab8956d58f8dd4ece01ea9eba6549b8d814fdc0c.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneGraph.cs13
1 files changed, 0 insertions, 13 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index 1e2901b..1af8346 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -60,10 +60,6 @@ namespace OpenSim.Region.Framework.Scenes
60 protected internal event PhysicsCrash UnRecoverableError; 60 protected internal event PhysicsCrash UnRecoverableError;
61 private PhysicsCrash handlerPhysicsCrash = null; 61 private PhysicsCrash handlerPhysicsCrash = null;
62 62
63 public event ObjectDuplicateDelegate OnObjectDuplicate;
64 public event ObjectCreateDelegate OnObjectCreate;
65 public event ObjectDeleteDelegate OnObjectRemove;
66
67 #endregion 63 #endregion
68 64
69 #region Fields 65 #region Fields
@@ -404,9 +400,6 @@ namespace OpenSim.Region.Framework.Scenes
404 if (attachToBackup) 400 if (attachToBackup)
405 sceneObject.AttachToBackup(); 401 sceneObject.AttachToBackup();
406 402
407 if (OnObjectCreate != null)
408 OnObjectCreate(sceneObject);
409
410 lock (SceneObjectGroupsByFullID) 403 lock (SceneObjectGroupsByFullID)
411 SceneObjectGroupsByFullID[sceneObject.UUID] = sceneObject; 404 SceneObjectGroupsByFullID[sceneObject.UUID] = sceneObject;
412 405
@@ -455,9 +448,6 @@ namespace OpenSim.Region.Framework.Scenes
455 if ((grp.RootPart.Flags & PrimFlags.Physics) == PrimFlags.Physics) 448 if ((grp.RootPart.Flags & PrimFlags.Physics) == PrimFlags.Physics)
456 RemovePhysicalPrim(grp.PrimCount); 449 RemovePhysicalPrim(grp.PrimCount);
457 } 450 }
458
459 if (OnObjectRemove != null)
460 OnObjectRemove(Entities[uuid]);
461 451
462 lock (SceneObjectGroupsByFullID) 452 lock (SceneObjectGroupsByFullID)
463 SceneObjectGroupsByFullID.Remove(grp.UUID); 453 SceneObjectGroupsByFullID.Remove(grp.UUID);
@@ -1979,9 +1969,6 @@ namespace OpenSim.Region.Framework.Scenes
1979 // required for physics to update it's position 1969 // required for physics to update it's position
1980 copy.AbsolutePosition = copy.AbsolutePosition; 1970 copy.AbsolutePosition = copy.AbsolutePosition;
1981 1971
1982 if (OnObjectDuplicate != null)
1983 OnObjectDuplicate(original, copy);
1984
1985 return copy; 1972 return copy;
1986 } 1973 }
1987 } 1974 }