diff options
author | Melanie | 2012-05-13 01:25:03 +0100 |
---|---|---|
committer | Melanie | 2012-05-13 01:25:03 +0100 |
commit | fe029cf4e8fc0940d887329a823e66e0c29bd92e (patch) | |
tree | 7c2ae75849307cda30da96b6300ee30295610b42 /OpenSim/Framework | |
parent | Merge branch 'avination' into careminster (diff) | |
parent | ubitODE fix force in case of mlinear motor offset present (diff) | |
download | opensim-SC-fe029cf4e8fc0940d887329a823e66e0c29bd92e.zip opensim-SC-fe029cf4e8fc0940d887329a823e66e0c29bd92e.tar.gz opensim-SC-fe029cf4e8fc0940d887329a823e66e0c29bd92e.tar.bz2 opensim-SC-fe029cf4e8fc0940d887329a823e66e0c29bd92e.tar.xz |
Merge branch 'avination' into careminster
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/IClientAPI.cs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs index 2be78da..c1bd078 100644 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs | |||
@@ -70,6 +70,8 @@ namespace OpenSim.Framework | |||
70 | 70 | ||
71 | public delegate void StopAnim(IClientAPI remoteClient, UUID animID); | 71 | public delegate void StopAnim(IClientAPI remoteClient, UUID animID); |
72 | 72 | ||
73 | public delegate void ChangeAnim(UUID animID, bool addOrRemove, bool sendPack); | ||
74 | |||
73 | public delegate void LinkObjects(IClientAPI remoteClient, uint parent, List<uint> children); | 75 | public delegate void LinkObjects(IClientAPI remoteClient, uint parent, List<uint> children); |
74 | 76 | ||
75 | public delegate void DelinkObjects(List<uint> primIds, IClientAPI client); | 77 | public delegate void DelinkObjects(List<uint> primIds, IClientAPI client); |
@@ -791,6 +793,7 @@ namespace OpenSim.Framework | |||
791 | event ObjectDrop OnObjectDrop; | 793 | event ObjectDrop OnObjectDrop; |
792 | event StartAnim OnStartAnim; | 794 | event StartAnim OnStartAnim; |
793 | event StopAnim OnStopAnim; | 795 | event StopAnim OnStopAnim; |
796 | event ChangeAnim OnChangeAnim; | ||
794 | event LinkObjects OnLinkObjects; | 797 | event LinkObjects OnLinkObjects; |
795 | event DelinkObjects OnDelinkObjects; | 798 | event DelinkObjects OnDelinkObjects; |
796 | event RequestMapBlocks OnRequestMapBlocks; | 799 | event RequestMapBlocks OnRequestMapBlocks; |