aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorDiva Canto2010-12-23 10:05:45 -0800
committerDiva Canto2010-12-23 10:05:45 -0800
commitbc67bc0d949e5b71dbd924b8119b0232b149cfb6 (patch)
tree3ca3ac8bda0d4b64ba3cacdefca920f5c2105ea8 /OpenSim/Framework
parentRemoved unused code -- this was the previous version of UDP texture sending, ... (diff)
parentPut back a commented section of code. With some viewers, object inventory (diff)
downloadopensim-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.cs4
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