Merge branch 'master' into careminster-presence-refactor

This commit is contained in:
Melanie
2010-05-21 03:51:58 +01:00
245 changed files with 6014 additions and 4908 deletions

View File

@@ -528,14 +528,6 @@ namespace OpenSim.Region.Examples.SimpleModule
{
}
public virtual void SendAvatarData(SendAvatarData data)
{
}
public virtual void SendAvatarTerseUpdate(SendAvatarTerseData data)
{
}
public virtual void SendCoarseLocationUpdate(List<UUID> users, List<Vector3> CoarseLocations)
{
}
@@ -548,15 +540,15 @@ namespace OpenSim.Region.Examples.SimpleModule
{
}
public virtual void SendPrimitiveToClient(SendPrimitiveData data)
public void SendAvatarDataImmediate(ISceneEntity avatar)
{
}
public virtual void SendPrimTerseUpdate(SendPrimitiveTerseData data)
public void SendPrimUpdate(ISceneEntity entity, PrimUpdateFlags updateFlags)
{
}
public virtual void ReprioritizeUpdates(StateUpdateTypes type, UpdatePriorityHandler handler)
public void ReprioritizeUpdates(UpdatePriorityHandler handler)
{
}