diff options
| author | Diva Canto | 2010-07-14 14:48:14 -0700 |
|---|---|---|
| committer | Diva Canto | 2010-07-14 14:48:14 -0700 |
| commit | 0d8c0811d381951939efd4e2887b872e81a6a34a (patch) | |
| tree | 1424db67347d3e441817cf8860327a8d884b061a /OpenSim/Framework | |
| parent | Removed a few obsolete mono addin references. Mantis #4854 (diff) | |
| parent | Major attachments cleanup. Remove unused AttachObject ClientView method (diff) | |
| download | opensim-SC-0d8c0811d381951939efd4e2887b872e81a6a34a.zip opensim-SC-0d8c0811d381951939efd4e2887b872e81a6a34a.tar.gz opensim-SC-0d8c0811d381951939efd4e2887b872e81a6a34a.tar.bz2 opensim-SC-0d8c0811d381951939efd4e2887b872e81a6a34a.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Framework')
| -rw-r--r-- | OpenSim/Framework/IClientAPI.cs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs index 556a532..db74548 100644 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs | |||
| @@ -57,7 +57,7 @@ namespace OpenSim.Framework | |||
| 57 | RezMultipleAttachmentsFromInvPacket.ObjectDataBlock[] objects); | 57 | RezMultipleAttachmentsFromInvPacket.ObjectDataBlock[] objects); |
| 58 | 58 | ||
| 59 | public delegate void ObjectAttach( | 59 | public delegate void ObjectAttach( |
| 60 | IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, Quaternion rot, bool silent); | 60 | IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, bool silent); |
| 61 | 61 | ||
| 62 | public delegate void ModifyTerrain(UUID user, | 62 | public delegate void ModifyTerrain(UUID user, |
| 63 | float height, float seconds, byte size, byte action, float north, float west, float south, float east, | 63 | float height, float seconds, byte size, byte action, float north, float west, float south, float east, |
| @@ -1017,7 +1017,6 @@ namespace OpenSim.Framework | |||
| 1017 | 1017 | ||
| 1018 | void SendCoarseLocationUpdate(List<UUID> users, List<Vector3> CoarseLocations); | 1018 | void SendCoarseLocationUpdate(List<UUID> users, List<Vector3> CoarseLocations); |
| 1019 | 1019 | ||
| 1020 | void AttachObject(uint localID, Quaternion rotation, byte attachPoint, UUID ownerID); | ||
| 1021 | void SetChildAgentThrottle(byte[] throttle); | 1020 | void SetChildAgentThrottle(byte[] throttle); |
| 1022 | 1021 | ||
| 1023 | void SendAvatarDataImmediate(ISceneEntity avatar); | 1022 | void SendAvatarDataImmediate(ISceneEntity avatar); |