ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-12 04:05:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Resolve merge commits, stage 1

Browse Source
This commit is contained in:
Tom
2011-09-04 07:06:36 -07:00
parent 6ab5ca2bda 9f75eaf50e
commit 66dec3b874
267 changed files with 19393 additions and 5645 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OpenSim/Region/Framework/Scenes/EventManager.cs
View File

@@ -169,8 +169,7 @@ namespace OpenSim.Region.Framework.Scenes
public delegate void AvatarEnteringNewParcel(ScenePresence avatar, int localLandID, UUID regionID);
public event AvatarEnteringNewParcel OnAvatarEnteringNewParcel;
public delegate void SignificantClientMovement(IClientAPI remote_client);
public event SignificantClientMovement OnSignificantClientMovement;
public event Action<ScenePresence> OnSignificantClientMovement;
public delegate void IncomingInstantMessage(GridInstantMessage message);
public event IncomingInstantMessage OnIncomingInstantMessage;
@@ -1616,16 +1615,16 @@ namespace OpenSim.Region.Framework.Scenes
}
}
public void TriggerSignificantClientMovement(IClientAPI client)
public void TriggerSignificantClientMovement(ScenePresence presence)
{
SignificantClientMovement handlerSignificantClientMovement = OnSignificantClientMovement;
Action<ScenePresence> handlerSignificantClientMovement = OnSignificantClientMovement;
if (handlerSignificantClientMovement != null)
{
foreach (SignificantClientMovement d in handlerSignificantClientMovement.GetInvocationList())
foreach (Action<ScenePresence> d in handlerSignificantClientMovement.GetInvocationList())
{
try
{
d(client);
d(presence);
}
catch (Exception e)
{