From 0c18a0e8a71550d2af2d231762e6cfb7c4785ca9 Mon Sep 17 00:00:00 2001 From: Kyler Eastridge Date: Wed, 21 Aug 2024 12:55:11 -0400 Subject: [PATCH 1/2] Fix skeleton not working --- indra/newview/llhudeffectresetskeleton.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/indra/newview/llhudeffectresetskeleton.cpp b/indra/newview/llhudeffectresetskeleton.cpp index b7178349bd..08b17bd8b5 100644 --- a/indra/newview/llhudeffectresetskeleton.cpp +++ b/indra/newview/llhudeffectresetskeleton.cpp @@ -186,7 +186,13 @@ void LLHUDEffectResetSkeleton::update() } bool owned = false; - if(mTargetObject->isAnimatedObject()) + if (getOriginatedHere()) + { + // If we created the request, always reset the skeleton + // This fixes issues with resetting other skeletons locally + owned = true; + } + else if (mTargetObject->isAnimatedObject()) { owned = mTargetObject->mOwnerID == mSourceObject->getID(); } From 05b29ead6a26ee4e300054fb56640c7b1ada3f8c Mon Sep 17 00:00:00 2001 From: Kyler Eastridge Date: Wed, 21 Aug 2024 12:57:12 -0400 Subject: [PATCH 2/2] Where is ball? --- .../newview/app_settings/colorlut/dog_vision.png | Bin 0 -> 906 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 indra/newview/app_settings/colorlut/dog_vision.png diff --git a/indra/newview/app_settings/colorlut/dog_vision.png b/indra/newview/app_settings/colorlut/dog_vision.png new file mode 100644 index 0000000000000000000000000000000000000000..eed0394235c3b0673ef798c64fe2273ee34cb953 GIT binary patch literal 906 zcmeAS@N?(olHy`uVBq!ia0y~yU;#226gZfGB=elPAAuBOage(c!@6@aFM&cXo-U3d z6}R5rWz0I{Aix^1cHU*|Mk1=`ZwFpmp?CG z_2FlY-Td>R3_Y`YOv)v$dS7OT z*bS78KmK02VcU5LU)iHy6yJK>l2k)T9sDoD=*4~JcTa@A?I)P4fbP{|e9_caIbZO2 zznQfJTzUPP`|1qK)1F_fJT<|M$FLCDBjHRJYW2TKTE8w${Q+}Qo$UXuycx5MN?0G= zE@4`^6iLE9p4lL(Kw$0JdCj080_(W`F`VP)+|OgUB~|U#x9d(LvKhA<&du(bVYEcnZBL{jT)FR2-TPZ`{-H0hK12=f9ky0Ta_UVWaT_|9h5z1jvO zAC#*yysUFx9NWI@8FDaBwr2GIGIz4uOEWjPxBeH{-)AfF@4dK|eODN=VsoK}X>zQ* gv$^>Y(I@zy`L>zy4*z!&5umK*>FVdQ&MBb@02<5i5&!@I literal 0 HcmV?d00001