From fd8836e49393415524abedc00de3c8cacf9f529a Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Tue, 13 Jun 2017 14:09:34 +0100
Subject: dont let time go back
---
.../Region/ClientStack/Linden/UDP/LLClientView.cs | 38 ++++++++++++++++++----
1 file changed, 31 insertions(+), 7 deletions(-)
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index f13b259..1118bb6 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -8030,19 +8030,43 @@ namespace OpenSim.Region.ClientStack.LindenUDP
return true;
}
+ Dictionary<uint, uint> objImageSeqs = null;
+ double lastobjImageSeqsMS = 0.0;
+
private bool HandleObjectImage(IClientAPI sender, Packet Pack)
{
ObjectImagePacket imagePack = (ObjectImagePacket)Pack;
- UpdatePrimTexture handlerUpdatePrimTexture = null;
+ UpdatePrimTexture handlerUpdatePrimTexture = OnUpdatePrimTexture;
+ if (handlerUpdatePrimTexture == null)
+ return true;
+
+ double now = Util.GetTimeStampMS();
+ if(objImageSeqs == null)
+ objImageSeqs = new Dictionary<uint, uint>(16);
+ else
+ {
+ if ( now - lastobjImageSeqsMS > 30000.0)
+ objImageSeqs.Clear();
+ }
+
+ lastobjImageSeqsMS = now;
+ uint seq = Pack.Header.Sequence;
+ uint id;
+ uint lastseq;
+
+ ObjectImagePacket.ObjectDataBlock o;
for (int i = 0; i < imagePack.ObjectData.Length; i++)
{
- handlerUpdatePrimTexture = OnUpdatePrimTexture;
- if (handlerUpdatePrimTexture != null)
- {
- handlerUpdatePrimTexture(imagePack.ObjectData[i].ObjectLocalID,
- imagePack.ObjectData[i].TextureEntry, this);
- }
+ o = imagePack.ObjectData[i];
+ id = o.ObjectLocalID;
+ if(objImageSeqs.TryGetValue(id, out lastseq))
+ {
+ if(seq <= lastseq)
+ continue;
+ }
+ objImageSeqs[id] = seq;
+ handlerUpdatePrimTexture(id, o.TextureEntry, this);
}
return true;
}
--
cgit v1.1