diff options
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/EventManager.cs | 6 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 1 |
2 files changed, 3 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs index 1981a25..ba79964 100644 --- a/OpenSim/Region/Framework/Scenes/EventManager.cs +++ b/OpenSim/Region/Framework/Scenes/EventManager.cs | |||
@@ -430,7 +430,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
430 | public delegate void IncomingInstantMessage(GridInstantMessage message); | 430 | public delegate void IncomingInstantMessage(GridInstantMessage message); |
431 | public event IncomingInstantMessage OnIncomingInstantMessage; | 431 | public event IncomingInstantMessage OnIncomingInstantMessage; |
432 | 432 | ||
433 | public delegate void CrossAgentToNewRegion(ScenePresence sp, bool isFlying); | 433 | public delegate void CrossAgentToNewRegion(ScenePresence sp, bool isFlying, GridRegion newRegion); |
434 | public event CrossAgentToNewRegion OnCrossAgentToNewRegion; | 434 | public event CrossAgentToNewRegion OnCrossAgentToNewRegion; |
435 | 435 | ||
436 | public event IncomingInstantMessage OnUnhandledInstantMessage; | 436 | public event IncomingInstantMessage OnUnhandledInstantMessage; |
@@ -1963,7 +1963,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1963 | } | 1963 | } |
1964 | } | 1964 | } |
1965 | 1965 | ||
1966 | public void TriggerCrossAgentToNewRegion(ScenePresence agent, bool isFlying) | 1966 | public void TriggerCrossAgentToNewRegion(ScenePresence agent, bool isFlying, GridRegion newRegion) |
1967 | { | 1967 | { |
1968 | CrossAgentToNewRegion handlerCrossAgentToNewRegion = OnCrossAgentToNewRegion; | 1968 | CrossAgentToNewRegion handlerCrossAgentToNewRegion = OnCrossAgentToNewRegion; |
1969 | if (handlerCrossAgentToNewRegion != null) | 1969 | if (handlerCrossAgentToNewRegion != null) |
@@ -1972,7 +1972,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1972 | { | 1972 | { |
1973 | try | 1973 | try |
1974 | { | 1974 | { |
1975 | d(agent, isFlying); | 1975 | d(agent, isFlying, newRegion); |
1976 | } | 1976 | } |
1977 | catch (Exception e) | 1977 | catch (Exception e) |
1978 | { | 1978 | { |
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 06ddcbd..676c000 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -4358,7 +4358,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
4358 | { | 4358 | { |
4359 | if (EntityTransferModule != null) | 4359 | if (EntityTransferModule != null) |
4360 | { | 4360 | { |
4361 | EventManager.TriggerCrossAgentToNewRegion(agent, isFlying); | ||
4362 | return EntityTransferModule.Cross(agent, isFlying); | 4361 | return EntityTransferModule.Cross(agent, isFlying); |
4363 | } | 4362 | } |
4364 | else | 4363 | else |