From bcebf893a9a772e24cba036ee4cf2033a185f5c0 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Mon, 8 Dec 2008 15:28:04 -0600
Subject: LLInvFVBridge and derived classes have NTypes.

---
 linden/indra/newview/llinventorybridge.cpp |  1 +
 linden/indra/newview/llinventorybridge.h   | 11 ++++++++++-
 linden/indra/newview/llpanelinventory.cpp  |  1 +
 3 files changed, 12 insertions(+), 1 deletion(-)

(limited to 'linden')

diff --git a/linden/indra/newview/llinventorybridge.cpp b/linden/indra/newview/llinventorybridge.cpp
index 12670e2..bde36cc 100644
--- a/linden/indra/newview/llinventorybridge.cpp
+++ b/linden/indra/newview/llinventorybridge.cpp
@@ -722,6 +722,7 @@ LLInvFVBridge* LLInvFVBridge::createBridge(LLAssetType::EType asset_type,
 	if (new_listener)
 	{
 		new_listener->mInvType = inv_type;
+		new_listener->mNInvType = calc_ntype(inv_type, asset_type, flags);
 	}
 
 	return new_listener;
diff --git a/linden/indra/newview/llinventorybridge.h b/linden/indra/newview/llinventorybridge.h
index fc04b28..329e57f 100644
--- a/linden/indra/newview/llinventorybridge.h
+++ b/linden/indra/newview/llinventorybridge.h
@@ -192,7 +192,15 @@ public:
 	virtual BOOL dragOrDrop(MASK mask, BOOL drop,
 							EDragAndDropType cargo_type,
 							void* cargo_data) { return FALSE; }
-	virtual LLInventoryType::EType getInventoryType() const { return mInvType; }
+
+	virtual LLInventoryType::EType getInventoryType() const
+	{
+		return mInvType;
+	}
+	virtual LLInventoryType::NType getNInventoryType() const
+	{
+		return mNInvType;
+	}
 
 	// LLInvFVBridge functionality
 	virtual void clearDisplayName() {}
@@ -221,6 +229,7 @@ protected:
 	LLInventoryPanel* mInventoryPanel;
 	LLUUID mUUID;	// item id
 	LLInventoryType::EType mInvType;
+	LLInventoryType::NType mNInvType;
 };
 
 
diff --git a/linden/indra/newview/llpanelinventory.cpp b/linden/indra/newview/llpanelinventory.cpp
index 3c0e6d7..e41ecdc 100644
--- a/linden/indra/newview/llpanelinventory.cpp
+++ b/linden/indra/newview/llpanelinventory.cpp
@@ -146,6 +146,7 @@ public:
 	virtual BOOL isUpToDate() const { return TRUE; }
 	virtual BOOL hasChildren() const { return FALSE; }
 	virtual LLInventoryType::EType getInventoryType() const { return LLInventoryType::IT_NONE; }
+	virtual LLInventoryType::NType getNInventoryType() const { return LLInventoryType::NIT_NONE; }
 	// LLDragAndDropBridge functionality
 	virtual BOOL startDrag(EDragAndDropType* type, LLUUID* id) const;
 	virtual BOOL dragOrDrop(MASK mask, BOOL drop,
-- 
cgit v1.1