diff options
| author | Justin Clark-Casey (justincc) | 2013-02-07 23:09:47 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2013-02-07 23:09:47 +0000 |
| commit | 9e17dc3daa04644c1a565d819a614c02022bdeed (patch) | |
| tree | 014eb8cec88c68b2dedde009a508dde3b5b52aca /OpenSim/Framework/IClientAPI.cs | |
| parent | Fix a recent regression in e17392a where JsonSetValue() stopped working (prob... (diff) | |
| parent | Plumb the path from the client to the extra physics params and back (diff) | |
| download | opensim-SC_OLD-9e17dc3daa04644c1a565d819a614c02022bdeed.zip opensim-SC_OLD-9e17dc3daa04644c1a565d819a614c02022bdeed.tar.gz opensim-SC_OLD-9e17dc3daa04644c1a565d819a614c02022bdeed.tar.bz2 opensim-SC_OLD-9e17dc3daa04644c1a565d819a614c02022bdeed.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Framework/IClientAPI.cs')
| -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 87433cc..f6b7689 100644 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs | |||
| @@ -124,7 +124,7 @@ namespace OpenSim.Framework | |||
| 124 | public delegate void ObjectDrop(uint localID, IClientAPI remoteClient); | 124 | public delegate void ObjectDrop(uint localID, IClientAPI remoteClient); |
| 125 | 125 | ||
| 126 | public delegate void UpdatePrimFlags( | 126 | public delegate void UpdatePrimFlags( |
| 127 | uint localID, bool UsePhysics, bool IsTemporary, bool IsPhantom, IClientAPI remoteClient); | 127 | uint localID, bool UsePhysics, bool IsTemporary, bool IsPhantom, ExtraPhysicsData PhysData, IClientAPI remoteClient); |
| 128 | 128 | ||
| 129 | public delegate void UpdatePrimTexture(uint localID, byte[] texture, IClientAPI remoteClient); | 129 | public delegate void UpdatePrimTexture(uint localID, byte[] texture, IClientAPI remoteClient); |
| 130 | 130 | ||
| @@ -1356,6 +1356,8 @@ namespace OpenSim.Framework | |||
| 1356 | 1356 | ||
| 1357 | void SendObjectPropertiesReply(ISceneEntity Entity); | 1357 | void SendObjectPropertiesReply(ISceneEntity Entity); |
| 1358 | 1358 | ||
| 1359 | void SendPartPhysicsProprieties(ISceneEntity Entity); | ||
| 1360 | |||
| 1359 | void SendAgentOffline(UUID[] agentIDs); | 1361 | void SendAgentOffline(UUID[] agentIDs); |
| 1360 | 1362 | ||
| 1361 | void SendAgentOnline(UUID[] agentIDs); | 1363 | void SendAgentOnline(UUID[] agentIDs); |