diff options
| author | Melanie | 2011-10-12 00:10:15 +0200 |
|---|---|---|
| committer | Melanie | 2011-10-12 00:10:15 +0200 |
| commit | 1c2b5d99c9601a3d301f4bc0f53389cca831ee04 (patch) | |
| tree | 97fa9c758f429d5dee64234e442f2c83cd1b9994 /OpenSim/Framework/IClientAPI.cs | |
| parent | Merge branch 'careminster-presence-refactor' into bigmerge (diff) | |
| parent | Merge commit '92c88121c72386f85472c6cf4891eca8b62b9867' into bigmerge (diff) | |
| download | opensim-SC-1c2b5d99c9601a3d301f4bc0f53389cca831ee04.zip opensim-SC-1c2b5d99c9601a3d301f4bc0f53389cca831ee04.tar.gz opensim-SC-1c2b5d99c9601a3d301f4bc0f53389cca831ee04.tar.bz2 opensim-SC-1c2b5d99c9601a3d301f4bc0f53389cca831ee04.tar.xz | |
Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge
Diffstat (limited to 'OpenSim/Framework/IClientAPI.cs')
| -rw-r--r-- | OpenSim/Framework/IClientAPI.cs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs index ee3d6b6..f02543d 100644 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs | |||
| @@ -53,8 +53,7 @@ namespace OpenSim.Framework | |||
| 53 | 53 | ||
| 54 | public delegate ISceneEntity RezSingleAttachmentFromInv(IClientAPI remoteClient, UUID itemID, uint AttachmentPt); | 54 | public delegate ISceneEntity RezSingleAttachmentFromInv(IClientAPI remoteClient, UUID itemID, uint AttachmentPt); |
| 55 | 55 | ||
| 56 | public delegate void RezMultipleAttachmentsFromInv(IClientAPI remoteClient, RezMultipleAttachmentsFromInvPacket.HeaderDataBlock header, | 56 | public delegate void RezMultipleAttachmentsFromInv(IClientAPI remoteClient, List<KeyValuePair<UUID, uint>> rezlist ); |
| 57 | RezMultipleAttachmentsFromInvPacket.ObjectDataBlock[] objects); | ||
| 58 | 57 | ||
| 59 | public delegate void ObjectAttach( | 58 | public delegate void ObjectAttach( |
| 60 | IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, bool silent); | 59 | IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, bool silent); |
| @@ -940,7 +939,7 @@ namespace OpenSim.Framework | |||
| 940 | event ScriptReset OnScriptReset; | 939 | event ScriptReset OnScriptReset; |
| 941 | event GetScriptRunning OnGetScriptRunning; | 940 | event GetScriptRunning OnGetScriptRunning; |
| 942 | event SetScriptRunning OnSetScriptRunning; | 941 | event SetScriptRunning OnSetScriptRunning; |
| 943 | event Action<Vector3, bool> OnAutoPilotGo; | 942 | event Action<Vector3, bool, bool> OnAutoPilotGo; |
| 944 | 943 | ||
| 945 | event TerrainUnacked OnUnackedTerrain; | 944 | event TerrainUnacked OnUnackedTerrain; |
| 946 | event ActivateGesture OnActivateGesture; | 945 | event ActivateGesture OnActivateGesture; |