Merge branch 'master' into careminster

This commit is contained in:
Melanie
2011-12-10 15:19:31 +00:00
5 changed files with 18 additions and 0 deletions

View File

@@ -93,6 +93,7 @@ namespace OpenSim.Tests.Common.Mock
public event RequestMapName OnMapNameRequest;
public event TeleportLocationRequest OnTeleportLocationRequest;
public event TeleportLandmarkRequest OnTeleportLandmarkRequest;
public event TeleportCancel OnTeleportCancel;
public event DisconnectUser OnDisconnectUser;
public event RequestAvatarProperties OnRequestAvatarProperties;
public event SetAlwaysRun OnSetAlwaysRun;