From 381767eea309a10ff328ab7cce0d68453783e8f5 Mon Sep 17 00:00:00 2001
From: Kitty Barnett <develop@catznip.com>
Date: Sat, 28 May 2011 02:06:26 +0200
Subject: [PATCH 1/5] - added : LLWearableType::WT_PHYSICS to the
 @getoutfit=<channel> command response

--HG--
branch : RLVa
---
 indra/newview/rlvhandler.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/rlvhandler.cpp b/indra/newview/rlvhandler.cpp
index b9eb3df141..fc90a1b29c 100644
--- a/indra/newview/rlvhandler.cpp
+++ b/indra/newview/rlvhandler.cpp
@@ -2181,7 +2181,7 @@ ERlvCmdRet RlvHandler::onGetOutfit(const RlvCommand& rlvCmd, std::string& strRep
 			LLWearableType::WT_GLOVES, LLWearableType::WT_JACKET, LLWearableType::WT_PANTS, LLWearableType::WT_SHIRT, 
 			LLWearableType::WT_SHOES, LLWearableType::WT_SKIRT, LLWearableType::WT_SOCKS, LLWearableType::WT_UNDERPANTS, 
 			LLWearableType::WT_UNDERSHIRT, LLWearableType::WT_SKIN, LLWearableType::WT_EYES, LLWearableType::WT_HAIR, 
-			LLWearableType::WT_SHAPE, LLWearableType::WT_ALPHA, LLWearableType::WT_TATTOO
+			LLWearableType::WT_SHAPE, LLWearableType::WT_ALPHA, LLWearableType::WT_TATTOO, LLWearableType::WT_PHYSICS
 		};
 
 	for (int idxType = 0, cntType = sizeof(wtRlvTypes) / sizeof(LLWearableType::EType); idxType < cntType; idxType++)

From bf5fba7264357a7b3a2863491648cd53832ce531 Mon Sep 17 00:00:00 2001
From: Kitty Barnett <develop@catznip.com>
Date: Sat, 28 May 2011 16:18:48 +0200
Subject: [PATCH 2/5] - internal : reviewed @getoutfit[:<type>]=<channel> and
 @getattach[:<attachpt>]=<channel>

--HG--
branch : RLVa
---
 indra/newview/rlvhandler.cpp | 12 ++++++------
 indra/newview/rlvhelper.h    | 35 ++++++++++++++++++-----------------
 2 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/indra/newview/rlvhandler.cpp b/indra/newview/rlvhandler.cpp
index fc90a1b29c..f43c5be768 100644
--- a/indra/newview/rlvhandler.cpp
+++ b/indra/newview/rlvhandler.cpp
@@ -1975,7 +1975,7 @@ ERlvCmdRet RlvHandler::onFindFolder(const RlvCommand& rlvCmd, std::string& strRe
 	return RLV_RET_SUCCESS;
 }
 
-// Checked: 2010-03-19 (RLVa-1.2.0c) | Modified: RLVa-1.1.0e
+// Checked: 2010-03-19 (RLVa-1.4.0a) | Modified: RLVa-1.1.0e
 ERlvCmdRet RlvHandler::onGetAttach(const RlvCommand& rlvCmd, std::string& strReply) const
 {
 	RLV_ASSERT(RLV_TYPE_REPLY == rlvCmd.getParamType());
@@ -1985,8 +1985,8 @@ ERlvCmdRet RlvHandler::onGetAttach(const RlvCommand& rlvCmd, std::string& strRep
 		return RLV_RET_FAILED;
 
 	// Sanity check - <option> should specify an attachment point or be empty
-	S32 idxAttachPt = RlvAttachPtLookup::getAttachPointIndex(rlvCmd.getOption());
-	if ( (idxAttachPt == 0) && (!rlvCmd.getOption().empty()) )
+	S32 idxAttachPt = 0;
+	if ( (rlvCmd.hasOption()) && ((idxAttachPt = RlvAttachPtLookup::getAttachPointIndex(rlvCmd.getOption())) == 0) )
 		return RLV_RET_FAILED_OPTION;
 
 	// If we're fetching all worn attachments then the reply should start with 0
@@ -2165,15 +2165,15 @@ ERlvCmdRet RlvHandler::onGetInvWorn(const RlvCommand& rlvCmd, std::string& strRe
 	return RLV_RET_SUCCESS;
 }
 
-// Checked: 2010-03-19 (RLVa-1.2.0c) | Modified: RLVa-1.2.0a
+// Checked: 2010-03-19 (RLVa-1.4.0a) | Modified: RLVa-1.2.0a
 ERlvCmdRet RlvHandler::onGetOutfit(const RlvCommand& rlvCmd, std::string& strReply) const
 {
 	RLV_ASSERT(RLV_TYPE_REPLY == rlvCmd.getParamType());
 	RLV_ASSERT(RLV_BHVR_GETOUTFIT == rlvCmd.getBehaviourType());
 
 	// (Compatibility: RLV-1.16.1 will execute @getoutfit=<channel> if <layer> is invalid while we just return failure)
-	LLWearableType::EType wtType = LLWearableType::typeNameToType(rlvCmd.getOption());
-	if ( (LLWearableType::WT_INVALID == wtType) && (!rlvCmd.getOption().empty()) )
+	LLWearableType::EType wtType = LLWearableType::WT_INVALID;
+	if ( (rlvCmd.hasOption()) && ((wtType = LLWearableType::typeNameToType(rlvCmd.getOption())) == LLWearableType::WT_INVALID) )
 		return RLV_RET_FAILED_OPTION;
 
 	const LLWearableType::EType wtRlvTypes[] =
diff --git a/indra/newview/rlvhelper.h b/indra/newview/rlvhelper.h
index 1b07a0c188..454fc6bcbc 100644
--- a/indra/newview/rlvhelper.h
+++ b/indra/newview/rlvhelper.h
@@ -39,15 +39,16 @@ public:
 	 * Member functions
 	 */
 public:
-	std::string        asString() const;
-	const std::string& getBehaviour() const		{ return m_strBehaviour; }
-	ERlvBehaviour      getBehaviourType() const	{ return m_eBehaviour; }
-	const LLUUID&      getObjectID() const		{ return m_idObj; }
-	const std::string& getOption() const		{ return m_strOption; }
-	const std::string& getParam() const			{ return m_strParam; }
-	ERlvParamType      getParamType() const		{ return m_eParamType; }
-	bool               isStrict() const			{ return m_fStrict; }
-	bool               isValid() const			{ return m_fValid; }
+	std::string			asString() const;
+	const std::string&	getBehaviour() const		{ return m_strBehaviour; }
+	ERlvBehaviour		getBehaviourType() const	{ return m_eBehaviour; }
+	const LLUUID&		getObjectID() const			{ return m_idObj; }
+	const std::string&	getOption() const			{ return m_strOption; }
+	const std::string&	getParam() const			{ return m_strParam; }
+	ERlvParamType		getParamType() const		{ return m_eParamType; }
+	bool				hasOption() const			{ return !m_strOption.empty(); }
+	bool				isStrict() const			{ return m_fStrict; }
+	bool				isValid() const				{ return m_fValid; }
 
 	typedef std::map<std::string, ERlvBehaviour> bhvr_map_t;
 	static ERlvBehaviour		getBehaviourFromString(const std::string& strBhvr, bool* pfStrict = NULL);
@@ -69,14 +70,14 @@ public:
 	 * Member variables
 	 */
 protected:
-	bool          m_fValid;
-	LLUUID        m_idObj;
-	std::string   m_strBehaviour;
-	ERlvBehaviour m_eBehaviour;
-	bool          m_fStrict;
-	std::string   m_strOption;
-	std::string   m_strParam;
-	ERlvParamType m_eParamType;
+	bool			m_fValid;
+	LLUUID			m_idObj;
+	std::string		m_strBehaviour;
+	ERlvBehaviour	m_eBehaviour;
+	bool			m_fStrict;
+	std::string		m_strOption;
+	std::string		m_strParam;
+	ERlvParamType	m_eParamType;
 
 	static bhvr_map_t m_BhvrMap;
 

From 21c7ecfcdd290871e292540f709b697bdf74be4d Mon Sep 17 00:00:00 2001
From: Kitty Barnett <develop@catznip.com>
Date: Sat, 28 May 2011 19:20:04 +0200
Subject: [PATCH 3/5] - internal : re-enabled and reviewed the @getXXXnames
 experimental reply commands

--HG--
branch : RLVa
---
 indra/newview/rlvhandler.cpp | 37 +++++++++++++++---------------------
 1 file changed, 15 insertions(+), 22 deletions(-)

diff --git a/indra/newview/rlvhandler.cpp b/indra/newview/rlvhandler.cpp
index f43c5be768..ab9654ca08 100644
--- a/indra/newview/rlvhandler.cpp
+++ b/indra/newview/rlvhandler.cpp
@@ -1999,7 +1999,7 @@ ERlvCmdRet RlvHandler::onGetAttach(const RlvCommand& rlvCmd, std::string& strRep
 		const LLViewerJointAttachment* pAttachPt = itAttach->second;
 		if ( (0 == idxAttachPt) || (itAttach->first == idxAttachPt) )
 		{
-			bool fWorn = (pAttachPt->getNumObjects()) && 
+			bool fWorn = (pAttachPt->getNumObjects() > 0) && 
 				( (!RlvSettings::getHideLockedAttach()) || (RlvForceWear::isForceDetachable(pAttachPt, true, rlvCmd.getObjectID())) );
 			strReply.push_back( (fWorn) ? '1' : '0' );
 		}
@@ -2007,7 +2007,7 @@ ERlvCmdRet RlvHandler::onGetAttach(const RlvCommand& rlvCmd, std::string& strRep
 	return RLV_RET_SUCCESS;
 }
 
-// Checked: 2010-03-19 (RLVa-1.2.0a) | Added: RLVa-1.1.0e
+// Checked: 2011-05-28 (RLVa-1.4.0a) | Modified: RLVa-1.4.0a
 ERlvCmdRet RlvHandler::onGetAttachNames(const RlvCommand& rlvCmd, std::string& strReply) const
 {
 	RLV_ASSERT(RLV_TYPE_REPLY == rlvCmd.getParamType());
@@ -2027,18 +2027,14 @@ ERlvCmdRet RlvHandler::onGetAttachNames(const RlvCommand& rlvCmd, std::string& s
 			bool fAdd = false;
 			switch (rlvCmd.getBehaviourType())
 			{
-				case RLV_BHVR_GETATTACHNAMES:		// Every attachment point that has an attached object (locked or unlocked)
-					fAdd = (pAttachPt->getNumObjects());
+				case RLV_BHVR_GETATTACHNAMES:		// Every attachment point that has an attached object
+					fAdd = (pAttachPt->getNumObjects() > 0);
 					break;
-/*
-				case RLV_BHVR_GETADDATTACHNAMES:	// Every attachment point that can be worn on (but ignore any locks set by the issuer)
-					fAdd = (!isLockedAttachmentExcept(itAttach->first, RLV_LOCK_ADD, gObjectList.findObject(idObj))) &&
-						   ( (pAttachPt->getObject() == NULL) || 
-						     (!isLockedAttachmentExcept(itAttach->first, RLV_LOCK_REMOVE, gObjectList.findObject(idObj))) );
+				case RLV_BHVR_GETADDATTACHNAMES:	// Every attachment point that can be attached to (wear replace OR wear add)
+					fAdd = (gRlvAttachmentLocks.canAttach(pAttachPt) & RLV_WEAR);
 					break;
-*/
-				case RLV_BHVR_GETREMATTACHNAMES:	// Every attachment point that can be detached (but ignore any locks set by the issuer)
-					fAdd = RlvForceWear::isForceDetachable(pAttachPt, true, rlvCmd.getObjectID());
+				case RLV_BHVR_GETREMATTACHNAMES:	// Every attachment point that has at least one attachment that can be force-detached
+					fAdd = RlvForceWear::isForceDetachable(pAttachPt);
 					break;
 				default:
 					break;
@@ -2200,7 +2196,7 @@ ERlvCmdRet RlvHandler::onGetOutfit(const RlvCommand& rlvCmd, std::string& strRep
 	return RLV_RET_SUCCESS;
 }
 
-// Checked: 2009-11-21 (RLVa-1.1.0f) | Added: RLVa-1.1.0e
+// Checked: 2011-05-28 (RLVa-1.4.0a) | Modified: RLVa-1.4.0a
 ERlvCmdRet RlvHandler::onGetOutfitNames(const RlvCommand& rlvCmd, std::string& strReply) const
 {
 	RLV_ASSERT(RLV_TYPE_REPLY == rlvCmd.getParamType());
@@ -2208,24 +2204,21 @@ ERlvCmdRet RlvHandler::onGetOutfitNames(const RlvCommand& rlvCmd, std::string& s
 		        (RLV_BHVR_GETREMOUTFITNAMES == rlvCmd.getBehaviourType()) );
 
 	// Sanity check - all these commands are optionless
-	if (!rlvCmd.getOption().empty())
+	if (rlvCmd.hasOption())
 		return RLV_RET_FAILED_OPTION;
 
-	// RELEASE-RLVa: [SL-2.0.0] Needs revisiting/rewriting once 'LLAgentWearables::MAX_WEARABLES_PER_TYPE > 1'
 	for (int idxType = 0; idxType < LLWearableType::WT_COUNT; idxType++)
 	{
 		bool fAdd = false; LLWearableType::EType wtType = (LLWearableType::EType)idxType;
 		switch (rlvCmd.getBehaviourType())
 		{
-			case RLV_BHVR_GETOUTFITNAMES:		// Every layer that's worn
+			case RLV_BHVR_GETOUTFITNAMES:		// Every layer that has at least one worn wearable
 				fAdd = (gAgentWearables.getWearableCount(wtType) > 0);
 				break;
-/*
-			case RLV_BHVR_GETADDOUTFITNAMES:	// Every layer that can be worn on (but ignore any locks set by the issuer)
-				fAdd = (isWearable(wtType)) && ( (gAgent.getWearable(wtType) == NULL) || (isRemovableExcept(wtType, idObj)) );
+			case RLV_BHVR_GETADDOUTFITNAMES:	// Every layer that can be worn on (wear replace OR wear add)
+				fAdd = (gRlvWearableLocks.canWear(wtType) & RLV_WEAR);
 				break;
-*/
-			case RLV_BHVR_GETREMOUTFITNAMES:	// Every layer that can be removed (but ignore any locks set by the issuer)
+			case RLV_BHVR_GETREMOUTFITNAMES:	// Every layer that has at least one wearable that can be force-removed
 				fAdd = RlvForceWear::isForceRemovable(wtType);
 				break;
 			default:
@@ -2236,7 +2229,7 @@ ERlvCmdRet RlvHandler::onGetOutfitNames(const RlvCommand& rlvCmd, std::string& s
 		{
 			if (!strReply.empty())
 				strReply.push_back(',');
-			strReply.append(LLWearableType::getTypeName((LLWearableType::EType)idxType));
+			strReply.append(LLWearableType::getTypeName(wtType));
 		}
 	}
 	return RLV_RET_SUCCESS;

From 5fb4146473a05d2b9702603ecfb65c9bbd0baefa Mon Sep 17 00:00:00 2001
From: Kitty Barnett <develop@catznip.com>
Date: Sat, 28 May 2011 20:00:11 +0200
Subject: [PATCH 4/5] - internal : reviewed and rewrote rlvCanDeleteOrReturn()
 and reviewed LLObjectEnableReturn and LLObjectReturn     -> added checks to
 LLViewerObject::isReturnable() and rewrote rlvCanDeleteOrReturn() to use it  
   -> fixed RlvSelectIsSittingOn which was using an incorrect way of checking
 for a specific seated avatar

--HG--
branch : RLVa
---
 indra/newview/llselectmgr.cpp    |  4 ++--
 indra/newview/llviewermenu.cpp   | 13 +++++++----
 indra/newview/llviewerobject.cpp | 14 +++++++++++-
 indra/newview/llviewerobject.h   |  5 +++-
 indra/newview/rlvcommon.cpp      | 39 +++++++++-----------------------
 indra/newview/rlvcommon.h        | 14 +++---------
 6 files changed, 41 insertions(+), 48 deletions(-)

diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp
index 9fedf12016..1526ffaf35 100644
--- a/indra/newview/llselectmgr.cpp
+++ b/indra/newview/llselectmgr.cpp
@@ -652,7 +652,7 @@ bool LLSelectMgr::enableLinkObjects()
 	{
 		// Allow only if the avie isn't sitting on any of the selected objects
 		LLObjectSelectionHandle hSel = LLSelectMgr::getInstance()->getSelection();
-		RlvSelectIsSittingOn f(gAgentAvatarp->getRoot());
+		RlvSelectIsSittingOn f(gAgentAvatarp);
 		if (hSel->getFirstRootNode(&f, TRUE) != NULL)
 			new_value = false;
 	}
@@ -672,7 +672,7 @@ bool LLSelectMgr::enableUnlinkObjects()
 	{
 		// Allow only if the avie isn't sitting on any of the selected objects
 		LLObjectSelectionHandle hSel = LLSelectMgr::getInstance()->getSelection();
-		RlvSelectIsSittingOn f(gAgentAvatarp->getRoot());
+		RlvSelectIsSittingOn f(gAgentAvatarp);
 		if (hSel->getFirstRootNode(&f, TRUE) != NULL)
 			new_value = false;
 	}
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index a722cec535..75f7295da9 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -4259,7 +4259,7 @@ void handle_take_copy()
 	{
 		// Allow only if the avie isn't sitting on any of the selected objects
 		LLObjectSelectionHandle hSel = LLSelectMgr::getInstance()->getSelection();
-		RlvSelectIsSittingOn f(gAgentAvatarp->getRoot());
+		RlvSelectIsSittingOn f(gAgentAvatarp);
 		if ( (hSel.notNull()) && (hSel->getFirstRootNode(&f, TRUE) != NULL) )
 			return;
 	}
@@ -4275,7 +4275,7 @@ class LLObjectReturn : public view_listener_t
 	bool handleEvent(const LLSD& userdata)
 	{
 		if (LLSelectMgr::getInstance()->getSelection()->isEmpty()) return true;
-// [RLVa:KB] - Checked: 2010-03-24 (RLVa-1.2.0e) | Modified: RLVa-1.0.0b
+// [RLVa:KB] - Checked: 2010-03-24 (RLVa-1.4.0a) | Modified: RLVa-1.0.0b
 		if ( (rlv_handler_t::isEnabled()) && (!rlvCanDeleteOrReturn()) ) return true;
 // [/RLVa:KB]
 
@@ -4315,6 +4315,12 @@ class LLObjectEnableReturn : public view_listener_t
 			// Do not enable if nothing selected
 			return false;
 		}
+// [RLVa:KB] - Checked: 2011-05-28 (RLVa-1.4.0a) | Modified: RLVa-1.4.0a
+		if ( (rlv_handler_t::isEnabled()) && (!rlvCanDeleteOrReturn()) )
+		{
+			return false;
+		}
+// [/RLVa:KB]
 #ifdef HACKED_GODLIKE_VIEWER
 		bool new_value = true;
 #else
@@ -4350,9 +4356,6 @@ class LLObjectEnableReturn : public view_listener_t
 			}
 		}
 #endif
-// [RLVa:KB] - Checked: 2010-03-24 (RLVa-1.2.0e) | Modified: RLVa-1.0.0b
-		new_value &= (!rlv_handler_t::isEnabled()) || (rlvCanDeleteOrReturn());
-// [/RLVa:KB]
 		return new_value;
 	}
 };
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index 2c3094d9b0..dd2b09e048 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -521,6 +521,15 @@ bool LLViewerObject::isReturnable()
 	{
 		return false;
 	}
+// [RLVa:KB] - Checked: 2011-05-28 (RLVa-1.4.0a) | Added: RLVa-1.4.0a
+	// Block if: @rez=n restricted and owned by us or a group *or* @unsit=n restricted and being sat on by us
+	if ( (rlv_handler_t::isEnabled()) &&
+		 ( ((gRlvHandler.hasBehaviour(RLV_BHVR_REZ)) && ((permYouOwner() || permGroupOwner()))) ||
+		   ((gRlvHandler.hasBehaviour(RLV_BHVR_UNSIT)) && (isAgentAvatarValid()) && (getRootEdit()->isChild(gAgentAvatarp))) ) )
+	{
+		return false;
+	}
+// [/RLVa:KB]
 	std::vector<LLBBox> boxes;
 	boxes.push_back(LLBBox(getPositionRegion(), getRotationRegion(), getScale() * -0.5f, getScale() * 0.5f).getAxisAligned());
 	for (child_list_t::iterator iter = mChildList.begin();
@@ -634,7 +643,10 @@ void LLViewerObject::addThisAndNonJointChildren(std::vector<LLViewerObject*>& ob
 	}
 }
 
-BOOL LLViewerObject::isChild(LLViewerObject *childp) const
+//BOOL LLViewerObject::isChild(LLViewerObject *childp) const
+// [RLVa:KB] - Checked: 2011-05-28 (RLVa-1.4.0a) | Added: RLVa-1.4.0a
+BOOL LLViewerObject::isChild(const LLViewerObject *childp) const
+// [/RLVa:KB]
 {
 	for (child_list_t::const_iterator iter = mChildList.begin();
 		 iter != mChildList.end(); iter++)
diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h
index 9aa8e32569..edc866e471 100644
--- a/indra/newview/llviewerobject.h
+++ b/indra/newview/llviewerobject.h
@@ -247,7 +247,10 @@ public:
 	S32 numChildren() const { return mChildList.size(); }
 	void addThisAndAllChildren(std::vector<LLViewerObject*>& objects);
 	void addThisAndNonJointChildren(std::vector<LLViewerObject*>& objects);
-	BOOL isChild(LLViewerObject *childp) const;
+//	BOOL isChild(LLViewerObject *childp) const;
+// [RLVa:KB] - Checked: 2011-05-28 (RLVa-1.4.0a) | Added: RLVa-1.4.0a
+	BOOL isChild(const LLViewerObject *childp) const;
+// [/RLVa:KB]
 	BOOL isSeat() const;
 	
 
diff --git a/indra/newview/rlvcommon.cpp b/indra/newview/rlvcommon.cpp
index ae2f4e512f..31e88266b1 100644
--- a/indra/newview/rlvcommon.cpp
+++ b/indra/newview/rlvcommon.cpp
@@ -465,30 +465,19 @@ bool rlvMenuEnableIfNot(const LLSD& sdParam)
 // Selection functors
 //
 
-// Checked: 2010-04-11 (RLVa-1.2.0b) | Modified: RLVa-0.2.0g
+// Checked: 2011-05-28 (RLVa-1.4.0a) | Modified: RLVa-1.4.0a
 bool rlvCanDeleteOrReturn()
 {
-	bool fIsAllowed = true;
-
-	if (gRlvHandler.hasBehaviour(RLV_BHVR_REZ))
+	if ( (gRlvHandler.hasBehaviour(RLV_BHVR_REZ)) || (gRlvHandler.hasBehaviour(RLV_BHVR_UNSIT)) )
 	{
-		// We'll allow if none of the prims are owned by the avie or group owned
-		LLObjectSelectionHandle handleSel = LLSelectMgr::getInstance()->getSelection();
-		RlvSelectIsOwnedByOrGroupOwned f(gAgent.getID());
-		if ( (handleSel.notNull()) && ((0 == handleSel->getRootObjectCount()) || (NULL != handleSel->getFirstRootNode(&f, FALSE))) )
-			fIsAllowed = false;
+		struct RlvCanDeleteOrReturn : public LLSelectedObjectFunctor
+		{
+			/*virtual*/ bool apply(LLViewerObject* pObj) { return pObj->isReturnable(); }
+		} f;
+		LLObjectSelectionHandle hSel = LLSelectMgr::getInstance()->getSelection();
+		return (hSel.notNull()) && (0 != hSel->getRootObjectCount()) && (hSel->applyToRootObjects(&f, false));
 	}
-	
-	if ( (gRlvHandler.hasBehaviour(RLV_BHVR_UNSIT)) && (isAgentAvatarValid()) )
-	{
-		// We'll allow if the avie isn't sitting on any of the selected objects
-		LLObjectSelectionHandle handleSel = LLSelectMgr::getInstance()->getSelection();
-		RlvSelectIsSittingOn f(gAgentAvatarp->getRoot());
-		if ( (handleSel.notNull()) && (handleSel->getFirstRootNode(&f, TRUE)) )
-			fIsAllowed = false;
-	}
-
-	return fIsAllowed;
+	return true;
 }
 
 // Checked: 2010-04-20 (RLVa-1.2.0f) | Modified: RLVa-0.2.0f
@@ -504,16 +493,10 @@ bool RlvSelectIsEditable::apply(LLSelectNode* pNode)
 	return (pObj) && (!gRlvHandler.canEdit(pObj));
 }
 
-// Checked: 2009-07-05 (RLVa-1.0.0b) | Modified: RLVa-0.2.0f
-bool RlvSelectIsOwnedByOrGroupOwned::apply(LLSelectNode* pNode)
-{
-	return (pNode->mPermissions->isGroupOwned()) || (pNode->mPermissions->getOwner() == m_idAgent);
-}
-
-// Checked: 2010-04-01 (RLVa-1.2.0c) | Modified: RLVa-0.2.0f
+// Checked: 2011-05-28 (RLVa-1.4.0a) | Modified: RLVa-1.4.0a
 bool RlvSelectIsSittingOn::apply(LLSelectNode* pNode)
 {
-	return (pNode->getObject()) && (pNode->getObject()->getRootEdit() == m_pObject);
+	return (pNode->getObject()) && (pNode->getObject()->getRootEdit()->isChild(m_pAvatar));
 }
 
 // ============================================================================
diff --git a/indra/newview/rlvcommon.h b/indra/newview/rlvcommon.h
index 1b762971c4..f4f9028341 100644
--- a/indra/newview/rlvcommon.h
+++ b/indra/newview/rlvcommon.h
@@ -212,20 +212,12 @@ struct RlvSelectIsEditable : public LLSelectedNodeFunctor
 	/*virtual*/ bool apply(LLSelectNode* pNode);
 };
 
-struct RlvSelectIsOwnedByOrGroupOwned : public LLSelectedNodeFunctor
-{
-	RlvSelectIsOwnedByOrGroupOwned(const LLUUID& uuid) : m_idAgent(uuid) {}
-	virtual bool apply(LLSelectNode* pNode);
-protected:
-	LLUUID m_idAgent;
-};
-
 struct RlvSelectIsSittingOn : public LLSelectedNodeFunctor
 {
-	RlvSelectIsSittingOn(LLXform* pObject) : m_pObject(pObject) {}
-	virtual bool apply(LLSelectNode* pNode);
+	RlvSelectIsSittingOn(const LLVOAvatar* pAvatar) : m_pAvatar(pAvatar) {}
+	/*virtual*/ bool apply(LLSelectNode* pNode);
 protected:
-	LLXform* m_pObject;
+	const LLVOAvatar* m_pAvatar;
 };
 
 // ============================================================================

From 400e01316b944137af4d8b1c24c0af1bcb6c739a Mon Sep 17 00:00:00 2001
From: Kitty Barnett <develop@catznip.com>
Date: Sun, 29 May 2011 01:51:16 +0200
Subject: [PATCH 5/5] - internal : reviewed all RLV/RLVa related version code  
   -> fixed sending a @version response if the other agent is muted

--HG--
branch : RLVa
---
 indra/newview/llfloaterabout.cpp  |  9 +++------
 indra/newview/llviewermessage.cpp |  6 +++---
 indra/newview/rlvcommon.cpp       | 11 +++++------
 indra/newview/rlvhandler.cpp      |  6 +++---
 4 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/indra/newview/llfloaterabout.cpp b/indra/newview/llfloaterabout.cpp
index 0970c5a09b..f4892ff236 100644
--- a/indra/newview/llfloaterabout.cpp
+++ b/indra/newview/llfloaterabout.cpp
@@ -41,7 +41,7 @@
 #include "llviewerregion.h"
 #include "llversioninfo.h"
 #include "llweb.h"
-// [RLVa:KB] - Checked: 2010-04-18 (RLVa-1.2.0e)
+// [RLVa:KB] - Checked: 2010-04-18 (RLVa-1.4.0a)
 #include "rlvhandler.h"
 // [/RLVa:KB]
 
@@ -257,11 +257,8 @@ LLSD LLFloaterAbout::getInfo()
     }
 #endif
 
-// [RLVa:KB] - Checked: 2010-04-18 (RLVa-1.2.0e) | Added: RLVa-1.2.0e
-	if (rlv_handler_t::isEnabled())
-		info["RLV_VERSION"] = RlvStrings::getVersionAbout();
-	else
-		info["RLV_VERSION"] = "(disabled)";
+// [RLVa:KB] - Checked: 2010-04-18 (RLVa-1.4.0a) | Added: RLVa-1.2.0e
+	info["RLV_VERSION"] = (rlv_handler_t::isEnabled()) ? RlvStrings::getVersionAbout() : "(disabled)";
 // [/RLVa:KB]
 	info["OPENGL_VERSION"] = (const char*)(glGetString(GL_VERSION));
 	info["LIBCURL_VERSION"] = LLCurl::getVersionString();
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 3c840a77f6..c2af525bc6 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -2371,10 +2371,10 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 			// do nothing -- don't distract newbies in
 			// Prelude with global IMs
 		}
-// [RLVa:KB] - Checked: 2010-03-27 (RLVa-1.2.0b) | Modified: RLVa-1.2.0b
-		else if ( (rlv_handler_t::isEnabled()) && (offline == IM_ONLINE) && ("@version" == message) )
+// [RLVa:KB] - Checked: 2011-05-28 (RLVa-1.4.0a) | Modified: RLVa-1.4.0a
+		else if ( (rlv_handler_t::isEnabled()) && (offline == IM_ONLINE) && ("@version" == message) && 
+		          (!is_muted) && ((!accept_im_from_only_friend) || (is_friend)) )
 		{
-			// TODO-RLVa: [RLVa-1.2.1] Should we send our version string if the other party is muted?
 			RlvUtil::sendBusyMessage(from_id, RlvStrings::getVersion(), session_id);
 		}
 // [/RLVa:KB]
diff --git a/indra/newview/rlvcommon.cpp b/indra/newview/rlvcommon.cpp
index 31e88266b1..61b3d0d785 100644
--- a/indra/newview/rlvcommon.cpp
+++ b/indra/newview/rlvcommon.cpp
@@ -239,8 +239,8 @@ const char* RlvStrings::getStringFromReturnCode(ERlvCmdRet eRet)
 	return NULL;
 }
 
-// Checked: 2010-03-27 (RLVa-1.2.0b) | Modified: RLVa-1.2.0b
-std::string RlvStrings::getVersion(bool fLegacy /*=false*/) 
+// Checked: 2010-03-27 (RLVa-1.4.0a) | Modified: RLVa-1.2.0b
+std::string RlvStrings::getVersion(bool fLegacy)
 {
 	return llformat("%s viewer v%d.%d.%d (%s %d.%d.%d.%d - RLVa %d.%d.%d)",
 		( (!fLegacy) ? "RestrainedLove" : "RestrainedLife" ),
@@ -249,7 +249,7 @@ std::string RlvStrings::getVersion(bool fLegacy /*=false*/)
 		RLVa_VERSION_MAJOR, RLVa_VERSION_MINOR, RLVa_VERSION_PATCH);
 }
 
-// Checked: 2010-04-18 (RLVa-1.2.0e) | Added: RLVa-1.2.0e
+// Checked: 2010-04-18 (RLVa-1.4.0a) | Added: RLVa-1.2.0e
 std::string RlvStrings::getVersionAbout()
 {
 	return llformat("RLV v%d.%d.%d / RLVa v%d.%d.%d%c" , 
@@ -257,9 +257,8 @@ std::string RlvStrings::getVersionAbout()
 		RLVa_VERSION_MAJOR, RLVa_VERSION_MINOR, RLVa_VERSION_PATCH, 'a' + RLVa_VERSION_BUILD);
 }
 
-
-// Checked: 2010-03-27 (RLVa-1.2.0b) | Modified: RLVa-1.1.0a
-std::string RlvStrings::getVersionNum() 
+// Checked: 2010-03-27 (RLVa-1.4.0a) | Modified: RLVa-1.1.0a
+std::string RlvStrings::getVersionNum()
 {
 	return llformat("%d%02d%02d%02d", RLV_VERSION_MAJOR, RLV_VERSION_MINOR, RLV_VERSION_PATCH, RLV_VERSION_BUILD);
 }
diff --git a/indra/newview/rlvhandler.cpp b/indra/newview/rlvhandler.cpp
index ab9654ca08..ec0fee39c4 100644
--- a/indra/newview/rlvhandler.cpp
+++ b/indra/newview/rlvhandler.cpp
@@ -1830,12 +1830,12 @@ ERlvCmdRet RlvHandler::processReplyCommand(const RlvCommand& rlvCmd) const
 	ERlvCmdRet eRet = RLV_RET_SUCCESS; std::string strReply;
 	switch (rlvCmd.getBehaviourType())
 	{
-		case RLV_BHVR_VERSION:			// @version=<channel>					- Checked: 2010-03-27 (RLVa-1.2.0b)
-		case RLV_BHVR_VERSIONNEW:		// @versionnew=<channel>				- Checked: 2010-03-27 (RLVa-1.2.0b) | Added: RLVa-1.2.0b
+		case RLV_BHVR_VERSION:			// @version=<channel>					- Checked: 2010-03-27 (RLVa-1.4.0a)
+		case RLV_BHVR_VERSIONNEW:		// @versionnew=<channel>				- Checked: 2010-03-27 (RLVa-1.4.0a) | Added: RLVa-1.2.0b
 			// NOTE: RLV will respond even if there's an option
 			strReply = RlvStrings::getVersion(RLV_BHVR_VERSION == rlvCmd.getBehaviourType());
 			break;
-		case RLV_BHVR_VERSIONNUM:		// @versionnum=<channel>				- Checked: 2010-03-27 (RLVa-1.2.0b) | Added: RLVa-1.0.4b
+		case RLV_BHVR_VERSIONNUM:		// @versionnum=<channel>				- Checked: 2010-03-27 (RLVa-1.4.0a) | Added: RLVa-1.0.4b
 			// NOTE: RLV will respond even if there's an option
 			strReply = RlvStrings::getVersionNum();
 			break;