diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index cdacbeb94..973466967 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -103,10 +103,11 @@
 
 #include "lluictrlfactory.h" //For LLUICtrlFactory::getLayeredXMLNode
 
-// [RLVa:KB] - Checked: 2010-09-27 (RLVa-1.1.3b)
+// [RLVa:KB] - Checked: 2011-11-04 (RLVa-1.4.4a)
+#include "rlvactions.h"
 #include "rlvhandler.h"
-#include "rlvinventory.h"
-#include "llattachmentsmgr.h"
+#include "rlvhelper.h"
+#include "rlvui.h"
 // [/RLVa:KB]
 
 #include "NACLantispam.h" // for NaCl Antispam Registry
@@ -826,17 +827,20 @@ void LLAgent::standUp()
 //	setControlFlags(AGENT_CONTROL_STAND_UP);
 // [RLVa:KB] - Checked: 2010-03-07 (RLVa-1.2.0c) | Added: RLVa-1.2.0a
 	// RELEASE-RLVa: [SL-2.0.0] Check this function's callers since usually they require explicit blocking
-	if ( (!rlv_handler_t::isEnabled()) || (gRlvHandler.canStand()) )
+	if ( (!rlv_handler_t::isEnabled()) || (RlvActions::canStand()) )
 	{
 		setControlFlags(AGENT_CONTROL_STAND_UP);
 	}
 // [/RLVa:KB]
 }
 
+
 void LLAgent::handleServerBakeRegionTransition(const LLUUID& region_id)
 {
 	llinfos << "called" << llendl;
 
+
+	// Old-style appearance entering a server-bake region.
 	if (isAgentAvatarValid() &&
 		!gAgentAvatarp->isUsingServerBakes() &&
 		(mRegionp->getCentralBakeVersion()>0))
@@ -979,7 +983,6 @@ const LLHost& LLAgent::getRegionHost() const
 	}
 }
 
-
 //-----------------------------------------------------------------------------
 // inPrelude()
 //-----------------------------------------------------------------------------
@@ -1156,7 +1159,7 @@ void LLAgent::sitDown()
 //	setControlFlags(AGENT_CONTROL_SIT_ON_GROUND);
 // [RLVa:KB] - Checked: 2010-08-28 (RLVa-1.2.1a) | Added: RLVa-1.2.1a
 	// RELEASE-RLVa: [SL-2.0.0] Check this function's callers since usually they require explicit blocking
-	if ( (!rlv_handler_t::isEnabled()) || ((gRlvHandler.canStand()) && (!gRlvHandler.hasBehaviour(RLV_BHVR_SIT))) )
+	if ( (!rlv_handler_t::isEnabled()) || ((RlvActions::canStand()) && (!gRlvHandler.hasBehaviour(RLV_BHVR_SIT))) )
 	{
 		setControlFlags(AGENT_CONTROL_SIT_ON_GROUND);
 	}
@@ -4338,7 +4341,7 @@ void LLAgent::teleportViaLocationLookAt(const LLVector3d& pos_global)
 // [RLVa:KB] - Checked: 2010-10-07 (RLVa-1.2.1f) | Added: RLVa-1.2.1f
 	// RELEASE-RLVa: [SL-2.2.0] Make sure this isn't used for anything except double-click teleporting
 	if ( (rlv_handler_t::isEnabled()) && (!RlvUtil::isForceTp()) && 
-		 ((gRlvHandler.hasBehaviour(RLV_BHVR_SITTP)) || (!gRlvHandler.canStand())) )
+		 ((gRlvHandler.hasBehaviour(RLV_BHVR_SITTP)) || (!RlvActions::canStand())) )
 	{
 		RlvUtil::notifyBlocked(RLV_STRING_BLOCKED_TELEPORT);
 		return;