diff options
author | Tom | 2011-09-04 07:06:36 -0700 |
---|---|---|
committer | Tom | 2011-09-04 07:06:36 -0700 |
commit | 66dec3b8742eff04fbbcc6e3249fe4ba87986500 (patch) | |
tree | 76cc708a821d35fac5cdbbce2de304b47064e732 /OpenSim/Region/Framework/Scenes/EventManager.cs | |
parent | Guard another nullref (diff) | |
parent | Fixed BulletSim config files for Linux *.so libraries. (diff) | |
download | opensim-SC_OLD-66dec3b8742eff04fbbcc6e3249fe4ba87986500.zip opensim-SC_OLD-66dec3b8742eff04fbbcc6e3249fe4ba87986500.tar.gz opensim-SC_OLD-66dec3b8742eff04fbbcc6e3249fe4ba87986500.tar.bz2 opensim-SC_OLD-66dec3b8742eff04fbbcc6e3249fe4ba87986500.tar.xz |
Resolve merge commits, stage 1
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/EventManager.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/EventManager.cs | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/OpenSim/Region/Framework/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs index 3ec4e59..65c6a29 100644 --- a/OpenSim/Region/Framework/Scenes/EventManager.cs +++ b/OpenSim/Region/Framework/Scenes/EventManager.cs | |||
@@ -169,8 +169,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
169 | public delegate void AvatarEnteringNewParcel(ScenePresence avatar, int localLandID, UUID regionID); | 169 | public delegate void AvatarEnteringNewParcel(ScenePresence avatar, int localLandID, UUID regionID); |
170 | public event AvatarEnteringNewParcel OnAvatarEnteringNewParcel; | 170 | public event AvatarEnteringNewParcel OnAvatarEnteringNewParcel; |
171 | 171 | ||
172 | public delegate void SignificantClientMovement(IClientAPI remote_client); | 172 | public event Action<ScenePresence> OnSignificantClientMovement; |
173 | public event SignificantClientMovement OnSignificantClientMovement; | ||
174 | 173 | ||
175 | public delegate void IncomingInstantMessage(GridInstantMessage message); | 174 | public delegate void IncomingInstantMessage(GridInstantMessage message); |
176 | public event IncomingInstantMessage OnIncomingInstantMessage; | 175 | public event IncomingInstantMessage OnIncomingInstantMessage; |
@@ -1616,16 +1615,16 @@ namespace OpenSim.Region.Framework.Scenes | |||
1616 | } | 1615 | } |
1617 | } | 1616 | } |
1618 | 1617 | ||
1619 | public void TriggerSignificantClientMovement(IClientAPI client) | 1618 | public void TriggerSignificantClientMovement(ScenePresence presence) |
1620 | { | 1619 | { |
1621 | SignificantClientMovement handlerSignificantClientMovement = OnSignificantClientMovement; | 1620 | Action<ScenePresence> handlerSignificantClientMovement = OnSignificantClientMovement; |
1622 | if (handlerSignificantClientMovement != null) | 1621 | if (handlerSignificantClientMovement != null) |
1623 | { | 1622 | { |
1624 | foreach (SignificantClientMovement d in handlerSignificantClientMovement.GetInvocationList()) | 1623 | foreach (Action<ScenePresence> d in handlerSignificantClientMovement.GetInvocationList()) |
1625 | { | 1624 | { |
1626 | try | 1625 | try |
1627 | { | 1626 | { |
1628 | d(client); | 1627 | d(presence); |
1629 | } | 1628 | } |
1630 | catch (Exception e) | 1629 | catch (Exception e) |
1631 | { | 1630 | { |