From aa862fa658e30227264bac79b53b03595eb8c680 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Sat, 16 Apr 2022 18:13:24 +0100 Subject: [PATCH] current FS sends a flood of AGENT_CONTROL_FINISH_ANIM --- .../ClientStack/Linden/UDP/LLClientView.cs | 2 +- .../Region/Framework/Scenes/ScenePresence.cs | 10 ++++------ bin/OpenMetaverseTypes.dll | Bin 163840 -> 163840 bytes 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index d0dd71f224..beafbe0697 100755 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs @@ -8224,7 +8224,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP { if( (x.ControlFlags != m_thisAgentUpdateArgs.ControlFlags) // significant if control flags changed - || x.ControlFlags != (byte)AgentManager.ControlFlags.NONE// actually all movement controls need to pass + || (x.ControlFlags & ~(uint)AgentManager.ControlFlags.AGENT_CONTROL_FINISH_ANIM) != (uint)AgentManager.ControlFlags.NONE || (x.Flags != m_thisAgentUpdateArgs.Flags) // significant if Flags changed || (x.State != m_thisAgentUpdateArgs.State) // significant if Stats changed || (Math.Abs(x.Far - m_thisAgentUpdateArgs.Far) >= 32) // significant if far distance changed diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index c2ef3ebff5..2c76a18611 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs @@ -2528,7 +2528,7 @@ namespace OpenSim.Region.Framework.Scenes private void UpdateCameraCollisionPlane(Vector4 plane) { - if (m_lastCameraCollisionPlane != plane) + if (m_lastCameraCollisionPlane.NotEqual(plane)) { m_lastCameraCollisionPlane = plane; ControllingClient.SendCameraConstraint(plane); @@ -2552,9 +2552,8 @@ namespace OpenSim.Region.Framework.Scenes collisionPoint.X = (float) Math.Round(collisionPoint.X, 1); collisionPoint.Y = (float) Math.Round(collisionPoint.Y, 1); collisionPoint.Z = (float) Math.Round(collisionPoint.Z, 1); - - Vector4 plane = new Vector4(pNormal.X, pNormal.Y, pNormal.Z, - Vector3.Dot(collisionPoint, pNormal)); + + Vector4 plane = new Vector4(pNormal.X, pNormal.Y, pNormal.Z, collisionPoint.Dot(pNormal)); UpdateCameraCollisionPlane(plane); } } @@ -2569,8 +2568,7 @@ namespace OpenSim.Region.Framework.Scenes collisionPoint.Y = (float) Math.Round(collisionPoint.Y, 1); collisionPoint.Z = (float) Math.Round(collisionPoint.Z, 1); - Vector4 plane = new Vector4(pNormal.X, pNormal.Y, pNormal.Z, - Vector3.Dot(collisionPoint, pNormal)); + Vector4 plane = new Vector4(pNormal.X, pNormal.Y, pNormal.Z, collisionPoint.Dot(pNormal)); UpdateCameraCollisionPlane(plane); } } diff --git a/bin/OpenMetaverseTypes.dll b/bin/OpenMetaverseTypes.dll index 69b4eb2081ef18db85432cb3cace126bab0d01f2..1f77692a014974dc6cc9994cf384189081024c08 100755 GIT binary patch delta 4808 zcmZ{o3s_Xg6~|}p&Hw_sh$stl*{8w=(HNsf(5NViKm~?~&idz~q)Daqugn{8qeMa(2!3iMbXKaj3~I38Mbf5Ots8L7 zfCzJ`#C>Qc{E-kvTPiUszK0NQ_#QvjIyvkXTHozFRHpPK;O(B(6Yx14 z6c2#{Ly;ca<2~7r;~tFDl!=q^Z9HCyn}YA+c*UHEjkrvioQPk&Gu4I22Cpd3Gv}r#MeJm5dW`is#?S zI27X=B{T)+N4sH_8YOmyv~o0DZ%vYfh@G2bQzgx0->&RR!RCH@zzFBHS1WBPI4Wqh zhH#kGp6e<25sWJpmWFd+s7%8}ft5VQI5?2ob2$x9=kDlPI39+4ZD^W>oAEQs#B@A1 zSY2F`z;nN>tWU@5!c_}GY?Oqo@ZN(F8mN=(^-4$vE`b=;88}Pdq@_>~uCq5O7c%gd zxJfxS8>jT!#C=Aoa+MO4iKoGij7&TfhAMUN?9Rjm*rh|WcwxbhB&|(>>^fC**Yi1; zQdJYz-1S_+l%|@v=C0=orYBSr*WC47V<5W1el-9#R-0@87Y@? z@jNhXb6}H_?ZD%;c@7Lc4mF0wiKBsLIZ;WBvxK0>NRfUlN|E4v7@^MzLJy&A>8ef#z8HT_Ih=3^N(S5sKc_;VLE!6!EMw7PL2W+5DBgYy(wsNEjiNn+OL6i9ms_45 zxrFRXg>Bf4whz7?QbM`}(Ev^;P4hWI{ZI*M5@fJ_9a%!Y@DXLDWYiPd%JH&QDkJ$m zS`t}C8U)3FZy7nIQV(9`V*S}N(j%NYdqw0^WZ*0<%+GqOw46kzXq0KW7P6d76uxgQ zp}{LiwV(swTR~b>YD9JZVXT6533AJ3Rz*lUkJ5 zOWqV@iwk4Vk{<+JH-x#^RuVT`OOZVyjBO)MA0@Hvq*_pyzL32@b_sHX7P1EN1t&h3r_ftoM2yD81p|sdR20xOPpLHOk+UM$i3`<2-6r44s_7_Mgw+5hOt+@cM-5TqL97r zeTsnT;QN#J4g<2_4i9@BiEP%K>3+vGVxd!rAs<75XXRBxDXdWN1L<8wK=4JoF>>;%d1QMc|SDe=*@koU+Q zAGHrWP0qM{_-kZ4xv3Gf;oo&<2yv)E5e?upL=bPoGbB!s!FG(DA-O6+JFzzQSF%R< zc>lal_6y?u^FHYk#QWz%66$nmDR={YNTxVB@doN(on)0Dx7@|fl0W+B5<5@Od~M~) zp&jfqQY7eB;4StAsSR=a1aGthrbWkt*lBDKgmzq##zr`+--w5Y% zS(3jZhXvWJQ6(WFjXQ;u zUiG;VZ?0k9=S94^hSA_BwS>I6VrY&a-dizrhf2J+%H@aX$Aa80d96I02AA-S{OjbF zN76NdZUyd?AE8?X-SgimKS~2iwUwiT%H^>%$wzzT$Fze&6rFvi98YV7@3?$Wop7)TKWv&!8b?+D1p{Q8}3|6O;uh zX3};+pA0LP(+%EjK-1Z`L@FQMZr zw1mYGd*u>ZrIOZZOXt#smE0+iE>(#)o*!CDD^%Ku0?{}3kwvBdURmwicMtx7dG~c( z6zM7Kz)8g49Krv$9it?-W1F&~9dA;`eT3gq_MO2qmD&$*uxC;yZr8hJM2$p)PzESN z%Rz1E>8SVcH1ux&E2{37_*_TQ&{=DdsvA{(PgNV`_KlkQ&4HEsRc$t=N^MbXpr1x{ zgMJf*O{r3Elm#@@m0~vVQd54Z0rWzWyI!G=~bfz^c`a&Xs59N z^op?#w9nWKI>6KhI@Ht+I@W|OsZyrN0{WCG5p;{G0Cc~p4)mC*8T3 zbFGP><<*7 z9_E_Y9UcbrrvteC*g(EUv;WN+3G=(Eo>tWzZU&1xJO=cCc}HaX-0tu(FyB6yr|%oV z^+Agq&F$Vp#KU}D%oNa9)uX?r=iVlG08iW%dZ_W1YU)9E20 zsjG%JRJ<}{YwqZP`i_-_o{M9o5}CkT4E7{uO67if6bAdeKO;+(<2h2KWG?kw$dP*e XJOlEjpY+m{c+bEU(rtbHDF6Qe)X_CZ delta 4573 zcmZvg3sh9c8OLYt&cF)jA|NcxWq0qc;+Ckj#3z#IDn?!^LRMTvl!v%JgG5s!>Vn$U zygU+8F0tl;F$vbDTJdB}PHMmyT^mD<(lkxfNaG7@G@6(gO-#SJcb1&flymsc{O0?< zdEM{ZyHHmbQCAnSb+ci$r>NnnWJ&Ti{BdT#y$d8X9l=kXgic5eN^GNo=So?5ZR_#6 zeu?M7%73!pS3(pu*I;D6g%EDMfk(IHM=zen78_8Qa~4P>33uj(AS&GG%x(O*bcZz` zhUTxW$B4wBK9W<%^%{l)wyAUTh%E!03`7f$jKNNh;RX$(C6naLXfsr9iL@M zI0Q?zt2M3FbPedEt&MwECF9n{POfcNSJ~WnX=C5ceK@17y>sv41+}9kL}sn!DoM3t zpfPAVYc21?&{%DV>#Vh0Q?I}vcQzPHmllEqJMVbOPRvJ!+*3k2mrl9-;1b;Ut`|9&zDG zefZTz#lT$zVkY9T6ql-bQ*b)Y4Q!f%V=%5$w`JjZDVxE|c^sjL)Q6+>=U!rq*qzUX!4WAjF1C z$POtLg;0NkTx=er~f!kFHW1^YNrG zK3&~IDxQI3)$92<3a0oW9}mPU1Ii3sh67E7cm>A$0+DW9i(~%+-ukoPJ?CJ!CH3S? zJX(z^!Uu7y`au!gXR8`E3qKN}rP_mV*ml)73%?7)<2^W?@L~1&neg;{9y}99hZSS1 zddq{y==~yS{KeWd9mO~W=yEZ($7{2p*x?lA!>PmI)F$NIr`l#?SEOcJHRV~( zqeP?8q{1{3WlL}bjL<&`Lcc<8soP)x+u(3cMVxRn%8leyEL|{2;8|`)Xdx<*E@`yB zFQ;;#Sg_rORYs!uf;xH$qp{AnV3||qcTh@zF2YmB`Rc=u^sgd2av%)*kppM}IU~p~ zPfqd@bFOaNI^cTrB9bGB8ab^JgaHcaqxguscC{JUX$>4l_mJefQ``A-t zxIo8{IQBGIB&f$6$F`82g4{#n*j93~monM2oKT1o$z+;#+wkNgh>r9>O5kHw*zP3-$$XvA)&XY>$H*E%)W~UzAYO*Y$WB3K$6M?eIiV4+rVjQ2 zxhZVCevT7X?9-M&ynv3Aykebr0dQYwR@1E5SZ3FfB63&XSEK`ZQ^gx7j&zNRYvK zjs2T^Dd?aq$>&Mx9Np6~B*-q2Nn0gf zu^GtqAd{##JtT0D5h_j(ben}yxNd$xNar9k(speHAIIA)g5DDgrox$`Xn2|K+L$s{ z?nk3F((~CwcWA^@_OH<<+R;lB=G`^hA!aZ}7%oN_ef-XlV(&ak&xKUhGLZTN@fsOO z-_eNIh*wUb-wE=|D`Y1fv4F?%8u7{Z(H(-W`69N+!{~m2x5Br`!|8CZ?wS_qmDA{w zUTT&{(ANYRoLl5k^qioB@(y_n%~+_%Ifi)Uar8MsJ!Y@`0KFo}J=80Yr-K&hp6;Q( zX4ysa1a_JB$dhQbAWzI5Ig=h2Q~*m%rYVc{z>fxbpFOf~HtoAy4}|YJa!Kf-pk%yq zY3QPWn&o++2Ll!3mCI?Ch^tI&mMiH-jr1C+qRZfq!_XU`imuj(*FhMnqU$xY$%pbRYlb)f3x_wXdt-uDYlUy*ppmmmR&;|>( zWGSKbTdeD8= z7SK*>2j~@RH|S4RY|oLBY(52=kv13T6k8c+iLD;A#?}J*l&u5wRa-Y`yA3;Xq<`5I z(3>_FXg{S4bdXXHI#Fo>EmS%*?FL<{;DI^PlZpb`s<=Q8DrKOjlzL5DKzo#qVbI)D zx!g8wYxyQ_A<~qdp+p0_7>1L0^R5EF3I<;jL??*?tq@u^sB+Vzt(gQ z^xGkZWP}bUavvqe2z}k^Pv{H%-x~S&Tm89@KK_|K7W!Xn`o5KM9ChyxC klz8dTx8it4e7oQU=X#fBK