diff options
author | UbitUmarov | 2015-09-03 18:39:08 +0100 |
---|---|---|
committer | UbitUmarov | 2015-09-03 18:39:08 +0100 |
commit | cdaed113872f0615a0d2864cc54064a4432054c6 (patch) | |
tree | 246e62dfeffac632cdcd9738a77faebd30b3bd6c /OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |
parent | seems to compile ( tests comented out) (diff) | |
download | opensim-SC_OLD-cdaed113872f0615a0d2864cc54064a4432054c6.zip opensim-SC_OLD-cdaed113872f0615a0d2864cc54064a4432054c6.tar.gz opensim-SC_OLD-cdaed113872f0615a0d2864cc54064a4432054c6.tar.bz2 opensim-SC_OLD-cdaed113872f0615a0d2864cc54064a4432054c6.tar.xz |
at last we can login and see objects ( friends is dead and disable in
scenepresence)
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index f76db1e..6df55a6 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||
@@ -3864,6 +3864,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
3864 | /// </summary> | 3864 | /// </summary> |
3865 | public void SendEntityUpdate(ISceneEntity entity, PrimUpdateFlags updateFlags) | 3865 | public void SendEntityUpdate(ISceneEntity entity, PrimUpdateFlags updateFlags) |
3866 | { | 3866 | { |
3867 | /* | ||
3867 | if (entity.UUID == m_agentId && !updateFlags.HasFlag(PrimUpdateFlags.FullUpdate)) | 3868 | if (entity.UUID == m_agentId && !updateFlags.HasFlag(PrimUpdateFlags.FullUpdate)) |
3868 | { | 3869 | { |
3869 | ImprovedTerseObjectUpdatePacket packet | 3870 | ImprovedTerseObjectUpdatePacket packet |
@@ -3874,27 +3875,24 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
3874 | packet.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[1]; | 3875 | packet.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[1]; |
3875 | packet.ObjectData[0] = CreateImprovedTerseBlock(entity, false); | 3876 | packet.ObjectData[0] = CreateImprovedTerseBlock(entity, false); |
3876 | OutPacket(packet, ThrottleOutPacketType.Unknown, true); | 3877 | OutPacket(packet, ThrottleOutPacketType.Unknown, true); |
3878 | return; | ||
3877 | } | 3879 | } |
3878 | 3880 | */ | |
3879 | else if (entity is SceneObjectPart) | 3881 | if (entity is SceneObjectPart) |
3880 | { | 3882 | { |
3881 | SceneObjectPart e = (SceneObjectPart)entity; | 3883 | SceneObjectPart e = (SceneObjectPart)entity; |
3882 | SceneObjectGroup g = e.ParentGroup; | 3884 | SceneObjectGroup g = e.ParentGroup; |
3883 | if (g.HasPrivateAttachmentPoint && g.OwnerID != AgentId) | 3885 | if (g.HasPrivateAttachmentPoint && g.OwnerID != AgentId) |
3884 | return; // Don't send updates for other people's HUDs | 3886 | return; // Don't send updates for other people's HUDs |
3885 | } | 3887 | } |
3886 | 3888 | ||
3887 | else | 3889 | //double priority = m_prioritizer.GetUpdatePriority(this, entity); |
3888 | { | 3890 | uint priority = m_prioritizer.GetUpdatePriority(this, entity); |
3889 | //double priority = m_prioritizer.GetUpdatePriority(this, entity); | ||
3890 | uint priority = m_prioritizer.GetUpdatePriority(this, entity); | ||
3891 | 3891 | ||
3892 | lock (m_entityUpdates.SyncRoot) | 3892 | lock (m_entityUpdates.SyncRoot) |
3893 | m_entityUpdates.Enqueue(priority, new EntityUpdate(entity, updateFlags, m_scene.TimeDilation)); | 3893 | m_entityUpdates.Enqueue(priority, new EntityUpdate(entity, updateFlags, m_scene.TimeDilation)); |
3894 | } | ||
3895 | } | 3894 | } |
3896 | 3895 | ||
3897 | |||
3898 | /// <summary> | 3896 | /// <summary> |
3899 | /// Requeue an EntityUpdate when it was not acknowledged by the client. | 3897 | /// Requeue an EntityUpdate when it was not acknowledged by the client. |
3900 | /// We will update the priority and put it in the correct queue, merging update flags | 3898 | /// We will update the priority and put it in the correct queue, merging update flags |