diff options
| author | Melanie | 2012-03-11 01:47:36 +0100 |
|---|---|---|
| committer | Melanie | 2012-03-11 01:47:36 +0100 |
| commit | 0a4056ad2267656e6b2c07c7989690ecabc07b5f (patch) | |
| tree | 04f25af9832347f1a88890f9d8067f6f0e2155c9 /OpenSim/Framework | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Changed undo redo internals. moved exec code to UndoState.cs from sop that n... (diff) | |
| download | opensim-SC_OLD-0a4056ad2267656e6b2c07c7989690ecabc07b5f.zip opensim-SC_OLD-0a4056ad2267656e6b2c07c7989690ecabc07b5f.tar.gz opensim-SC_OLD-0a4056ad2267656e6b2c07c7989690ecabc07b5f.tar.bz2 opensim-SC_OLD-0a4056ad2267656e6b2c07c7989690ecabc07b5f.tar.xz | |
Merge branch 'ubitwork'
Diffstat (limited to 'OpenSim/Framework')
| -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 5e156f1..1bd4749 100644 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs | |||
| @@ -130,6 +130,8 @@ namespace OpenSim.Framework | |||
| 130 | 130 | ||
| 131 | public delegate void UpdateVector(uint localID, Vector3 pos, IClientAPI remoteClient); | 131 | public delegate void UpdateVector(uint localID, Vector3 pos, IClientAPI remoteClient); |
| 132 | 132 | ||
| 133 | public delegate void ClientChangeObject(uint localID, object data ,IClientAPI remoteClient); | ||
| 134 | |||
| 133 | public delegate void UpdatePrimRotation(uint localID, Quaternion rot, IClientAPI remoteClient); | 135 | public delegate void UpdatePrimRotation(uint localID, Quaternion rot, IClientAPI remoteClient); |
| 134 | 136 | ||
| 135 | public delegate void UpdatePrimSingleRotation(uint localID, Quaternion rot, IClientAPI remoteClient); | 137 | public delegate void UpdatePrimSingleRotation(uint localID, Quaternion rot, IClientAPI remoteClient); |
| @@ -838,6 +840,7 @@ namespace OpenSim.Framework | |||
| 838 | event RequestObjectPropertiesFamily OnRequestObjectPropertiesFamily; | 840 | event RequestObjectPropertiesFamily OnRequestObjectPropertiesFamily; |
| 839 | event UpdatePrimFlags OnUpdatePrimFlags; | 841 | event UpdatePrimFlags OnUpdatePrimFlags; |
| 840 | event UpdatePrimTexture OnUpdatePrimTexture; | 842 | event UpdatePrimTexture OnUpdatePrimTexture; |
| 843 | event ClientChangeObject onClientChangeObject; | ||
| 841 | event UpdateVector OnUpdatePrimGroupPosition; | 844 | event UpdateVector OnUpdatePrimGroupPosition; |
| 842 | event UpdateVector OnUpdatePrimSinglePosition; | 845 | event UpdateVector OnUpdatePrimSinglePosition; |
| 843 | event UpdatePrimRotation OnUpdatePrimGroupRotation; | 846 | event UpdatePrimRotation OnUpdatePrimGroupRotation; |