Merge branch 'master' into careminster-presence-refactor

This commit is contained in:
Melanie
2010-12-23 12:08:38 +00:00
4 changed files with 36 additions and 11 deletions

View File

@@ -577,11 +577,13 @@ namespace OpenSim.Framework
{
public ISceneEntity Entity;
public PrimUpdateFlags Flags;
public float TimeDilation;
public EntityUpdate(ISceneEntity entity, PrimUpdateFlags flags)
public EntityUpdate(ISceneEntity entity, PrimUpdateFlags flags, float timedilation)
{
Entity = entity;
Flags = flags;
TimeDilation = timedilation;
}
}