diff options
| author | Melanie | 2010-12-23 12:08:38 +0000 |
|---|---|---|
| committer | Melanie | 2010-12-23 12:08:38 +0000 |
| commit | 2cc07de0bac6c5eae48a3a61056ecedaa06c2bca (patch) | |
| tree | c8b32755bee00ff1b0dbf795bddd97ef5afc6aab /OpenSim/Framework | |
| parent | Revert "reactivating some traces to track a dead thread" (diff) | |
| parent | Put back a commented section of code. With some viewers, object inventory (diff) | |
| download | opensim-SC-2cc07de0bac6c5eae48a3a61056ecedaa06c2bca.zip opensim-SC-2cc07de0bac6c5eae48a3a61056ecedaa06c2bca.tar.gz opensim-SC-2cc07de0bac6c5eae48a3a61056ecedaa06c2bca.tar.bz2 opensim-SC-2cc07de0bac6c5eae48a3a61056ecedaa06c2bca.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Framework')
| -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 34ec420..da893b6 100644 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs | |||
| @@ -577,11 +577,13 @@ namespace OpenSim.Framework | |||
| 577 | { | 577 | { |
| 578 | public ISceneEntity Entity; | 578 | public ISceneEntity Entity; |
| 579 | public PrimUpdateFlags Flags; | 579 | public PrimUpdateFlags Flags; |
| 580 | public float TimeDilation; | ||
| 580 | 581 | ||
| 581 | public EntityUpdate(ISceneEntity entity, PrimUpdateFlags flags) | 582 | public EntityUpdate(ISceneEntity entity, PrimUpdateFlags flags, float timedilation) |
| 582 | { | 583 | { |
| 583 | Entity = entity; | 584 | Entity = entity; |
| 584 | Flags = flags; | 585 | Flags = flags; |
| 586 | TimeDilation = timedilation; | ||
| 585 | } | 587 | } |
| 586 | } | 588 | } |
| 587 | 589 | ||