diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h
index c2fdc0d8f3..aeb7795c4e 100644
--- a/indra/newview/llvoavatar.h
+++ b/indra/newview/llvoavatar.h
@@ -515,8 +515,8 @@ private:
 	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 14d8738914..e8d87fb503 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);