diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs (renamed from OpenSim/Region/Environment/Scenes/Scene.cs) | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index f798a0e..f07391d 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -40,10 +40,8 @@ using OpenSim.Framework; | |||
40 | using OpenSim.Framework.Communications; | 40 | using OpenSim.Framework.Communications; |
41 | using OpenSim.Framework.Communications.Cache; | 41 | using OpenSim.Framework.Communications.Cache; |
42 | using OpenSim.Framework.Servers; | 42 | using OpenSim.Framework.Servers; |
43 | using OpenSim.Region.Environment.Interfaces; | 43 | using OpenSim.Region.Framework.Interfaces; |
44 | using OpenSim.Region.Interfaces; | 44 | using OpenSim.Region.Framework.Scenes.Scripting; |
45 | using OpenSim.Region.Environment.Modules.World.Terrain; | ||
46 | using OpenSim.Region.Environment.Scenes.Scripting; | ||
47 | using OpenSim.Region.Physics.Manager; | 45 | using OpenSim.Region.Physics.Manager; |
48 | using Nini.Config; | 46 | using Nini.Config; |
49 | using Caps = OpenSim.Framework.Communications.Capabilities.Caps; | 47 | using Caps = OpenSim.Framework.Communications.Capabilities.Caps; |
@@ -52,7 +50,7 @@ using TPFlags = OpenSim.Framework.Constants.TeleportFlags; | |||
52 | using Timer = System.Timers.Timer; | 50 | using Timer = System.Timers.Timer; |
53 | using OSD = OpenMetaverse.StructuredData.OSD; | 51 | using OSD = OpenMetaverse.StructuredData.OSD; |
54 | 52 | ||
55 | namespace OpenSim.Region.Environment.Scenes | 53 | namespace OpenSim.Region.Framework.Scenes |
56 | { | 54 | { |
57 | public delegate bool FilterAvatarList(ScenePresence avatar); | 55 | public delegate bool FilterAvatarList(ScenePresence avatar); |
58 | 56 | ||
@@ -123,7 +121,12 @@ namespace OpenSim.Region.Environment.Scenes | |||
123 | protected IInterregionCommsOut m_interregionCommsOut; | 121 | protected IInterregionCommsOut m_interregionCommsOut; |
124 | protected IInterregionCommsIn m_interregionCommsIn; | 122 | protected IInterregionCommsIn m_interregionCommsIn; |
125 | protected IDialogModule m_dialogModule; | 123 | protected IDialogModule m_dialogModule; |
126 | protected internal ICapabilitiesModule CapsModule; | 124 | |
125 | protected ICapabilitiesModule m_capsModule; | ||
126 | public ICapabilitiesModule CapsModule | ||
127 | { | ||
128 | get { return m_capsModule; } | ||
129 | } | ||
127 | 130 | ||
128 | // Central Update Loop | 131 | // Central Update Loop |
129 | 132 | ||
@@ -747,7 +750,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
747 | m_interregionCommsOut = RequestModuleInterface<IInterregionCommsOut>(); | 750 | m_interregionCommsOut = RequestModuleInterface<IInterregionCommsOut>(); |
748 | m_interregionCommsIn = RequestModuleInterface<IInterregionCommsIn>(); | 751 | m_interregionCommsIn = RequestModuleInterface<IInterregionCommsIn>(); |
749 | m_dialogModule = RequestModuleInterface<IDialogModule>(); | 752 | m_dialogModule = RequestModuleInterface<IDialogModule>(); |
750 | CapsModule = RequestModuleInterface<ICapabilitiesModule>(); | 753 | m_capsModule = RequestModuleInterface<ICapabilitiesModule>(); |
751 | } | 754 | } |
752 | 755 | ||
753 | #endregion | 756 | #endregion |
@@ -972,7 +975,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
972 | /// Perform delegate action on all clients subscribing to updates from this region. | 975 | /// Perform delegate action on all clients subscribing to updates from this region. |
973 | /// </summary> | 976 | /// </summary> |
974 | /// <returns></returns> | 977 | /// <returns></returns> |
975 | internal void Broadcast(Action<IClientAPI> whatToDo) | 978 | public void Broadcast(Action<IClientAPI> whatToDo) |
976 | { | 979 | { |
977 | ForEachScenePresence(delegate(ScenePresence presence) { whatToDo(presence.ControllingClient); }); | 980 | ForEachScenePresence(delegate(ScenePresence presence) { whatToDo(presence.ControllingClient); }); |
978 | } | 981 | } |
@@ -2965,8 +2968,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
2965 | IEventQueue eq = RequestModuleInterface<IEventQueue>(); | 2968 | IEventQueue eq = RequestModuleInterface<IEventQueue>(); |
2966 | if (eq != null) | 2969 | if (eq != null) |
2967 | { | 2970 | { |
2968 | OSD Item = EventQueueHelper.DisableSimulator(RegionInfo.RegionHandle); | 2971 | eq.DisableSimulator(RegionInfo.RegionHandle, agentID); |
2969 | eq.Enqueue(Item, agentID); | ||
2970 | } | 2972 | } |
2971 | else | 2973 | else |
2972 | presence.ControllingClient.SendShutdownConnectionNotice(); | 2974 | presence.ControllingClient.SendShutdownConnectionNotice(); |
@@ -3792,12 +3794,12 @@ namespace OpenSim.Region.Environment.Scenes | |||
3792 | return m_sceneGraph.GetSceneObjectPart(fullID); | 3794 | return m_sceneGraph.GetSceneObjectPart(fullID); |
3793 | } | 3795 | } |
3794 | 3796 | ||
3795 | internal bool TryGetAvatar(UUID avatarId, out ScenePresence avatar) | 3797 | public bool TryGetAvatar(UUID avatarId, out ScenePresence avatar) |
3796 | { | 3798 | { |
3797 | return m_sceneGraph.TryGetAvatar(avatarId, out avatar); | 3799 | return m_sceneGraph.TryGetAvatar(avatarId, out avatar); |
3798 | } | 3800 | } |
3799 | 3801 | ||
3800 | internal bool TryGetAvatarByName(string avatarName, out ScenePresence avatar) | 3802 | public bool TryGetAvatarByName(string avatarName, out ScenePresence avatar) |
3801 | { | 3803 | { |
3802 | return m_sceneGraph.TryGetAvatarByName(avatarName, out avatar); | 3804 | return m_sceneGraph.TryGetAvatarByName(avatarName, out avatar); |
3803 | } | 3805 | } |