From 3e80fa3dbc943de9b784fedc202ba38cf238f46d Mon Sep 17 00:00:00 2001
From: David Parks <davep@lindenlab.com>
Date: Mon, 2 Nov 2009 19:55:37 +0000
Subject: Sync up with render-pipeline-7 ignore-dead-branch

---
 indra/llinventory/llinventorytype.cpp | 7 +++++--
 indra/llinventory/llinventorytype.h   | 3 ++-
 2 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'indra/llinventory')

diff --git a/indra/llinventory/llinventorytype.cpp b/indra/llinventory/llinventorytype.cpp
index a445466b26..ae3cb2697b 100644
--- a/indra/llinventory/llinventorytype.cpp
+++ b/indra/llinventory/llinventorytype.cpp
@@ -96,7 +96,9 @@ LLInventoryDictionary::LLInventoryDictionary()
 	addEntry(LLInventoryType::IT_WEARABLE,            new InventoryEntry("wearable",  "wearable",      2, LLAssetType::AT_CLOTHING, LLAssetType::AT_BODYPART));
 	addEntry(LLInventoryType::IT_ANIMATION,           new InventoryEntry("animation", "animation",     1, LLAssetType::AT_ANIMATION));  
 	addEntry(LLInventoryType::IT_GESTURE,             new InventoryEntry("gesture",   "gesture",       1, LLAssetType::AT_GESTURE)); 
-	addEntry(LLInventoryType::IT_FAVORITE,            new InventoryEntry("favorite",  "favorite",      1, LLAssetType::AT_FAVORITE)); 
+	addEntry(LLInventoryType::IT_FAVORITE,            new InventoryEntry("favorite",  "favorite",      1, LLAssetType::AT_FAVORITE));
+	addEntry(LLInventoryType::IT_MESH,                new InventoryEntry("mesh",      "mesh",          1, LLAssetType::AT_MESH));
+
 }
 
 
@@ -132,7 +134,7 @@ DEFAULT_ASSET_FOR_INV_TYPE[LLAssetType::AT_COUNT] =
 
 	LLInventoryType::IT_NONE,			// AT_LINK
 	LLInventoryType::IT_NONE,			// AT_LINK_FOLDER
-
+	
 	LLInventoryType::IT_CATEGORY,		// AT_ENSEMBLE
 	LLInventoryType::IT_CATEGORY,		// AT_ENSEMBLE
 	LLInventoryType::IT_CATEGORY,		// AT_ENSEMBLE
@@ -157,6 +159,7 @@ DEFAULT_ASSET_FOR_INV_TYPE[LLAssetType::AT_COUNT] =
 	LLInventoryType::IT_CATEGORY,		// AT_CURRENT_OUTFIT
 	LLInventoryType::IT_CATEGORY,		// AT_OUTFIT
 	LLInventoryType::IT_CATEGORY,		// AT_MY_OUTFITS
+	LLInventoryType::IT_MESH,           // AT_MESH
 };
 
 // static
diff --git a/indra/llinventory/llinventorytype.h b/indra/llinventory/llinventorytype.h
index 14b28bfe4b..0d580d3000 100644
--- a/indra/llinventory/llinventorytype.h
+++ b/indra/llinventory/llinventorytype.h
@@ -68,7 +68,8 @@ public:
 		IT_ANIMATION = 19,
 		IT_GESTURE = 20,
 		IT_FAVORITE = 21,
-		IT_COUNT = 22,
+		IT_MESH = 22,
+		IT_COUNT = 23,
 
 		IT_NONE = -1
 	};
-- 
cgit v1.2.3


From bb72788392ea6d25adb045abd555419cd60c4888 Mon Sep 17 00:00:00 2001
From: Palmer <palmer@lindenlab.com>
Date: Thu, 12 Nov 2009 14:05:01 -0800
Subject: Fixes for mesh inventory type correctness.

---
 indra/llinventory/llinventorytype.cpp | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

(limited to 'indra/llinventory')

diff --git a/indra/llinventory/llinventorytype.cpp b/indra/llinventory/llinventorytype.cpp
index 2460a2777a..caf8e11929 100644
--- a/indra/llinventory/llinventorytype.cpp
+++ b/indra/llinventory/llinventorytype.cpp
@@ -125,7 +125,33 @@ DEFAULT_ASSET_FOR_INV_TYPE[LLAssetType::AT_COUNT] =
 
 	LLInventoryType::IT_NONE,			// AT_LINK
 	LLInventoryType::IT_NONE,			// AT_LINK_FOLDER
-	LLInventoryType::IT_MESH,           // AT_MESH
+
+	LLInventoryType::IT_NONE,			// AT_NONE
+	LLInventoryType::IT_NONE,			// AT_NONE
+	LLInventoryType::IT_NONE,			// AT_NONE
+	LLInventoryType::IT_NONE,			// AT_NONE
+	LLInventoryType::IT_NONE,			// AT_NONE
+	LLInventoryType::IT_NONE,			// AT_NONE
+	LLInventoryType::IT_NONE,			// AT_NONE
+	LLInventoryType::IT_NONE,			// AT_NONE
+	LLInventoryType::IT_NONE,			// AT_NONE
+	LLInventoryType::IT_NONE,			// AT_NONE
+	LLInventoryType::IT_NONE,			// AT_NONE
+	LLInventoryType::IT_NONE,			// AT_NONE
+	LLInventoryType::IT_NONE,			// AT_NONE
+	LLInventoryType::IT_NONE,			// AT_NONE
+	LLInventoryType::IT_NONE,			// AT_NONE
+	LLInventoryType::IT_NONE,			// AT_NONE
+	LLInventoryType::IT_NONE,			// AT_NONE
+	LLInventoryType::IT_NONE,			// AT_NONE
+	LLInventoryType::IT_NONE,			// AT_NONE
+	LLInventoryType::IT_NONE,			// AT_NONE
+	LLInventoryType::IT_NONE,			// AT_NONE
+	LLInventoryType::IT_NONE,			// AT_NONE
+	LLInventoryType::IT_NONE,			// AT_NONE
+	LLInventoryType::IT_NONE,			// AT_NONE
+	
+	LLInventoryType::IT_MESH            // AT_MESH
 };
 
 // static
-- 
cgit v1.2.3