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

@@ -1054,16 +1054,6 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
}
public void SendAvatarData(SendAvatarData data)
{
}
public void SendAvatarTerseUpdate(SendAvatarTerseData data)
{
}
public void SendCoarseLocationUpdate(List<UUID> users, List<Vector3> CoarseLocations)
{
@@ -1074,22 +1064,22 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
}
public void SetChildAgentThrottle(byte[] throttle)
public void SendAvatarDataImmediate(ISceneEntity avatar)
{
}
public void SendPrimitiveToClient(SendPrimitiveData data)
public void SendPrimUpdate(ISceneEntity entity, PrimUpdateFlags updateFlags)
{
}
public void SendPrimTerseUpdate(SendPrimitiveTerseData data)
public void ReprioritizeUpdates(UpdatePriorityHandler handler)
{
}
public void ReprioritizeUpdates(StateUpdateTypes type, UpdatePriorityHandler handler)
public void FlushPrimUpdates()
{
}
@@ -1099,11 +1089,6 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
}
public void FlushPrimUpdates()
{
}
public void SendInventoryItemDetails(UUID ownerID, InventoryItemBase item)
{
@@ -1429,6 +1414,11 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
}
public virtual void SetChildAgentThrottle(byte[] throttle)
{
}
public byte[] GetThrottlesPacked(float multiplier)
{
return new byte[0];