From 9302b9658ee8a2bc8547d5131faed42b6efa5575 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Thu, 19 Aug 2010 10:54:12 -0700
Subject: Applied RLVa-1.0.5e_fix.patch by Kitty Barnett to fix RLVa up to
 1.0.5.e

---
 linden/indra/newview/llagent.cpp | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

(limited to 'linden/indra/newview/llagent.cpp')

diff --git a/linden/indra/newview/llagent.cpp b/linden/indra/newview/llagent.cpp
index ef05fae..38e1c0f 100644
--- a/linden/indra/newview/llagent.cpp
+++ b/linden/indra/newview/llagent.cpp
@@ -4307,16 +4307,14 @@ void LLAgent::changeCameraToCustomizeAvatar(BOOL avatar_animate, BOOL camera_ani
 		return;
 	}
 
+//	if(gSavedSettings.getBOOL("AppearanceAnimate"))
 // [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g)
-	if(gSavedSettings.getBOOL("AppearanceAnimate"))
-	if ( (gRlvHandler.hasBehaviour(RLV_BHVR_UNSIT)) && (mAvatarObject.notNull()) && (mAvatarObject->mIsSitting) )
-	{
-		return;
-	}
+	if ( (gSavedSettings.getBOOL("AppearanceAnimate")) &&
+		 ((!gRlvHandler.hasBehaviour(RLV_BHVR_UNSIT)) || ((mAvatarObject.notNull()) && (!mAvatarObject->mIsSitting))) )
 // [/RLVa:KB]
-
-	if(gSavedSettings.getBOOL("AppearanceAnimate"))
+	{
 		setControlFlags(AGENT_CONTROL_STAND_UP); // force stand up
+	}
 	gViewerWindow->getWindow()->resetBusyCount();
 
 	if (gFaceEditToolset)
@@ -6285,8 +6283,7 @@ void LLAgent::setTeleportState(ETeleportState state)
 		// We're outa here. Save "back" slurl.
 		mTeleportSourceSLURL = getSLURL();
 	}
-
-// [RLVa:KB] - Version: 1.22.11 | Checked: 2009-07-07 (RLVa-1.0.0d) | Added: RLVa-0.2.0b
+// [RLVa:KB] - Version: 1.23.4 | Checked: 2009-07-07 (RLVa-1.0.0d) | Added: RLVa-0.2.0b
 	if ( (rlv_handler_t::isEnabled()) && (TELEPORT_NONE == mTeleportState) )
 	{
 		gRlvHandler.setCanCancelTp(true);
@@ -7473,7 +7470,7 @@ void LLAgent::removeWearable( EWearableType type )
 		return;
 	}
 
-// [RLVa:KB] - Version: 1.22.11 | Checked: 2009-07-07 (RLVa-1.0.0d)
+// [RLVa:KB] - Version: 1.23.4 | Checked: 2009-07-07 (RLVa-1.0.0d)
 	if ( (rlv_handler_t::isEnabled()) && (!gRlvHandler.isRemovable(type)) )
 	{
 		return;
@@ -7616,9 +7613,9 @@ void LLAgent::setWearableOutfit(
 	wearables_to_remove[WT_UNDERSHIRT]	= (!gAgent.isTeen()) && remove && gRlvHandler.isRemovable(WT_UNDERSHIRT);
 	wearables_to_remove[WT_UNDERPANTS]	= (!gAgent.isTeen()) && remove && gRlvHandler.isRemovable(WT_UNDERPANTS);
 	wearables_to_remove[WT_SKIRT]		= remove && gRlvHandler.isRemovable(WT_SKIRT);
+	wearables_to_remove[WT_ALPHA]		= remove && gRlvHandler.isRemovable(WT_ALPHA);
+	wearables_to_remove[WT_TATTOO]		= remove && gRlvHandler.isRemovable(WT_TATTOO);
 // [/RLVa:KB]
-	wearables_to_remove[WT_ALPHA]		= remove;
-	wearables_to_remove[WT_TATTOO]		= remove;
 
 	S32 count = wearables.count();
 	llassert( items.count() == count );
-- 
cgit v1.1