diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs (renamed from OpenSim/Region/Environment/Scenes/ScenePresence.cs) | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index ed455f4..36cd862 100644 --- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -36,13 +36,12 @@ using log4net; | |||
36 | using OpenSim.Framework; | 36 | using OpenSim.Framework; |
37 | using OpenSim.Framework.Client; | 37 | using OpenSim.Framework.Client; |
38 | using OpenSim.Framework.Communications.Cache; | 38 | using OpenSim.Framework.Communications.Cache; |
39 | using OpenSim.Region.Environment.Interfaces; | 39 | using OpenSim.Region.Framework.Interfaces; |
40 | using OpenSim.Region.Environment.Types; | 40 | using OpenSim.Region.Framework.Scenes.Types; |
41 | using OpenSim.Region.Interfaces; | ||
42 | using OpenSim.Region.Physics.Manager; | 41 | using OpenSim.Region.Physics.Manager; |
43 | using OSD = OpenMetaverse.StructuredData.OSD; | 42 | using OSD = OpenMetaverse.StructuredData.OSD; |
44 | 43 | ||
45 | namespace OpenSim.Region.Environment.Scenes | 44 | namespace OpenSim.Region.Framework.Scenes |
46 | { | 45 | { |
47 | enum ScriptControlled : uint | 46 | enum ScriptControlled : uint |
48 | { | 47 | { |
@@ -2474,10 +2473,9 @@ namespace OpenSim.Region.Environment.Scenes | |||
2474 | 2473 | ||
2475 | IEventQueue eq = m_scene.RequestModuleInterface<IEventQueue>(); | 2474 | IEventQueue eq = m_scene.RequestModuleInterface<IEventQueue>(); |
2476 | if (eq != null) | 2475 | if (eq != null) |
2477 | { | 2476 | { |
2478 | OSD Item = EventQueueHelper.CrossRegion(neighbourHandle, newpos, vel, neighbourRegion.ExternalEndPoint, | 2477 | eq.CrossRegion(neighbourHandle, newpos, vel, neighbourRegion.ExternalEndPoint, |
2479 | capsPath, UUID, ControllingClient.SessionId); | 2478 | capsPath, UUID, ControllingClient.SessionId); |
2480 | eq.Enqueue(Item, UUID); | ||
2481 | } | 2479 | } |
2482 | else | 2480 | else |
2483 | { | 2481 | { |