From d0052c817486a1691fc4e2e7027ac41240b966aa Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Sat, 23 Mar 2019 02:18:32 +0000 Subject: add more test code to make usage od compressed updates etc. Should be disable, but well many things can go wrong. --- OpenSim/Framework/IClientAPI.cs | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) (limited to 'OpenSim/Framework') diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs index 0c5224b..5a5e5d0 100644 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs @@ -602,16 +602,26 @@ namespace OpenSim.Framework { // we are on the new one if (m_flags.HasFlag(PrimUpdateFlags.CancelKill)) - m_flags = PrimUpdateFlags.FullUpdatewithAnim; + { + if (m_flags.HasFlag(PrimUpdateFlags.UpdateProbe)) + m_flags = PrimUpdateFlags.UpdateProbe; + else + m_flags = PrimUpdateFlags.FullUpdatewithAnim; + } } public virtual void Update(EntityUpdate oldupdate) { // we are on the new one PrimUpdateFlags updateFlags = oldupdate.Flags; + if (updateFlags.HasFlag(PrimUpdateFlags.UpdateProbe)) + updateFlags &= ~PrimUpdateFlags.UpdateProbe; if (m_flags.HasFlag(PrimUpdateFlags.CancelKill)) { - m_flags = PrimUpdateFlags.FullUpdatewithAnim; + if(m_flags.HasFlag(PrimUpdateFlags.UpdateProbe)) + m_flags = PrimUpdateFlags.UpdateProbe; + else + m_flags = PrimUpdateFlags.FullUpdatewithAnim; } else m_flags |= updateFlags; @@ -679,6 +689,7 @@ namespace OpenSim.Framework FullUpdatewithAnim = FullUpdate | Animations, + UpdateProbe = 0x10000000, // 1 << 28 SendInTransit = 0x20000000, // 1 << 29 CancelKill = 0x40000000, // 1 << 30 Kill = 0x80000000 // 1 << 31 @@ -805,7 +816,7 @@ namespace OpenSim.Framework event TeleportCancel OnTeleportCancel; event DeRezObject OnDeRezObject; event RezRestoreToWorld OnRezRestoreToWorld; - event Action OnRegionHandShakeReply; + event Action OnRegionHandShakeReply; event GenericCall1 OnRequestWearables; event Action OnCompleteMovementToRegion; -- cgit v1.1