From 53d7c080e0c39be7ed9498eb6a34adbafc2d2d03 Mon Sep 17 00:00:00 2001 From: Kitty Barnett <develop@catznip.com> Date: Sat, 28 Aug 2021 16:58:24 +0200 Subject: [PATCH] [FIXED] @setcam=n doesn't set the issuing object as the primary value provider for @setcam_avdist distance --- indra/newview/llvoavatar.h | 4 ++-- indra/newview/rlvhandler.cpp | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h index c2fdc0d8f3e..aeb7795c4e8 100644 --- a/indra/newview/llvoavatar.h +++ b/indra/newview/llvoavatar.h @@ -515,8 +515,8 @@ class LLVOAvatar : mutable bool mCachedInMuteList; mutable F64 mCachedMuteListUpdateTime; // [RLVa:KB] - Checked: RLVa-2.2 (@setcam_avdist) - mutable bool mCachedIsRlvSilhouette = false; - mutable F64 mCachedRlvSilhouetteUpdateTime = 0.f; + mutable bool mCachedIsRlvSilhouette = false; + mutable F64 mCachedRlvSilhouetteUpdateTime = 0.f; // [/RLVa:KB] VisualMuteSettings mVisuallyMuteSetting; // Always or never visually mute this AV diff --git a/indra/newview/rlvhandler.cpp b/indra/newview/rlvhandler.cpp index 14d87389148..e8d87fb503f 100644 --- a/indra/newview/rlvhandler.cpp +++ b/indra/newview/rlvhandler.cpp @@ -2435,6 +2435,7 @@ void RlvBehaviourToggleHandler<RLV_BHVR_SETCAM>::onCommandToggle(ERlvBehaviour e RlvBehaviourToggleHandler<RLV_BHVR_SETCAM_UNLOCK>::onCommandToggle(RLV_BHVR_SETCAM_UNLOCK, !fHasCamUnlock); gRlvHandler.setCameraOverride(fHasBhvr); + RlvBehaviourDictionary::instance().getModifier(RLV_MODIFIER_SETCAM_AVDIST)->setPrimaryObject(idRlvObject); RlvBehaviourDictionary::instance().getModifier(RLV_MODIFIER_SETCAM_AVDISTMIN)->setPrimaryObject(idRlvObject); RlvBehaviourDictionary::instance().getModifier(RLV_MODIFIER_SETCAM_AVDISTMAX)->setPrimaryObject(idRlvObject); RlvBehaviourDictionary::instance().getModifier(RLV_MODIFIER_SETCAM_ORIGINDISTMIN)->setPrimaryObject(idRlvObject); -- GitLab