4 files changed, 16 insertions, 5 deletions
diff --git a/indra/newview/llconversationmodel.h b/indra/newview/llconversationmodel.h
index 3b70b9a568..478daadfda 100644
--- a/indra/newview/llconversationmodel.h
+++ b/indra/newview/llconversationmodel.h
@@ -80,6 +80,8 @@ public:
 	virtual LLFontGL::StyleFlags getLabelStyle() const { return LLFontGL::NORMAL; }
 	virtual std::string getLabelSuffix() const { return LLStringUtil::null; }
     virtual bool isFavorite() const { return false; }
+    virtual bool isAgentInventory() const { return false; }
+    virtual bool isAgentInventoryRoot() const { return false; }
 	virtual BOOL isItemRenameable() const { return TRUE; }
 	virtual BOOL renameItem(const std::string& new_name) { mName = new_name; mNeedsRefresh = true; return TRUE; }
 	virtual BOOL isItemMovable( void ) const { return FALSE; }
diff --git a/indra/newview/llfolderviewmodelinventory.h b/indra/newview/llfolderviewmodelinventory.h
index 1649b2eed7..2459cc4f2c 100644
--- a/indra/newview/llfolderviewmodelinventory.h
+++ b/indra/newview/llfolderviewmodelinventory.h
@@ -47,7 +47,8 @@ public:
 	virtual void showProperties(void) = 0;
 	virtual BOOL isItemInTrash( void) const { return FALSE; } // TODO: make   into pure virtual.
     virtual bool isItemInOutfits() const { return false; }
-	virtual BOOL isAgentInventory() const { return FALSE; }
+	virtual bool isAgentInventory() const { return false; }
+    virtual bool isAgentInventoryRoot() const { return false; }
 	virtual BOOL isUpToDate() const = 0;
     virtual void addChild(LLFolderViewModelItem* child);
 	virtual bool hasChildren() const = 0;
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 5620523f24..1f91ef2772 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -1335,7 +1335,7 @@ BOOL LLInvFVBridge::isLinkedObjectMissing() const
 	return FALSE;
 }
 
-BOOL LLInvFVBridge::isAgentInventory() const
+bool LLInvFVBridge::isAgentInventory() const
 {
 	const LLInventoryModel* model = getInventoryModel();
 	if(!model) return FALSE;
@@ -1343,6 +1343,13 @@ BOOL LLInvFVBridge::isAgentInventory() const
 	return model->isObjectDescendentOf(mUUID, gInventory.getRootFolderID());
 }
 
+bool LLInvFVBridge::isAgentInventoryRoot() const
+{
+    const LLInventoryModel* model = getInventoryModel();
+    if(!model) return false;
+    return gInventory.getRootFolderID() == mUUID;
+}
+
 BOOL LLInvFVBridge::isCOFFolder() const
 {
 	return LLAppearanceMgr::instance().getIsInCOF(mUUID);
@@ -7868,7 +7875,7 @@ protected:
 	BOOL isItemInTrash() const;
 	// return true if the item is in agent inventory. if false, it
 	// must be lost or in the inventory library.
-	BOOL isAgentInventory() const;
+	bool isAgentInventory() const;
 	void wearOnAvatar();
 };
 
@@ -7879,7 +7886,7 @@ BOOL LLWearableBridgeAction::isItemInTrash() const
 	return mModel->isObjectDescendentOf(mUUID, trash_id);
 }
 
-BOOL LLWearableBridgeAction::isAgentInventory() const
+bool LLWearableBridgeAction::isAgentInventory() const
 {
 	if(!mModel) return FALSE;
 	if(gInventory.getRootFolderID() == mUUID) return TRUE;
diff --git a/indra/newview/llinventorybridge.h b/indra/newview/llinventorybridge.h
index 39cd393fdd..5100da15cd 100644
--- a/indra/newview/llinventorybridge.h
+++ b/indra/newview/llinventorybridge.h
@@ -172,7 +172,8 @@ protected:
 	BOOL isLinkedObjectInTrash() const; // Is this obj or its baseobj in the trash?
 	BOOL isLinkedObjectMissing() const; // Is this a linked obj whose baseobj is not in inventory?
 
-	BOOL isAgentInventory() const; // false if lost or in the inventory library
+	bool isAgentInventory() const; // false if lost or in the inventory library
+    bool isAgentInventoryRoot() const; // true if worn by agent
 	BOOL isCOFFolder() const;       // true if COF or descendant of
 	BOOL isInboxFolder() const;     // true if COF or descendant of   marketplace inbox