diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneGraph.cs (renamed from OpenSim/Region/Environment/Scenes/SceneGraph.cs) | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs index 24eaad1..2877dcd 100644 --- a/OpenSim/Region/Environment/Scenes/SceneGraph.cs +++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs | |||
@@ -32,10 +32,10 @@ using OpenMetaverse; | |||
32 | using OpenMetaverse.Packets; | 32 | using OpenMetaverse.Packets; |
33 | using log4net; | 33 | using log4net; |
34 | using OpenSim.Framework; | 34 | using OpenSim.Framework; |
35 | using OpenSim.Region.Environment.Types; | 35 | using OpenSim.Region.Framework.Scenes.Types; |
36 | using OpenSim.Region.Physics.Manager; | 36 | using OpenSim.Region.Physics.Manager; |
37 | 37 | ||
38 | namespace OpenSim.Region.Environment.Scenes | 38 | namespace OpenSim.Region.Framework.Scenes |
39 | { | 39 | { |
40 | public delegate void PhysicsCrash(); | 40 | public delegate void PhysicsCrash(); |
41 | 41 | ||
@@ -312,7 +312,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
312 | /// Delete an object from the scene | 312 | /// Delete an object from the scene |
313 | /// </summary> | 313 | /// </summary> |
314 | /// <returns>true if the object was deleted, false if there was no object to delete</returns> | 314 | /// <returns>true if the object was deleted, false if there was no object to delete</returns> |
315 | protected internal bool DeleteSceneObject(UUID uuid, bool resultOfObjectLinked) | 315 | public bool DeleteSceneObject(UUID uuid, bool resultOfObjectLinked) |
316 | { | 316 | { |
317 | if (Entities.ContainsKey(uuid)) | 317 | if (Entities.ContainsKey(uuid)) |
318 | { | 318 | { |
@@ -797,8 +797,11 @@ namespace OpenSim.Region.Environment.Scenes | |||
797 | /// suitable solution). | 797 | /// suitable solution). |
798 | /// </summary> | 798 | /// </summary> |
799 | /// <param name="agentId"></param> | 799 | /// <param name="agentId"></param> |
800 | /// <returns>null if either the avatar wasn't in the scene, or they do not have a controlling client</returns> | 800 | /// <returns>null if either the avatar wasn't in the scene, or |
801 | protected internal IClientAPI GetControllingClient(UUID agentId) | 801 | /// they do not have a controlling client</returns> |
802 | /// <remarks>this used to be protected internal, but that | ||
803 | /// prevents CapabilitiesModule from accessing it</remarks> | ||
804 | public IClientAPI GetControllingClient(UUID agentId) | ||
802 | { | 805 | { |
803 | ScenePresence presence = GetScenePresence(agentId); | 806 | ScenePresence presence = GetScenePresence(agentId); |
804 | 807 | ||
@@ -1034,7 +1037,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1034 | return Entities.GetEntities(); | 1037 | return Entities.GetEntities(); |
1035 | } | 1038 | } |
1036 | 1039 | ||
1037 | protected internal Dictionary<uint, float> GetTopScripts() | 1040 | public Dictionary<uint, float> GetTopScripts() |
1038 | { | 1041 | { |
1039 | Dictionary<uint, float> topScripts = new Dictionary<uint, float>(); | 1042 | Dictionary<uint, float> topScripts = new Dictionary<uint, float>(); |
1040 | 1043 | ||