diff options
Merge branch 'master' into bigmerge
Conflicts:
OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/EventManager.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/EventManager.cs | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/OpenSim/Region/Framework/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs index 65c6a29..0049384 100644 --- a/OpenSim/Region/Framework/Scenes/EventManager.cs +++ b/OpenSim/Region/Framework/Scenes/EventManager.cs | |||
@@ -77,8 +77,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
77 | /// </summary> | 77 | /// </summary> |
78 | public event OnNewClientDelegate OnNewClient; | 78 | public event OnNewClientDelegate OnNewClient; |
79 | 79 | ||
80 | public delegate void OnClientLoginDelegate(IClientAPI client); | 80 | /// <summary> |
81 | public event OnClientLoginDelegate OnClientLogin; | 81 | /// Fired if the client entering this sim is doing so as a new login |
82 | /// </summary> | ||
83 | public event Action<IClientAPI> OnClientLogin; | ||
82 | 84 | ||
83 | public delegate void OnNewPresenceDelegate(ScenePresence presence); | 85 | public delegate void OnNewPresenceDelegate(ScenePresence presence); |
84 | 86 | ||
@@ -214,10 +216,15 @@ namespace OpenSim.Region.Framework.Scenes | |||
214 | public delegate void OnMakeChildAgentDelegate(ScenePresence presence); | 216 | public delegate void OnMakeChildAgentDelegate(ScenePresence presence); |
215 | public event OnMakeChildAgentDelegate OnMakeChildAgent; | 217 | public event OnMakeChildAgentDelegate OnMakeChildAgent; |
216 | 218 | ||
217 | public delegate void OnMakeRootAgentDelegate(ScenePresence presence); | ||
218 | public delegate void OnSaveNewWindlightProfileDelegate(); | 219 | public delegate void OnSaveNewWindlightProfileDelegate(); |
219 | public delegate void OnSendNewWindlightProfileTargetedDelegate(RegionLightShareData wl, UUID user); | 220 | public delegate void OnSendNewWindlightProfileTargetedDelegate(RegionLightShareData wl, UUID user); |
220 | public event OnMakeRootAgentDelegate OnMakeRootAgent; | 221 | |
222 | /// <summary> | ||
223 | /// This event is on the critical path for transferring an avatar from one region to another. Try and do | ||
224 | /// as little work on this event as possible, or do work asynchronously. | ||
225 | /// </summary> | ||
226 | public event Action<ScenePresence> OnMakeRootAgent; | ||
227 | |||
221 | public event OnSendNewWindlightProfileTargetedDelegate OnSendNewWindlightProfileTargeted; | 228 | public event OnSendNewWindlightProfileTargetedDelegate OnSendNewWindlightProfileTargeted; |
222 | public event OnSaveNewWindlightProfileDelegate OnSaveNewWindlightProfile; | 229 | public event OnSaveNewWindlightProfileDelegate OnSaveNewWindlightProfile; |
223 | 230 | ||
@@ -655,10 +662,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
655 | 662 | ||
656 | public void TriggerOnClientLogin(IClientAPI client) | 663 | public void TriggerOnClientLogin(IClientAPI client) |
657 | { | 664 | { |
658 | OnClientLoginDelegate handlerClientLogin = OnClientLogin; | 665 | Action<IClientAPI> handlerClientLogin = OnClientLogin; |
659 | if (handlerClientLogin != null) | 666 | if (handlerClientLogin != null) |
660 | { | 667 | { |
661 | foreach (OnClientLoginDelegate d in handlerClientLogin.GetInvocationList()) | 668 | foreach (Action<IClientAPI> d in handlerClientLogin.GetInvocationList()) |
662 | { | 669 | { |
663 | try | 670 | try |
664 | { | 671 | { |
@@ -1344,10 +1351,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
1344 | 1351 | ||
1345 | public void TriggerOnMakeRootAgent(ScenePresence presence) | 1352 | public void TriggerOnMakeRootAgent(ScenePresence presence) |
1346 | { | 1353 | { |
1347 | OnMakeRootAgentDelegate handlerMakeRootAgent = OnMakeRootAgent; | 1354 | Action<ScenePresence> handlerMakeRootAgent = OnMakeRootAgent; |
1348 | if (handlerMakeRootAgent != null) | 1355 | if (handlerMakeRootAgent != null) |
1349 | { | 1356 | { |
1350 | foreach (OnMakeRootAgentDelegate d in handlerMakeRootAgent.GetInvocationList()) | 1357 | foreach (Action<ScenePresence> d in handlerMakeRootAgent.GetInvocationList()) |
1351 | { | 1358 | { |
1352 | try | 1359 | try |
1353 | { | 1360 | { |