diff options
| author | UbitUmarov | 2016-09-03 07:51:53 +0100 |
|---|---|---|
| committer | UbitUmarov | 2016-09-03 07:51:53 +0100 |
| commit | 9aec227767cf726216514d0494f11b5d8bf5b807 (patch) | |
| tree | 8f308f4c1eefa19954fc30a560ac780f8a8e916a /OpenSim/Framework/IClientAPI.cs | |
| parent | merge issue (diff) | |
| parent | tests making sure evering thing is coerently wrong.. (diff) | |
| download | opensim-SC-9aec227767cf726216514d0494f11b5d8bf5b807.zip opensim-SC-9aec227767cf726216514d0494f11b5d8bf5b807.tar.gz opensim-SC-9aec227767cf726216514d0494f11b5d8bf5b807.tar.bz2 opensim-SC-9aec227767cf726216514d0494f11b5d8bf5b807.tar.xz | |
Merge branch 'master' into httptests
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Framework/IClientAPI.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs index c046010..cafbd1f 100644 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs | |||
| @@ -117,7 +117,7 @@ namespace OpenSim.Framework | |||
| 117 | 117 | ||
| 118 | public delegate void ObjectExtraParams(UUID agentID, uint localID, ushort type, bool inUse, byte[] data); | 118 | public delegate void ObjectExtraParams(UUID agentID, uint localID, ushort type, bool inUse, byte[] data); |
| 119 | 119 | ||
| 120 | public delegate void ObjectSelect(uint localID, IClientAPI remoteClient); | 120 | public delegate void ObjectSelect(List<uint> localID, IClientAPI remoteClient); |
| 121 | 121 | ||
| 122 | public delegate void ObjectRequest(uint localID, IClientAPI remoteClient); | 122 | public delegate void ObjectRequest(uint localID, IClientAPI remoteClient); |
| 123 | 123 | ||
| @@ -1382,6 +1382,8 @@ namespace OpenSim.Framework | |||
| 1382 | 1382 | ||
| 1383 | void SendObjectPropertiesReply(ISceneEntity Entity); | 1383 | void SendObjectPropertiesReply(ISceneEntity Entity); |
| 1384 | 1384 | ||
| 1385 | void SendSelectedPartsProprieties(List<ISceneEntity> parts); | ||
| 1386 | |||
| 1385 | void SendPartPhysicsProprieties(ISceneEntity Entity); | 1387 | void SendPartPhysicsProprieties(ISceneEntity Entity); |
| 1386 | 1388 | ||
| 1387 | void SendAgentOffline(UUID[] agentIDs); | 1389 | void SendAgentOffline(UUID[] agentIDs); |