diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/EventManager.cs | 6 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Environment/Scenes/EventManager.cs b/OpenSim/Region/Environment/Scenes/EventManager.cs index cdaff51..598f8b4 100644 --- a/OpenSim/Region/Environment/Scenes/EventManager.cs +++ b/OpenSim/Region/Environment/Scenes/EventManager.cs | |||
@@ -98,7 +98,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
98 | 98 | ||
99 | public delegate void OnPermissionErrorDelegate(UUID user, string reason); | 99 | public delegate void OnPermissionErrorDelegate(UUID user, string reason); |
100 | 100 | ||
101 | public delegate void OnSetRootAgentSceneDelegate(UUID agentID); | 101 | public delegate void OnSetRootAgentSceneDelegate(UUID agentID, Scene scene); |
102 | 102 | ||
103 | public event OnSetRootAgentSceneDelegate OnSetRootAgentScene; | 103 | public event OnSetRootAgentSceneDelegate OnSetRootAgentScene; |
104 | 104 | ||
@@ -919,11 +919,11 @@ namespace OpenSim.Region.Environment.Scenes | |||
919 | handlerCollidingEnd(localId, colliders); | 919 | handlerCollidingEnd(localId, colliders); |
920 | } | 920 | } |
921 | 921 | ||
922 | public void TriggerSetRootAgentScene(UUID agentID) | 922 | public void TriggerSetRootAgentScene(UUID agentID, Scene scene) |
923 | { | 923 | { |
924 | handlerSetRootAgentScene = OnSetRootAgentScene; | 924 | handlerSetRootAgentScene = OnSetRootAgentScene; |
925 | if (handlerSetRootAgentScene != null) | 925 | if (handlerSetRootAgentScene != null) |
926 | handlerSetRootAgentScene(agentID); | 926 | handlerSetRootAgentScene(agentID, scene); |
927 | } | 927 | } |
928 | } | 928 | } |
929 | } | 929 | } |
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index 0c5eb62..d2e797a 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -4215,7 +4215,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
4215 | 4215 | ||
4216 | inv.SetRootAgentScene(agentID, this); | 4216 | inv.SetRootAgentScene(agentID, this); |
4217 | 4217 | ||
4218 | EventManager.TriggerSetRootAgentScene(agentID); | 4218 | EventManager.TriggerSetRootAgentScene(agentID, this); |
4219 | } | 4219 | } |
4220 | 4220 | ||
4221 | public bool NeedSceneCacheClear(UUID agentID) | 4221 | public bool NeedSceneCacheClear(UUID agentID) |