From cc355535923d4f922ec3467a4244ac6f925a93ef Mon Sep 17 00:00:00 2001
From: Kitty Barnett <develop@catznip.com>
Date: Thu, 12 Jul 2012 17:00:12 +0200
Subject: [PATCH 01/13] Added tag RLVa-1.4.6 for changeset 0c8f23b2c4cf

--HG--
branch : RLVa
---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 48ea064d91..7d42053cc9 100644
--- a/.hgtags
+++ b/.hgtags
@@ -618,3 +618,4 @@ a563f7e215c7883c1cfd20908085687a0ed96284 RLVa-1.4.0
 11c6c85ddd223bcbd6b3afc53f9a0f5fd349ba65 RLVa-1.4.3
 53b44208d44a601fe24e78c1a1909dc82356cded RLVa-1.4.4
 6522747820037cc11e5b7d0491a0a9808a958709 RLVa-1.4.5
+0c8f23b2c4cf96d1a08bd527b3ccb6339a9fdb60 RLVa-1.4.6

From 92ddac224d7d6d01b6ef2d1e69d55f19f168f889 Mon Sep 17 00:00:00 2001
From: Kitty Barnett <develop@catznip.com>
Date: Thu, 12 Jul 2012 17:01:21 +0200
Subject: [PATCH 02/13] Incremented version number to RLVa-1.4.7

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

diff --git a/indra/newview/rlvdefines.h b/indra/newview/rlvdefines.h
index 4ddb934d62..5c4466f8dc 100644
--- a/indra/newview/rlvdefines.h
+++ b/indra/newview/rlvdefines.h
@@ -64,7 +64,7 @@ const S32 RLV_VERSION_BUILD = 0;
 // Implementation version
 const S32 RLVa_VERSION_MAJOR = 1;
 const S32 RLVa_VERSION_MINOR = 4;
-const S32 RLVa_VERSION_PATCH = 6;
+const S32 RLVa_VERSION_PATCH = 7;
 const S32 RLVa_VERSION_BUILD = 0;
 
 // Uncomment before a final release

From ef1c5329692aab5e0afc8719a713e04a1c57b627 Mon Sep 17 00:00:00 2001
From: Trinity Dejavu <trinity.deja@gmail.com>
Date: Sun, 19 Feb 2012 23:28:10 +0000
Subject: [PATCH 03/13] - changed : updated locks floater

--HG--
branch : RLVa
---
 .../default/xui/en/floater_rlv_locks.xml      | 64 +++++++++++++++++--
 1 file changed, 58 insertions(+), 6 deletions(-)

diff --git a/indra/newview/skins/default/xui/en/floater_rlv_locks.xml b/indra/newview/skins/default/xui/en/floater_rlv_locks.xml
index 9472da5981..88f131bcd8 100644
--- a/indra/newview/skins/default/xui/en/floater_rlv_locks.xml
+++ b/indra/newview/skins/default/xui/en/floater_rlv_locks.xml
@@ -1,12 +1,64 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="true"
-         height="425" min_height="200" min_width="375" name="rlvLocks" title="Active RLV Locks" width="350"
-         save_rect="true" save_visibility="true" single_instance="true">
-  <scroll_list top="0" draw_border="false" follows="top|left|bottom|right" height="400" multi_select="false"
-               name="lock_list" draw_heading="true" draw_stripes="true" layout="topleft">
+<floater
+ can_close="true"
+ can_minimize="true"
+ can_resize="true"
+ height="400"
+ min_height="300"
+ min_width="500"
+ name="rlvLocks"
+ save_rect="true"
+ save_visibility="true"
+ single_instance="true"
+ title="Active RLV Locks"
+ width="500">
+  <scroll_list
+   background_visible="false"
+   draw_border="false"
+   draw_heading="true"
+   draw_stripes="true"
+   follows="all"
+   height="373"
+   layout="topleft"
+   multi_select="false"
+   name="lock_list"
+   top="0"
+   width="500">
     <scroll_list.columns label="Lock Type" name="lock_type" width="110" />
     <scroll_list.columns label="Add / Rem" name="lock_addrem" width="75" />
     <scroll_list.columns label="Lock Target" name="lock_target" width="150" />
     <scroll_list.columns label="Held By" name="lock_origin" width="150" />
   </scroll_list>
-</floater>
\ No newline at end of file
+  <panel
+   background_visible="false"
+   follows="left|right|bottom"
+   height="27"
+   layout="topleft"
+   left="0"
+   name="bottom_panel"
+   top_pad="0"
+   width="500">
+    <button
+     follows="bottom|left"
+     height="25"
+     image_hover_unselected="Toolbar_Left_Over"
+     image_overlay="Refresh_Off"
+     image_overlay_alignment="left"
+     image_selected="Toolbar_Left_Selected"
+     image_unselected="Toolbar_Left_Off"
+     label="Refresh"
+     layout="topleft"
+     left="0"
+     name="refresh_btn"
+     top="1"
+     width="74" />
+    <icon
+     follows="bottom|left|right"
+     height="25"
+     image_name="Toolbar_Right_Off"
+     layout="topleft"
+     left_pad="1"
+     name="dummy_icon"
+     width="425"/>
+  </panel>
+</floater>

From 3f0175aaba1407f719fbdfb6853b9bb69f41c103 Mon Sep 17 00:00:00 2001
From: Kitty Barnett <develop@catznip.com>
Date: Sat, 14 Jul 2012 23:58:06 +0200
Subject: [PATCH 04/13] - internal : worn "nostrip" items show in the locks
 debug floater

--HG--
branch : RLVa
---
 indra/newview/rlvfloaters.cpp | 71 ++++++++++++++++++++++++++++++++---
 indra/newview/rlvfloaters.h   | 12 ++----
 2 files changed, 69 insertions(+), 14 deletions(-)

diff --git a/indra/newview/rlvfloaters.cpp b/indra/newview/rlvfloaters.cpp
index 51d8319c90..82dc1d0572 100644
--- a/indra/newview/rlvfloaters.cpp
+++ b/indra/newview/rlvfloaters.cpp
@@ -15,8 +15,10 @@
  */
 
 #include "llviewerprecompiledheaders.h"
+#include "llappearancemgr.h"
 #include "llavatarnamecache.h"
 #include "llclipboard.h"
+#include "llinventoryfunctions.h"
 #include "llscrolllistctrl.h"
 #include "llviewerjointattachment.h"
 #include "llviewerobjectlist.h"
@@ -31,6 +33,35 @@
 // Helper functions
 //
 
+// Checked: 2012-07-14 (RLVa-1.4.7)
+std::string rlvGetItemName(const LLViewerInventoryItem* pItem)
+{
+	if ( (pItem) && ((LLAssetType::AT_BODYPART == pItem->getType()) || (LLAssetType::AT_CLOTHING == pItem->getType())) )
+		return llformat("%s (%s)", pItem->getName().c_str(), LLWearableType::getTypeName(pItem->getWearableType()).c_str());
+	else if ( (pItem) && (LLAssetType::AT_OBJECT == pItem->getType()) && (isAgentAvatarValid()) )
+		return llformat("%s (%s)", pItem->getName().c_str(), gAgentAvatarp->getAttachedPointName(pItem->getUUID()).c_str());
+	return (pItem) ? pItem->getName() : LLStringUtil::null;
+}
+
+// Checked: 2012-07-14 (RLVa-1.4.7)
+std::string rlvGetItemType(const LLViewerInventoryItem* pItem)
+{
+	if (pItem)
+	{
+		switch (pItem->getType())
+		{
+			case LLAssetType::AT_BODYPART:
+			case LLAssetType::AT_CLOTHING:
+				return "Wearable";
+			case LLAssetType::AT_OBJECT:
+				return "Attachment";
+			default:
+				break;
+		}
+	}
+	return "Unknown";
+}
+
 // Checked: 2010-03-11 (RLVa-1.2.0a) | Modified: RLVa-1.2.0g
 std::string rlvGetItemNameFromObjID(const LLUUID& idObj, bool fIncludeAttachPt = true)
 {
@@ -232,7 +263,7 @@ void RlvFloaterBehaviours::refreshAll()
 // RlvFloaterLocks member functions
 //
 
-// Checked: 2010-03-11 (RLVa-1.2.0a) | Added: RLVa-1.2.0a
+// Checked: 2010-03-11 (RLVa-1.2.0)
 void RlvFloaterLocks::onOpen(const LLSD& sdKey)
 {
 	m_ConnRlvCommand = gRlvHandler.setCommandCallback(boost::bind(&RlvFloaterLocks::onRlvCommand, this, _1, _2));
@@ -240,12 +271,20 @@ void RlvFloaterLocks::onOpen(const LLSD& sdKey)
 	refreshAll();
 }
 
-// Checked: 2010-03-11 (RLVa-1.2.0a) | Added: RLVa-1.2.0a
+// Checked: 2010-03-11 (RLVa-1.2.0)
 void RlvFloaterLocks::onClose(bool fQuitting)
 {
 	m_ConnRlvCommand.disconnect();
 }
 
+// Checked: 2012-07-14 (RLVa-1.4.7)
+BOOL RlvFloaterLocks::postBuild()
+{
+	getChild<LLUICtrl>("refresh_btn")->setCommitCallback(boost::bind(&RlvFloaterLocks::refreshAll, this));
+
+	return TRUE;
+}
+
 // Checked: 2010-03-11 (RLVa-1.2.0a) | Added: RLVa-1.2.0a
 void RlvFloaterLocks::onRlvCommand(const RlvCommand& rlvCmd, ERlvCmdRet eRet)
 {
@@ -267,12 +306,10 @@ void RlvFloaterLocks::onRlvCommand(const RlvCommand& rlvCmd, ERlvCmdRet eRet)
 	}
 }
 
-// Checked: 2010-03-18 (RLVa-1.2.0a) | Added: RLVa-1.2.0a
+// Checked: 2010-03-18 (RLVa-1.2.0)
 void RlvFloaterLocks::refreshAll()
 {
-	LLCtrlListInterface* pLockList = childGetListInterface("lock_list");
-	if (!pLockList)
-		return;
+	LLScrollListCtrl* pLockList = getChild<LLScrollListCtrl>("lock_list");
 	pLockList->operateOnAll(LLCtrlListInterface::OP_DELETE);
 
 	if (!isAgentAvatarValid())
@@ -361,6 +398,28 @@ void RlvFloaterLocks::refreshAll()
 
 		pLockList->addElement(sdRow, ADD_BOTTOM);
 	}
+
+	//
+	// List "nostrip" (soft) locks
+	//
+	sdColumns[1]["value"] = "nostrip";
+	sdColumns[3]["value"] = "(Agent)";
+
+	LLInventoryModel::cat_array_t folders; LLInventoryModel::item_array_t items;
+	LLFindWearablesEx f(true, true);
+	gInventory.collectDescendentsIf(LLAppearanceMgr::instance().getCOF(), folders, items, FALSE, f);
+
+	for (LLInventoryModel::item_array_t::const_iterator itItem = items.begin(); itItem != items.end(); ++itItem)
+	{
+		const LLViewerInventoryItem* pItem = *itItem;
+		if (!RlvForceWear::instance().isStrippable(pItem->getUUID()))
+		{
+			sdColumns[0]["value"] = rlvGetItemType(pItem);
+			sdColumns[2]["value"] = rlvGetItemName(pItem);
+
+			pLockList->addElement(sdRow, ADD_BOTTOM);
+		}
+	}
 }
 
 // ============================================================================
diff --git a/indra/newview/rlvfloaters.h b/indra/newview/rlvfloaters.h
index 179c33e206..e36e930b96 100644
--- a/indra/newview/rlvfloaters.h
+++ b/indra/newview/rlvfloaters.h
@@ -71,19 +71,15 @@ private:
 	 * LLFloater overrides
 	 */
 public:
-	virtual void onOpen(const LLSD& sdKey);
-	virtual void onClose(bool fQuitting);
-
-	/*
-	 * Event handlers
-	 */
-protected:
-	void onRlvCommand(const RlvCommand& rlvCmd, ERlvCmdRet eRet);
+	/*virtual*/ void onOpen(const LLSD& sdKey);
+	/*virtual*/ void onClose(bool fQuitting);
+	/*virtual*/ BOOL postBuild();
 
 	/*
 	 * Member functions
 	 */
 protected:
+	void onRlvCommand(const RlvCommand& rlvCmd, ERlvCmdRet eRet);
 	void refreshAll();
 
 	/*

From e65a4b323c90e4c0b9ec3eea92c96b86461e5bab Mon Sep 17 00:00:00 2001
From: Kitty Barnett <develop@catznip.com>
Date: Sun, 15 Jul 2012 00:06:48 +0200
Subject: [PATCH 05/13] - fixed : "nostrip" doesn't have any effect when placed
 in the name of a folder that's a direct descendant of the inventory root

--HG--
branch : RLVa
---
 indra/newview/rlvhelper.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/indra/newview/rlvhelper.cpp b/indra/newview/rlvhelper.cpp
index d506250701..17091ce6e2 100644
--- a/indra/newview/rlvhelper.cpp
+++ b/indra/newview/rlvhelper.cpp
@@ -698,13 +698,15 @@ bool RlvForceWear::isStrippable(const LLInventoryItem* pItem)
 		}
 
 		LLViewerInventoryCategory* pFolder = gInventory.getCategory(pItem->getParentUUID());
-		while ( (pFolder) && (gInventory.getRootFolderID() != pFolder->getParentUUID()) )
+		while (pFolder)
 		{
 			if (std::string::npos != pFolder->getName().find(RLV_FOLDER_FLAG_NOSTRIP))
 				return false;
 			// If the item's parent is a folded folder then we need to check its parent as well
-			pFolder = 
-				(RlvInventory::isFoldedFolder(pFolder, true)) ? gInventory.getCategory(pFolder->getParentUUID()) : NULL;
+			if ( (gInventory.getRootFolderID() != pFolder->getParentUUID()) && (RlvInventory::isFoldedFolder(pFolder, true)) )
+				pFolder = gInventory.getCategory(pFolder->getParentUUID());
+			else
+				pFolder = NULL;
 		}
 	}
 	return true;

From 71af1b0f7a1271adc15b0a94420ee129e6661724 Mon Sep 17 00:00:00 2001
From: Kitty Barnett <develop@catznip.com>
Date: Sat, 28 Jul 2012 16:41:01 +0200
Subject: [PATCH 06/13] - fixed : crash when executing @*this from an
 attachment that hasn't rezzed for the viewer yet

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

diff --git a/indra/newview/rlvhelper.cpp b/indra/newview/rlvhelper.cpp
index 17091ce6e2..a37f9daabc 100644
--- a/indra/newview/rlvhelper.cpp
+++ b/indra/newview/rlvhelper.cpp
@@ -228,7 +228,7 @@ RlvCommandOptionGetPath::RlvCommandOptionGetPath(const RlvCommand& rlvCmd)
 	else if (rlvCmdOption.isEmpty())			// ... or it can be empty (in which case we act on the object that issued the command)
 	{
 		const LLViewerObject* pObj = gObjectList.findObject(rlvCmd.getObjectID());
-		if ( (pObj) || (pObj->isAttachment()) )
+		if ( (pObj) && (pObj->isAttachment()) )
 			m_idItems.push_back(pObj->getAttachmentItemID());
 	}
 	else										// ... but anything else isn't a valid option

From 0a4364c1038eb100d8011a2ec21ea64c12749005 Mon Sep 17 00:00:00 2001
From: Kitty Barnett <develop@catznip.com>
Date: Sat, 28 Jul 2012 17:11:24 +0200
Subject: [PATCH 07/13] - fixed : only one wearable of each type is worn when
 @addoutfit=n restricted during log-on     -> repro: set
 "ForceInitialCOFDelay" to 60 seconds before logging in while wearing multiple
 wearables of the same type

--HG--
branch : RLVa
---
 indra/newview/llagentwearables.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/indra/newview/llagentwearables.cpp b/indra/newview/llagentwearables.cpp
index d79bb9f223..9d31b8f624 100644
--- a/indra/newview/llagentwearables.cpp
+++ b/indra/newview/llagentwearables.cpp
@@ -1505,7 +1505,7 @@ void LLAgentWearables::setWearableOutfit(const LLInventoryItem::item_array_t& it
 //				pushWearable(type,new_wearable);
 //			}
 // [RLVa:KB] - Checked: 2010-06-08 (RLVa-1.2.0g) | Added: RLVa-1.2.0g
-			else if ( (!rlv_handler_t::isEnabled()) || (!gRlvWearableLocks.hasLockedWearable(type)) || (!remove) )
+			else if ( (!rlv_handler_t::isEnabled()) || (gRlvWearableLocks.canWear(type)) || (!remove) )
 			{
 				// Sanity check: there shouldn't be any worn wearables for this type the first time we encounter it
 				RLV_ASSERT( (!remove) || (0 != idxCurPerType[type]) || (0 == getWearableCount(type)) );
@@ -1519,7 +1519,7 @@ void LLAgentWearables::setWearableOutfit(const LLInventoryItem::item_array_t& it
 				{
 					// Skip adding if @addoutfit=n restricted *unless* the wearable made it into COF [see LLAppMgr::updateAgentWearables()]
 					if ( (RLV_WEAR_LOCKED == gRlvWearableLocks.canWear(type)) && 
-						 (!gInventory.isObjectDescendentOf(new_item->getUUID(), LLAppearanceMgr::instance().getCOF())) )
+						 (!LLAppearanceMgr::instance().isLinkInCOF(new_wearable->getItemID())) )
 					{
 						continue;
 					}

From 843d218675fe7a8817d13894210ff55d3c2f95be Mon Sep 17 00:00:00 2001
From: Kitty Barnett <develop@catznip.com>
Date: Sat, 28 Jul 2012 17:50:59 +0200
Subject: [PATCH 08/13] - changed : visually disable "Take Off" and "Detach" on
 the wearing panel context menu

--HG--
branch : RLVa
---
 indra/newview/llpanelappearancetab.cpp |  9 +++++++++
 indra/newview/llpanelwearing.cpp       | 20 ++++++++++++++++++++
 2 files changed, 29 insertions(+)

diff --git a/indra/newview/llpanelappearancetab.cpp b/indra/newview/llpanelappearancetab.cpp
index 8fa8867c69..fdb331163b 100644
--- a/indra/newview/llpanelappearancetab.cpp
+++ b/indra/newview/llpanelappearancetab.cpp
@@ -32,6 +32,10 @@
 #include "llinventoryfunctions.h"
 #include "llinventorymodel.h"
 #include "llviewerinventory.h"
+// [RLVa:KB] - Checked: 2012-07-08 (RLVa-1.4.7)
+#include "rlvcommon.h"
+#include "rlvhandler.h"
+// [/RLVa:KB]
 
 //virtual
 bool LLPanelAppearanceTab::canTakeOffSelected()
@@ -46,6 +50,11 @@ bool LLPanelAppearanceTab::canTakeOffSelected()
 		LLViewerInventoryItem* item = gInventory.getItem(*it);
 		if (!item) continue;
 
+// [RLVa:KB] - Checked: 2012-07-08 (RLVa-1.4.7)
+		if ( (rlv_handler_t::isEnabled()) && (rlvPredCanNotRemoveItem(item)) )
+			return false;
+// [/RLVa:KB]
+
 		if (is_worn(NULL, item)) return true;
 	}
 	return false;
diff --git a/indra/newview/llpanelwearing.cpp b/indra/newview/llpanelwearing.cpp
index 3b9934d4be..bc1db9505e 100644
--- a/indra/newview/llpanelwearing.cpp
+++ b/indra/newview/llpanelwearing.cpp
@@ -40,6 +40,10 @@
 #include "llwearableitemslist.h"
 #include "llsdserialize.h"
 #include "llclipboard.h"
+// [RLVa:KB] - Checked: 2012-07-28 (RLVa-1.4.7)
+#include "rlvcommon.h"
+#include "rlvhandler.h"
+// [/RLVa:KB]
 
 // Context menu and Gear menu helper.
 static void edit_outfit()
@@ -115,6 +119,9 @@ protected:
 		bool bp_selected			= false;	// true if body parts selected
 		bool clothes_selected		= false;
 		bool attachments_selected	= false;
+// [RLVa:KB] - Checked: 2012-07-28 (RLVa-1.4.7)
+		S32 rlv_locked_count = 0;
+// [/RLVa:KB]
 
 		// See what types of wearables are selected.
 		for (uuid_vec_t::const_iterator it = mUUIDs.begin(); it != mUUIDs.end(); ++it)
@@ -140,14 +147,27 @@ protected:
 			{
 				attachments_selected = true;
 			}
+// [RLVa:KB] - Checked: 2012-07-28 (RLVa-1.4.7)
+			if ( (rlv_handler_t::isEnabled()) && (!rlvPredCanRemoveItem(item)) )
+			{
+				rlv_locked_count++;
+			}
+// [/RLVa:KB]
 		}
 
 		// Enable/disable some menu items depending on the selection.
+// [RLVa:KB] - Checked: 2012-07-28 (RLVa-1.4.7)
+		bool rlv_blocked = (mUUIDs.size() == rlv_locked_count);
+// [/RLVa:KB]
 		bool allow_detach = !bp_selected && !clothes_selected && attachments_selected;
 		bool allow_take_off = !bp_selected && clothes_selected && !attachments_selected;
 
 		menu->setItemVisible("take_off",	allow_take_off);
 		menu->setItemVisible("detach",		allow_detach);
+// [RLVa:KB] - Checked: 2012-07-28 (RLVa-1.4.7)
+		menu->setItemEnabled("take_off",	!rlv_blocked);
+		menu->setItemEnabled("detach",		!rlv_blocked);
+// [/RLVa:KB]
 		menu->setItemVisible("edit_outfit_separator", allow_take_off || allow_detach);
 	}
 };

From 23b8d758f286d016bee96dffad9fb177404d3a00 Mon Sep 17 00:00:00 2001
From: Kitty Barnett <develop@catznip.com>
Date: Sat, 28 Jul 2012 18:50:19 +0200
Subject: [PATCH 09/13] - internal : refactored handling of & fixed several
 issues relating to script permissions   -> re-enabled the script caution
 question notification since we're piggy-backing on it   -> notify when we're
 granting take controls (see notify_cautioned_script_question)   -> always
 notify when we block attach when all attachment points are add-locked

--HG--
branch : RLVa
---
 indra/newview/llviewermessage.cpp | 98 +++++++++++++++++++++----------
 1 file changed, 66 insertions(+), 32 deletions(-)

diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 776189a6f9..904b477807 100755
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -6263,7 +6263,11 @@ void notify_cautioned_script_question(const LLSD& notification, const LLSD& resp
 		std::string perms;
 		for (S32 i = 0; i < SCRIPT_PERMISSION_EOF; i++)
 		{
-			if ((orig_questions & LSCRIPTRunTimePermissionBits[i]) && SCRIPT_QUESTION_IS_CAUTION[i])
+//			if ((orig_questions & LSCRIPTRunTimePermissionBits[i]) && SCRIPT_QUESTION_IS_CAUTION[i])
+// [RLVa:KB] - Checked: 2012-07-28 (RLVa-1.4.7)
+			if ( (orig_questions & LSCRIPTRunTimePermissionBits[i]) && 
+				 ((SCRIPT_QUESTION_IS_CAUTION[i]) || (notification["payload"]["rlv_notify"].asBoolean())) )
+// [/RLVa:KB]
 			{
 				count++;
 				caution = TRUE;
@@ -6283,11 +6287,25 @@ void notify_cautioned_script_question(const LLSD& notification, const LLSD& resp
 
 		// log a chat message as long as at least one requested permission
 		// is a caution permission
+// [RLVa:KB] - Checked: 2012-07-28 (RLVa-1.4.7)
 		if (caution)
 		{
-			LLChat chat(notice.getString());
-	//		LLFloaterChat::addChat(chat, FALSE, FALSE);
+			LLNearbyChat* nearby_chat = LLNearbyChat::getInstance();
+			if(nearby_chat)
+			{
+				LLChat chat_msg(notice.getString());
+				chat_msg.mFromName = SYSTEM_FROM;
+				chat_msg.mFromID = LLUUID::null;
+				chat_msg.mSourceType = CHAT_SOURCE_SYSTEM;
+				nearby_chat->addMessage(chat_msg);
+			}
 		}
+// [/RLVa:KB]
+//		if (caution)
+//		{
+//			LLChat chat(notice.getString());
+//	//		LLFloaterChat::addChat(chat, FALSE, FALSE);
+//		}
 	}
 }
 
@@ -6333,12 +6351,22 @@ bool script_question_cb(const LLSD& notification, const LLSD& response)
 	msg->sendReliable(LLHost(notification["payload"]["sender"].asString()));
 
 	// only log a chat message if caution prompts are enabled
-	if (gSavedSettings.getBOOL("PermissionsCautionEnabled"))
+//	if (gSavedSettings.getBOOL("PermissionsCautionEnabled"))
+// [RLVa:KB] - Checked: 2012-07-28 (RLVa-1.4.7)
+	if ( (gSavedSettings.getBOOL("PermissionsCautionEnabled")) || (notification["payload"]["rlv_notify"].asBoolean()) )
+// [/RLVa:KB]
 	{
 		// log a chat message, if appropriate
 		notify_cautioned_script_question(notification, response, orig, allowed);
 	}
 
+// [RLVa:KB] - Checked: 2012-07-28 (RLVa-1.4.7)
+	if ( (allowed) && (notification["payload"].has("rlv_blocked")) )
+	{
+		RlvUtil::notifyBlocked(notification["payload"]["rlv_blocked"], LLSD().with("OBJECT", notification["payload"]["object_name"]));
+	}
+// [/RLVa:KB]
+
 	if ( response["Mute"] ) // mute
 	{
 		LLMuteList::getInstance()->add(LLMute(item_id, notification["payload"]["object_name"].asString(), LLMute::OBJECT));
@@ -6456,42 +6484,48 @@ void process_script_question(LLMessageSystem *msg, void **user_data)
 		payload["object_name"] = object_name;
 		payload["owner_name"] = owner_name;
 
-// [RLVa:KB] - Checked: 2011-07-25 (RLVa-1.4.0a) | Added: RLVa-1.4.0a
-		if ( (rlv_handler_t::isEnabled()) && (!gRlvAttachmentLocks.canAttach()) )
+// [RLVa:KB] - Checked: 2012-07-28 (RLVa-1.4.7)
+		if (rlv_handler_t::isEnabled())
 		{
-			// If only the attachment permission is requested we'll auto-deny it; otherwise let the user decide over remaining permissions
-			if (LSCRIPTRunTimePermissionBits[SCRIPT_PERMISSION_ATTACH] == questions)
+			if ( (!gRlvAttachmentLocks.canAttach()) && (LSCRIPTRunTimePermissionBits[SCRIPT_PERMISSION_ATTACH] & questions) )
 			{
-				RlvUtil::notifyBlocked(RLV_STRING_BLOCKED_PERMATTACH, LLSD().with("OBJECT", object_name));
-				LLNotifications::instance().forceResponse(
-					LLNotification::Params("ScriptQuestion").substitutions(args).payload(payload), 1/*NO*/);
-				return;
+				// Notify the user that we blocked it since they're not allowed to wear any new attachments
+				payload["rlv_blocked"] = RLV_STRING_BLOCKED_PERMATTACH;
+				// If only attach is requested we'll auto-deny it; otherwise let the user decide over remaining permissions
+				if (LSCRIPTRunTimePermissionBits[SCRIPT_PERMISSION_ATTACH] == questions)
+				{
+					payload["questions"] = 0;
+					LLNotifications::instance().forceResponse(
+						LLNotification::Params("ScriptQuestion").substitutions(args).payload(payload), 0/*YES*/);
+					return;
+				}
+				else
+				{
+					questions &= ~LSCRIPTRunTimePermissionBits[SCRIPT_PERMISSION_ATTACH];		
+					payload["questions"] = questions;
+				}
 			}
-			else
-			{
-				questions &= ~LSCRIPTRunTimePermissionBits[SCRIPT_PERMISSION_ATTACH];		
-				payload["questions"] = questions;
-			}
-		}
-// [/RLVa:KB]
-// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g) | Modified: RLVa-0.2.0e
-		S32 rlvQuestionsOther = questions;
 
-		if (gRlvHandler.hasBehaviour(RLV_BHVR_ACCEPTPERMISSION))
-		{
-			const LLViewerObject* pObj = gObjectList.findObject(taskid);
-			if (pObj)
+			if (gRlvHandler.hasBehaviour(RLV_BHVR_ACCEPTPERMISSION))
 			{
-//				if (pObj->permYouOwner())
-//				{
-					// PERMISSION_TAKE_CONTROLS and PERMISSION_ATTACH are only auto-granted to objects this avie owns
-					rlvQuestionsOther &= ~(LSCRIPTRunTimePermissionBits[SCRIPT_PERMISSION_TAKE_CONTROLS] | 
-						LSCRIPTRunTimePermissionBits[SCRIPT_PERMISSION_ATTACH]);
-//				}
+				const LLViewerObject* pObj = gObjectList.findObject(taskid);
+				if (pObj)
+				{
+					if ( (pObj->permYouOwner()) && (!pObj->isAttachment()) )
+					{
+						questions &= ~(LSCRIPTRunTimePermissionBits[SCRIPT_PERMISSION_TAKE_CONTROLS] | 
+							LSCRIPTRunTimePermissionBits[SCRIPT_PERMISSION_ATTACH]);
+					}
+					else
+					{
+						questions &= ~(LSCRIPTRunTimePermissionBits[SCRIPT_PERMISSION_TAKE_CONTROLS]);
+					}
+					payload["rlv_notify"] = !pObj->permYouOwner();
+				}
 			}
 		}
 
-		if ( (!caution) && (!rlvQuestionsOther) )
+		if ( (!caution) && (!questions) )
 		{
 			LLNotifications::instance().forceResponse(
 				LLNotification::Params("ScriptQuestion").substitutions(args).payload(payload), 0/*YES*/);

From 08468379021e20d417502b7bf35701961e9258a3 Mon Sep 17 00:00:00 2001
From: Kitty Barnett <develop@catznip.com>
Date: Sat, 28 Jul 2012 20:26:19 +0200
Subject: [PATCH 10/13] - internal : properly support @*this=force from the LSL
 attach() event

--HG--
branch : RLVa
---
 indra/newview/llvoavatarself.cpp | 23 +++++++++++
 indra/newview/llvoavatarself.h   |  8 ++++
 indra/newview/rlvcommon.cpp      |  2 +
 indra/newview/rlvdefines.h       |  1 +
 indra/newview/rlvhandler.cpp     | 24 ++++++++----
 indra/newview/rlvhandler.h       |  1 +
 indra/newview/rlvhelper.cpp      | 65 ++++++++++++++++++++++++++++++--
 indra/newview/rlvhelper.h        |  5 ++-
 8 files changed, 117 insertions(+), 12 deletions(-)

diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp
index 5a9ed353dc..573a422f3f 100644
--- a/indra/newview/llvoavatarself.cpp
+++ b/indra/newview/llvoavatarself.cpp
@@ -133,6 +133,9 @@ LLVOAvatarSelf::LLVOAvatarSelf(const LLUUID& id,
 							   const LLPCode pcode,
 							   LLViewerRegion* regionp) :
 	LLVOAvatar(id, pcode, regionp),
+// [RLVa:KB] - Checked: 2012-07-28 (RLVa-1.4.7)
+	mAttachmentSignal(NULL),
+// [/RLVa:KB]
 	mScreenp(NULL),
 	mLastRegionHandle(0),
 	mRegionCrossingCount(0)
@@ -552,6 +555,10 @@ void LLVOAvatarSelf::cleanup()
 LLVOAvatarSelf::~LLVOAvatarSelf()
 {
 	cleanup();
+
+// [RLVa:KB] - Checked: 2012-07-28 (RLVa-1.4.7)
+	delete mAttachmentSignal;
+// [/RLVa:KB]
 }
 
 /**
@@ -1122,6 +1129,14 @@ LLViewerObject* LLVOAvatarSelf::getWornAttachment(const LLUUID& inv_item_id)
 	return NULL;
 }
 
+// [RLVa:KB] - Checked: 2012-07-28 (RLVa-1.4.7)
+boost::signals2::connection LLVOAvatarSelf::setAttachmentCallback(const attachment_signal_t::slot_type& cb)
+{
+	if (!mAttachmentSignal)
+		mAttachmentSignal = new attachment_signal_t();
+	return mAttachmentSignal->connect(cb);
+}
+// [/RLVa:KB]
 // [RLVa:KB] - Checked: 2010-03-14 (RLVa-1.2.0a) | Modified: RLVa-1.2.0a
 LLViewerJointAttachment* LLVOAvatarSelf::getWornAttachmentPoint(const LLUUID& idItem) const
 {
@@ -1177,6 +1192,10 @@ const LLViewerJointAttachment *LLVOAvatarSelf::attachObject(LLViewerObject *view
 
 // [RLVa:KB] - Checked: 2010-08-22 (RLVa-1.2.1a) | Modified: RLVa-1.2.1a
 		// NOTE: RLVa event handlers should be invoked *after* LLVOAvatar::attachObject() calls LLViewerJointAttachment::addObject()
+		if (mAttachmentSignal)
+		{
+			(*mAttachmentSignal)(viewer_object, attachment, ACTION_ATTACH);
+		}
 		if (rlv_handler_t::isEnabled())
 		{
 			RlvAttachmentLockWatchdog::instance().onAttach(viewer_object, attachment);
@@ -1208,6 +1227,10 @@ BOOL LLVOAvatarSelf::detachObject(LLViewerObject *viewer_object)
 				RlvAttachmentLockWatchdog::instance().onDetach(viewer_object, pAttachPt);
 				gRlvHandler.onDetach(viewer_object, pAttachPt);
 			}
+			if (mAttachmentSignal)
+			{
+				(*mAttachmentSignal)(viewer_object, pAttachPt, ACTION_DETACH);
+			}
 		}
 	}
 // [/RLVa:KB]
diff --git a/indra/newview/llvoavatarself.h b/indra/newview/llvoavatarself.h
index 9cc7a422e4..cf100e873a 100644
--- a/indra/newview/llvoavatarself.h
+++ b/indra/newview/llvoavatarself.h
@@ -300,9 +300,17 @@ public:
 	/*virtual*/ BOOL 	detachObject(LLViewerObject *viewer_object);
 	static BOOL			detachAttachmentIntoInventory(const LLUUID& item_id);
 
+// [RLVa:KB] - Checked: 2012-07-28 (RLVa-1.4.7)
+	enum EAttachAction { ACTION_ATTACH, ACTION_DETACH };
+	typedef boost::signals2::signal<void (LLViewerObject*, const LLViewerJointAttachment*, EAttachAction)> attachment_signal_t;
+	boost::signals2::connection setAttachmentCallback(const attachment_signal_t::slot_type& cb);
+// [/RLVa:KB]
 private:
 	// Track attachments that have been requested but have not arrived yet.
 	mutable std::map<LLUUID,LLTimer> mAttachmentRequests;
+// [RLVa:KB] - Checked: 2012-07-28 (RLVa-1.4.7)
+	attachment_signal_t* mAttachmentSignal;
+// [/RLVa:KB]
 
 	//--------------------------------------------------------------------
 	// HUDs
diff --git a/indra/newview/rlvcommon.cpp b/indra/newview/rlvcommon.cpp
index e43905dff8..427ecb55cc 100644
--- a/indra/newview/rlvcommon.cpp
+++ b/indra/newview/rlvcommon.cpp
@@ -232,6 +232,8 @@ const char* RlvStrings::getStringFromReturnCode(ERlvCmdRet eRet)
 			return "unset";
 		case RLV_RET_SUCCESS_DUPLICATE:
 			return "duplicate";
+		case RLV_RET_SUCCESS_DELAYED:
+			return "delayed";
 		case RLV_RET_FAILED_SYNTAX:
 			return "thingy error";
 		case RLV_RET_FAILED_OPTION:
diff --git a/indra/newview/rlvdefines.h b/indra/newview/rlvdefines.h
index 5c4466f8dc..581b99a62c 100644
--- a/indra/newview/rlvdefines.h
+++ b/indra/newview/rlvdefines.h
@@ -243,6 +243,7 @@ enum ERlvCmdRet {
 	RLV_RET_SUCCESS		= 0x0100,	// Command executed succesfully
 	RLV_RET_SUCCESS_UNSET,			// Command executed succesfully (RLV_TYPE_REMOVE for an unrestricted behaviour)
 	RLV_RET_SUCCESS_DUPLICATE,		// Command executed succesfully (RLV_TYPE_ADD for an already restricted behaviour)
+	RLV_RET_SUCCESS_DELAYED,		// Command parsed valid but will execute at a later time
 	RLV_RET_FAILED		= 0x0200,	// Command failed (general failure)
 	RLV_RET_FAILED_SYNTAX,			// Command failed (syntax error)
 	RLV_RET_FAILED_OPTION,			// Command failed (invalid option)
diff --git a/indra/newview/rlvhandler.cpp b/indra/newview/rlvhandler.cpp
index 0e85efe212..39ccae1d98 100644
--- a/indra/newview/rlvhandler.cpp
+++ b/indra/newview/rlvhandler.cpp
@@ -1645,15 +1645,9 @@ ERlvCmdRet RlvHandler::processForceCommand(const RlvCommand& rlvCmd) const
 		case RLV_BHVR_ATTACHALLTHISOVER:
 		case RLV_BHVR_DETACHALLTHIS:
 			{
-				RlvCommandOptionGetPath rlvGetPathOption(rlvCmd);
+				RlvCommandOptionGetPath rlvGetPathOption(rlvCmd, boost::bind(&RlvHandler::onForceWearCallback, this, _1, rlvCmd.getBehaviourType()));
 				VERIFY_OPTION(rlvGetPathOption.isValid());
-
-				LLInventoryModel::cat_array_t folders;
-				if (RlvInventory::instance().getPath(rlvGetPathOption.getItemIDs(), folders))
-				{
-					for (S32 idxFolder = 0, cntFolder = folders.count(); idxFolder < cntFolder; idxFolder++)
-						onForceWear(folders.get(idxFolder), rlvCmd.getBehaviourType());
-				}
+				eRet = (!rlvGetPathOption.isCallback()) ? RLV_RET_SUCCESS : RLV_RET_SUCCESS_DELAYED;
 			}
 			break;
 		case RLV_BHVR_DETACHME:		// @detachme=force						- Checked: 2010-09-04 (RLVa-1.2.1c) | Modified: RLVa-1.2.1c
@@ -1811,6 +1805,20 @@ ERlvCmdRet RlvHandler::onForceWear(const LLViewerInventoryCategory* pFolder, ERl
 	return RLV_RET_SUCCESS;
 }
 
+void RlvHandler::onForceWearCallback(const uuid_vec_t& idItems, ERlvBehaviour eBhvr) const
+{
+	LLInventoryModel::cat_array_t folders;
+	if (RlvInventory::instance().getPath(idItems, folders))
+	{
+		for (S32 idxFolder = 0, cntFolder = folders.count(); idxFolder < cntFolder; idxFolder++)
+			onForceWear(folders.get(idxFolder), eBhvr);
+
+		// If we're not executing a command then we're a delayed callback and need to manually call done()
+		if ( (!getCurrentCommand()) && (RlvForceWear::instanceExists()) )
+			RlvForceWear::instance().done();
+	}
+}
+
 // ============================================================================
 // Command handlers (RLV_TYPE_REPLY)
 //
diff --git a/indra/newview/rlvhandler.h b/indra/newview/rlvhandler.h
index d8dc58b6f1..145b703b72 100644
--- a/indra/newview/rlvhandler.h
+++ b/indra/newview/rlvhandler.h
@@ -173,6 +173,7 @@ protected:
 	ERlvCmdRet onForceGroup(const RlvCommand& rlvCmd) const;
 	ERlvCmdRet onForceSit(const RlvCommand& rlvCmd) const;
 	ERlvCmdRet onForceWear(const LLViewerInventoryCategory* pFolder, ERlvBehaviour eBhvr) const;
+	void       onForceWearCallback(const uuid_vec_t& idItems, ERlvBehaviour eBhvr) const;
 	// Command handlers (RLV_TYPE_REPLY)
 	ERlvCmdRet processReplyCommand(const RlvCommand& rlvCmd) const;
 	ERlvCmdRet onFindFolder(const RlvCommand& rlvCmd, std::string& strReply) const;
diff --git a/indra/newview/rlvhelper.cpp b/indra/newview/rlvhelper.cpp
index a37f9daabc..817916b6ee 100644
--- a/indra/newview/rlvhelper.cpp
+++ b/indra/newview/rlvhelper.cpp
@@ -210,8 +210,52 @@ RlvCommandOptionGeneric::RlvCommandOptionGeneric(const std::string& strOption)
 	m_fValid = true;
 }
 
+// Checked: 2012-07-28 (RLVa-1.4.7)
+class RlvCommandOptionGetPathCallback
+{
+public:
+	RlvCommandOptionGetPathCallback(const LLUUID& idAttachObj, RlvCommandOptionGetPath::getpath_callback_t cb)
+		: mObjectId(idAttachObj), mCallback(cb)
+	{
+		if (isAgentAvatarValid())
+			mAttachmentConnection = gAgentAvatarp->setAttachmentCallback(boost::bind(&RlvCommandOptionGetPathCallback::onAttachment, this, _1, _3));
+		gIdleCallbacks.addFunction(&onIdle, this);
+	}
+
+	~RlvCommandOptionGetPathCallback()
+	{
+		if (mAttachmentConnection.connected())
+			mAttachmentConnection.disconnect();
+		gIdleCallbacks.deleteFunction(&onIdle, this);
+	}
+
+	void onAttachment(LLViewerObject* pAttachObj, LLVOAvatarSelf::EAttachAction eAction)
+	{
+		if ( (LLVOAvatarSelf::ACTION_ATTACH == eAction) && (pAttachObj->getID() == mObjectId) )
+		{
+			uuid_vec_t idItems(1, pAttachObj->getAttachmentItemID());
+			mCallback(idItems);
+			delete this;
+		}
+	}
+
+	static void onIdle(void* pData)
+	{
+		RlvCommandOptionGetPathCallback* pInstance = reinterpret_cast<RlvCommandOptionGetPathCallback*>(pData);
+		if (pInstance->mExpirationTimer.getElapsedTimeF32() > 30.0f)
+			delete pInstance;
+	}
+
+protected:
+	LLUUID                      mObjectId;
+	RlvCommandOptionGetPath::getpath_callback_t mCallback;
+	boost::signals2::connection mAttachmentConnection;
+	LLFrameTimer                mExpirationTimer;
+};
+
 // Checked: 2010-11-30 (RLVa-1.3.0b) | Modified: RLVa-1.3.0b
-RlvCommandOptionGetPath::RlvCommandOptionGetPath(const RlvCommand& rlvCmd)
+RlvCommandOptionGetPath::RlvCommandOptionGetPath(const RlvCommand& rlvCmd, getpath_callback_t cb)
+	: m_fCallback(false)
 {
 	m_fValid = true;	// Assume the option will be a valid one until we find out otherwise
 
@@ -228,12 +272,27 @@ RlvCommandOptionGetPath::RlvCommandOptionGetPath(const RlvCommand& rlvCmd)
 	else if (rlvCmdOption.isEmpty())			// ... or it can be empty (in which case we act on the object that issued the command)
 	{
 		const LLViewerObject* pObj = gObjectList.findObject(rlvCmd.getObjectID());
-		if ( (pObj) && (pObj->isAttachment()) )
-			m_idItems.push_back(pObj->getAttachmentItemID());
+		if (pObj)
+		{
+			if (pObj->isAttachment())
+				m_idItems.push_back(pObj->getAttachmentItemID());
+		}
+		else if (!cb.empty())
+		{
+			new RlvCommandOptionGetPathCallback(rlvCmd.getObjectID(), cb);
+			m_fCallback = true;
+			return;
+		}
 	}
 	else										// ... but anything else isn't a valid option
 	{
 		m_fValid = false;
+		return;
+	}
+
+	if (!cb.empty())
+	{
+		cb(getItemIDs());
 	}
 }
 
diff --git a/indra/newview/rlvhelper.h b/indra/newview/rlvhelper.h
index cb0275e375..2cf44f3de1 100644
--- a/indra/newview/rlvhelper.h
+++ b/indra/newview/rlvhelper.h
@@ -137,8 +137,10 @@ protected:
 
 struct RlvCommandOptionGetPath : public RlvCommandOption
 {
-	RlvCommandOptionGetPath(const RlvCommand& rlvCmd);
+	typedef boost::function<void(const uuid_vec_t&)> getpath_callback_t;
+	RlvCommandOptionGetPath(const RlvCommand& rlvCmd, getpath_callback_t cb = NULL);
 
+	bool              isCallback() const { return m_fCallback; }
 	/*virtual*/ bool  isEmpty() const	 { return m_idItems.empty(); }
 	const uuid_vec_t& getItemIDs() const { return m_idItems; }
 
@@ -146,6 +148,7 @@ struct RlvCommandOptionGetPath : public RlvCommandOption
 	static bool getItemIDs(LLWearableType::EType wtType, uuid_vec_t& idItems, bool fClear = true);
 
 protected:
+	bool       m_fCallback; // TRUE if a callback is schedueled
 	uuid_vec_t m_idItems;
 };
 

From c02a560a120f7c4d4933a3b1eb57640be112dbcc Mon Sep 17 00:00:00 2001
From: Kitty Barnett <develop@catznip.com>
Date: Sat, 28 Jul 2012 21:14:54 +0200
Subject: [PATCH 11/13] - internal : folder locks (and cached wearable and
 attachment locks due to folder locks) show in the locks debug floater

--HG--
branch : RLVa
---
 indra/newview/rlvfloaters.cpp | 130 ++++++++++++++++++++++++++++++++++
 indra/newview/rlvlocks.h      |   9 ++-
 2 files changed, 137 insertions(+), 2 deletions(-)

diff --git a/indra/newview/rlvfloaters.cpp b/indra/newview/rlvfloaters.cpp
index 82dc1d0572..3fd2ac27ae 100644
--- a/indra/newview/rlvfloaters.cpp
+++ b/indra/newview/rlvfloaters.cpp
@@ -97,6 +97,88 @@ bool rlvGetShowException(ERlvBehaviour eBhvr)
 	}
 }
 
+// Checked: 2012-07-29 (RLVa-1.4.7)
+std::string rlvLockMaskToString(ERlvLockMask eLockType)
+{
+	switch (eLockType)
+	{
+		case RLV_LOCK_ADD:
+			return "add";
+		case RLV_LOCK_REMOVE:
+			return "rem";
+		default:
+			return "unknown";
+	}
+}
+
+// Checked: 2012-07-29 (RLVa-1.4.7)
+std::string rlvFolderLockPermissionToString(RlvFolderLocks::ELockPermission eLockPermission)
+{
+	switch (eLockPermission)
+	{
+		case RlvFolderLocks::PERM_ALLOW:
+			return "allow";
+		case RlvFolderLocks::PERM_DENY:
+			return "deny";
+		default:
+			return "unknown";
+	}
+}
+
+// Checked: 2012-07-29 (RLVa-1.4.7)
+std::string rlvFolderLockScopeToString(RlvFolderLocks::ELockScope eLockScope)
+{
+	switch (eLockScope)
+	{
+		case RlvFolderLocks::SCOPE_NODE:
+			return "node";
+		case RlvFolderLocks::SCOPE_SUBTREE:
+			return "subtree";
+		default:
+			return "unknown";
+	}
+}
+
+// Checked: 2012-07-29 (RLVa-1.4.7)
+std::string rlvFolderLockSourceToTarget(RlvFolderLocks::folderlock_source_t lockSource)
+{
+	switch (lockSource.first)
+	{
+		case RlvFolderLocks::ST_ATTACHMENT:
+			{
+				std::string strAttachName = rlvGetItemNameFromObjID(boost::get<LLUUID>(lockSource.second));
+				return llformat("Attachment (%s)", strAttachName.c_str());
+			}
+		case RlvFolderLocks::ST_ATTACHMENTPOINT:
+			{
+				const LLViewerJointAttachment* pAttachPt = RlvAttachPtLookup::getAttachPoint(boost::get<S32>(lockSource.second));
+				return llformat("Attachment point (%s)", (pAttachPt) ? pAttachPt->getName().c_str() : "Unknown");
+			}
+		case RlvFolderLocks::ST_FOLDER:
+			{
+				return "Folder: <todo>";
+			}
+		case RlvFolderLocks::ST_ROOTFOLDER:
+			{
+				return "Root folder";
+			}
+		case RlvFolderLocks::ST_SHAREDPATH:
+			{
+				const std::string& strPath = boost::get<std::string>(lockSource.second);
+				return llformat("Shared path (#RLV%s%s)", (!strPath.empty()) ? "/" : "", strPath.c_str());
+			}
+		case RlvFolderLocks::ST_WEARABLETYPE:
+			{
+				const std::string& strTypeName = LLWearableType::getTypeName(boost::get<LLWearableType::EType>(lockSource.second));
+				return llformat("Wearable type (%s)", strTypeName.c_str());
+			}
+		default:
+			{
+				return "(Unknown)";
+			}
+	}
+}
+
 // ============================================================================
 // RlvFloaterBehaviours member functions
 //
@@ -420,6 +502,54 @@ void RlvFloaterLocks::refreshAll()
 			pLockList->addElement(sdRow, ADD_BOTTOM);
 		}
 	}
+
+	//
+	// List folder locks
+	//
+	{
+		// Folder lock descriptors
+		const RlvFolderLocks::folderlock_list_t& folderLocks = RlvFolderLocks::instance().getFolderLocks();
+		for (RlvFolderLocks::folderlock_list_t::const_iterator itFolderLock = folderLocks.begin(); 
+				itFolderLock != folderLocks.end(); ++itFolderLock)
+		{
+			const RlvFolderLocks::folderlock_descr_t* pLockDescr = *itFolderLock;
+			if (pLockDescr)
+			{
+				sdColumns[0]["value"] = "Folder Descriptor";
+				sdColumns[1]["value"] =
+					rlvLockMaskToString(pLockDescr->eLockType) + "/" +
+					rlvFolderLockPermissionToString(pLockDescr->eLockPermission) + "/" +
+					rlvFolderLockScopeToString(pLockDescr->eLockScope);
+				sdColumns[2]["value"] = rlvFolderLockSourceToTarget(pLockDescr->lockSource);
+				sdColumns[3]["value"] = rlvGetItemNameFromObjID(pLockDescr->idRlvObj);
+
+				pLockList->addElement(sdRow, ADD_BOTTOM);
+			}
+		}
+	}
+
+	{
+		// Folder locked attachments and wearables
+		uuid_vec_t idItems;
+		const uuid_vec_t& folderLockAttachmentsIds = RlvFolderLocks::instance().getAttachmentLookups();
+		idItems.insert(idItems.end(), folderLockAttachmentsIds.begin(), folderLockAttachmentsIds.end());
+		const uuid_vec_t& folderLockWearabels = RlvFolderLocks::instance().getWearableLookups();
+		idItems.insert(idItems.end(), folderLockWearabels.begin(), folderLockWearabels.end());
+
+		for (uuid_vec_t::const_iterator itItemId = idItems.begin(); itItemId != idItems.end(); ++itItemId)
+		{
+			const LLViewerInventoryItem* pItem = gInventory.getItem(*itItemId);
+			if (pItem)
+			{
+				sdColumns[0]["value"] = rlvGetItemType(pItem);
+				sdColumns[1]["value"] = rlvLockMaskToString(RLV_LOCK_REMOVE);
+				sdColumns[2]["value"] = rlvGetItemName(pItem);
+				sdColumns[3]["value"] = "<Folder Lock>";
+
+				pLockList->addElement(sdRow, ADD_BOTTOM);
+			}
+		}
+	}
 }
 
 // ============================================================================
diff --git a/indra/newview/rlvlocks.h b/indra/newview/rlvlocks.h
index 2dbfa4f082..31b4d23cc9 100644
--- a/indra/newview/rlvlocks.h
+++ b/indra/newview/rlvlocks.h
@@ -297,7 +297,7 @@ public:
 	// Specifies options for the folder lock
 	enum ELockPermission { PERM_ALLOW = 0x1, PERM_DENY = 0x2, PERM_MASK_ANY = 0x3 };
 	enum ELockScope	{ SCOPE_NODE, SCOPE_SUBTREE } ;
-protected:
+
 	struct folderlock_descr_t
 	{
 		LLUUID				idRlvObj;
@@ -360,9 +360,14 @@ protected:
 	/*
 	 * Member variables
 	 */
+public:
+	typedef std::list<const folderlock_descr_t*> folderlock_list_t;
+	// Accessors for RlvFloaterLocks
+	const folderlock_list_t& getFolderLocks() { return m_FolderLocks; }
+	const uuid_vec_t& getAttachmentLookups()  { return m_LockedAttachmentRem; }
+	const uuid_vec_t& getWearableLookups()    { return m_LockedWearableRem; }
 protected:
 	// Map of folder locks (idRlvObj -> lockDescr)
-	typedef std::list<const folderlock_descr_t*> folderlock_list_t;
 	folderlock_list_t	m_FolderLocks;			// List of add and remove locked folder descriptions
 	S32					m_cntLockAdd;			// Number of RLV_LOCK_ADD locked folders in m_FolderLocks
 	S32					m_cntLockRem;			// Number of RLV_LOCK_REMOVE locked folders in m_FolderLocks

From a07c084abff00e23befbec37fef39463a659518c Mon Sep 17 00:00:00 2001
From: Kitty Barnett <develop@catznip.com>
Date: Mon, 30 Jul 2012 19:54:21 +0200
Subject: [PATCH 12/13] - fixed : @attach:<folder>=force will only wear one of
 each wearable type     -> all wearables in the folder should always be worn
 regardless of replace vs add     ->
 @attach:<folder1>=force,attach:<folder2>=force wears all wearables in folder
 2 and only those wearables in folder 1 that aren't present in 2

--HG--
branch : RLVa
---
 indra/newview/rlvhelper.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/indra/newview/rlvhelper.cpp b/indra/newview/rlvhelper.cpp
index 817916b6ee..402d7eddcc 100644
--- a/indra/newview/rlvhelper.cpp
+++ b/indra/newview/rlvhelper.cpp
@@ -496,6 +496,9 @@ void RlvForceWear::forceFolder(const LLViewerInventoryCategory* pFolder, EWearAc
 	RlvWearableItemCollector f(pFolder, eAction, eFlags);
 	gInventory.collectDescendentsIf(pFolder->getUUID(), folders, items, FALSE, f, TRUE);
 
+	// TRUE if we've already encountered this LLWearableType::EType (used only on wear actions and only for AT_CLOTHING)
+	bool fSeenWType[LLWearableType::WT_COUNT] = { false };
+
 	EWearAction eCurAction = eAction;
 	for (S32 idxItem = 0, cntItem = items.count(); idxItem < cntItem; idxItem++)
 	{
@@ -509,6 +512,8 @@ void RlvForceWear::forceFolder(const LLViewerInventoryCategory* pFolder, EWearAc
 		// Each folder can specify its own EWearAction override
 		if (isWearAction(eAction))
 			eCurAction = f.getWearAction(pRlvItem->getParentUUID());
+		else
+			eCurAction = eAction;
 
 		//  NOTES: * if there are composite items then RlvWearableItemCollector made sure they can be worn (or taken off depending)
 		//         * some scripts issue @remattach=force,attach:worn-items=force so we need to attach items even if they're currently worn
@@ -519,6 +524,10 @@ void RlvForceWear::forceFolder(const LLViewerInventoryCategory* pFolder, EWearAc
 			case LLAssetType::AT_CLOTHING:
 				if (isWearAction(eAction))
 				{
+					// The first time we encounter any given clothing type we use 'eCurAction' (replace or add)
+					// The second time we encounter a given clothing type we'll always add (rather than replace the previous iteration)
+					eCurAction = (!fSeenWType[pItem->getWearableType()]) ? eCurAction : ACTION_WEAR_ADD;
+
 					ERlvWearMask eWearMask = gRlvWearableLocks.canWear(pRlvItem);
 					if ( ((ACTION_WEAR_REPLACE == eCurAction) && (eWearMask & RLV_WEAR_REPLACE)) ||
 						 ((ACTION_WEAR_ADD == eCurAction) && (eWearMask & RLV_WEAR_ADD)) )
@@ -526,6 +535,7 @@ void RlvForceWear::forceFolder(const LLViewerInventoryCategory* pFolder, EWearAc
 						// The check for whether we're replacing a currently worn composite item happens in onWearableArrived()
 						if (!isAddWearable(pItem))
 							addWearable(pRlvItem, eCurAction);
+						fSeenWType[pItem->getWearableType()] = true;
 					}
 				}
 				else

From c59f33eee8c68a1335271ec805cf1229dcd38859 Mon Sep 17 00:00:00 2001
From: Kitty Barnett <develop@catznip.com>
Date: Wed, 1 Aug 2012 17:31:13 +0200
Subject: [PATCH 13/13] - fixed : having a wearable type remove locked but not
 add locked triggers assertions     -> repro: @remoutfit:shoes=n while wearing
 shoes and then wear a shirt/jacket/... (or replace outfit)

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

diff --git a/indra/newview/llagentwearables.cpp b/indra/newview/llagentwearables.cpp
index 9d31b8f624..7f2abc570a 100644
--- a/indra/newview/llagentwearables.cpp
+++ b/indra/newview/llagentwearables.cpp
@@ -1505,7 +1505,8 @@ void LLAgentWearables::setWearableOutfit(const LLInventoryItem::item_array_t& it
 //				pushWearable(type,new_wearable);
 //			}
 // [RLVa:KB] - Checked: 2010-06-08 (RLVa-1.2.0g) | Added: RLVa-1.2.0g
-			else if ( (!rlv_handler_t::isEnabled()) || (gRlvWearableLocks.canWear(type)) || (!remove) )
+			else if ( (!rlv_handler_t::isEnabled()) || (!remove) || 
+			          ((gRlvWearableLocks.canWear(type)) && (!gRlvWearableLocks.hasLockedWearable(type))) )
 			{
 				// Sanity check: there shouldn't be any worn wearables for this type the first time we encounter it
 				RLV_ASSERT( (!remove) || (0 != idxCurPerType[type]) || (0 == getWearableCount(type)) );