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

Merge branch 'master' into careminster

Browse Source
This commit is contained in:
Melanie
2011-12-10 15:19:31 +00:00
parent 3f42183797 3a91085ac2
commit 6b080d57cb
5 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Framework/IClientAPI.cs
View File

@@ -84,6 +84,8 @@ namespace OpenSim.Framework
public delegate void TeleportLandmarkRequest(
IClientAPI remoteClient, AssetLandmark lm);
public delegate void TeleportCancel(IClientAPI remoteClient);
public delegate void DisconnectUser();
public delegate void RequestAvatarProperties(IClientAPI remoteClient, UUID avatarID);
@@ -793,6 +795,7 @@ namespace OpenSim.Framework
event RequestAvatarProperties OnRequestAvatarProperties;
event SetAlwaysRun OnSetAlwaysRun;
event TeleportLandmarkRequest OnTeleportLandmarkRequest;
event TeleportCancel OnTeleportCancel;
event DeRezObject OnDeRezObject;
event Action<IClientAPI> OnRegionHandShakeReply;
event GenericCall1 OnRequestWearables;