Merge branch 'master' into careminster

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

1 files changed, 0 insertions, 6 deletions

diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index c4dd655..5e8227d 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -41,18 +41,12 @@ namespace OpenSim.Region.Framework.Scenes
 {
     public delegate void PhysicsCrash();
 
-    public delegate void ObjectDuplicateDelegate(EntityBase original, EntityBase clone);
-
     public delegate void AttachToBackupDelegate(SceneObjectGroup sog);
 
     public delegate void DetachFromBackupDelegate(SceneObjectGroup sog);
 
     public delegate void ChangedBackupDelegate(SceneObjectGroup sog);
 
-    public delegate void ObjectCreateDelegate(EntityBase obj);
-
-    public delegate void ObjectDeleteDelegate(EntityBase obj);
-
     /// <summary>
     /// This class used to be called InnerScene and may not yet truly be a SceneGraph.  The non scene graph components
     /// should be migrated out over time.