diff options
| author | Melanie | 2012-01-25 15:02:54 +0000 |
|---|---|---|
| committer | Melanie | 2012-01-25 15:02:54 +0000 |
| commit | 7444f3bfad0bf8007837ae4253390e364dafd69e (patch) | |
| tree | 1503c540cd424d88a10f51ca0913a97b710b2ded /OpenSim/Region/Framework | |
| parent | Change the WorldMapModule to use SOG rather than SOP for the telehub ans (diff) | |
| parent | Merge branch 'master' of /home/opensim/src/opensim (diff) | |
| download | opensim-SC_OLD-7444f3bfad0bf8007837ae4253390e364dafd69e.zip opensim-SC_OLD-7444f3bfad0bf8007837ae4253390e364dafd69e.tar.gz opensim-SC_OLD-7444f3bfad0bf8007837ae4253390e364dafd69e.tar.bz2 opensim-SC_OLD-7444f3bfad0bf8007837ae4253390e364dafd69e.tar.xz | |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Conflicts:
OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
Diffstat (limited to 'OpenSim/Region/Framework')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneGraph.cs | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs index 1af8346..7f18140 100644 --- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs +++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs | |||
| @@ -41,12 +41,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 41 | { | 41 | { |
| 42 | public delegate void PhysicsCrash(); | 42 | public delegate void PhysicsCrash(); |
| 43 | 43 | ||
| 44 | public delegate void ObjectDuplicateDelegate(EntityBase original, EntityBase clone); | ||
| 45 | |||
| 46 | public delegate void ObjectCreateDelegate(EntityBase obj); | ||
| 47 | |||
| 48 | public delegate void ObjectDeleteDelegate(EntityBase obj); | ||
| 49 | |||
| 50 | /// <summary> | 44 | /// <summary> |
| 51 | /// This class used to be called InnerScene and may not yet truly be a SceneGraph. The non scene graph components | 45 | /// This class used to be called InnerScene and may not yet truly be a SceneGraph. The non scene graph components |
| 52 | /// should be migrated out over time. | 46 | /// should be migrated out over time. |