Merge branch 'master' into careminster

Conflicts:
	OpenSim/Region/Framework/Scenes/SceneGraph.cs

1 files changed, 0 insertions, 12 deletions

diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index 6c57d57..c4dd655 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -66,12 +66,9 @@ namespace OpenSim.Region.Framework.Scenes
         protected internal event PhysicsCrash UnRecoverableError;
         private PhysicsCrash handlerPhysicsCrash = null;
 
-        public event ObjectDuplicateDelegate OnObjectDuplicate;
         public event AttachToBackupDelegate OnAttachToBackup;
         public event DetachFromBackupDelegate OnDetachFromBackup;
         public event ChangedBackupDelegate OnChangeBackup;
-        public event ObjectCreateDelegate OnObjectCreate;
-        public event ObjectDeleteDelegate OnObjectRemove;
 
         #endregion
 
@@ -445,9 +442,6 @@ namespace OpenSim.Region.Framework.Scenes
             if (attachToBackup)
                 sceneObject.AttachToBackup();
 
-            if (OnObjectCreate != null)
-                OnObjectCreate(sceneObject);
-
             lock (SceneObjectGroupsByFullID)
                 SceneObjectGroupsByFullID[sceneObject.UUID] = sceneObject;
             
@@ -496,9 +490,6 @@ namespace OpenSim.Region.Framework.Scenes
                 if ((grp.RootPart.Flags & PrimFlags.Physics) == PrimFlags.Physics)
                     RemovePhysicalPrim(grp.PrimCount);
             }
-
-            if (OnObjectRemove != null)
-                OnObjectRemove(Entities[uuid]);
             
             lock (SceneObjectGroupsByFullID)
                 SceneObjectGroupsByFullID.Remove(grp.UUID);
@@ -2091,9 +2082,6 @@ namespace OpenSim.Region.Framework.Scenes
                     // required for physics to update it's position
                     copy.AbsolutePosition = copy.AbsolutePosition;
 
-                    if (OnObjectDuplicate != null)
-                        OnObjectDuplicate(original, copy);
-
                     return copy;
                 }
             }