Merge branch 'master' into careminster-presence-refactor

This commit is contained in:
Melanie
2010-10-29 20:40:48 +01:00
32 changed files with 1084 additions and 911 deletions

View File

@@ -82,7 +82,7 @@ namespace OpenSim.Region.Examples.SimpleModule
public event MoveItemsAndLeaveCopy OnMoveItemsAndLeaveCopy;
public event DeRezObject OnDeRezObject;
public event Action<IClientAPI> OnRegionHandShakeReply;
public event GenericCall2 OnRequestWearables;
public event GenericCall1 OnRequestWearables;
public event GenericCall1 OnCompleteMovementToRegion;
public event UpdateAgent OnPreAgentUpdate;
public event UpdateAgent OnAgentUpdate;