diff options
| author | Diva Canto | 2010-12-23 10:05:45 -0800 |
|---|---|---|
| committer | Diva Canto | 2010-12-23 10:05:45 -0800 |
| commit | bc67bc0d949e5b71dbd924b8119b0232b149cfb6 (patch) | |
| tree | 3ca3ac8bda0d4b64ba3cacdefca920f5c2105ea8 /OpenSim/Framework | |
| parent | Removed unused code -- this was the previous version of UDP texture sending, ... (diff) | |
| parent | Put back a commented section of code. With some viewers, object inventory (diff) | |
| download | opensim-SC_OLD-bc67bc0d949e5b71dbd924b8119b0232b149cfb6.zip opensim-SC_OLD-bc67bc0d949e5b71dbd924b8119b0232b149cfb6.tar.gz opensim-SC_OLD-bc67bc0d949e5b71dbd924b8119b0232b149cfb6.tar.bz2 opensim-SC_OLD-bc67bc0d949e5b71dbd924b8119b0232b149cfb6.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
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 6bca6eb..21ffa9a 100644 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs | |||
| @@ -574,11 +574,13 @@ namespace OpenSim.Framework | |||
| 574 | { | 574 | { |
| 575 | public ISceneEntity Entity; | 575 | public ISceneEntity Entity; |
| 576 | public PrimUpdateFlags Flags; | 576 | public PrimUpdateFlags Flags; |
| 577 | public float TimeDilation; | ||
| 577 | 578 | ||
| 578 | public EntityUpdate(ISceneEntity entity, PrimUpdateFlags flags) | 579 | public EntityUpdate(ISceneEntity entity, PrimUpdateFlags flags, float timedilation) |
| 579 | { | 580 | { |
| 580 | Entity = entity; | 581 | Entity = entity; |
| 581 | Flags = flags; | 582 | Flags = flags; |
| 583 | TimeDilation = timedilation; | ||
| 582 | } | 584 | } |
| 583 | } | 585 | } |
| 584 | 586 | ||