diff --git a/indra/newview/fsfloaterposestand.cpp b/indra/newview/fsfloaterposestand.cpp index ff90e3c0f5..d6e85f1ebd 100644 --- a/indra/newview/fsfloaterposestand.cpp +++ b/indra/newview/fsfloaterposestand.cpp @@ -19,6 +19,7 @@ #include "llsdserialize.h" #include "lltrans.h" #include "llviewercontrol.h" +#include "rlvhandler.h" FSFloaterPoseStand::FSFloaterPoseStand(const LLSD& key) : LLFloater(key), @@ -53,7 +54,9 @@ void FSFloaterPoseStand::onOpen(const LLSD& key) mAOPaused = true; } - if (gSavedSettings.getBOOL("FSPoseStandLock") && !gAgentAvatarp->isSitting()) + if (gSavedSettings.getBOOL("FSPoseStandLock") + && !gAgentAvatarp->isSitting() + && !gRlvHandler.hasBehaviour(RLV_BHVR_SIT)) { setLock(true); }