Merge

2 files changed, 3 insertions, 1 deletions

diff --git a/indra/llinventory/llinventorytype.cpp b/indra/llinventory/llinventorytype.cpp
index 458adc9edd..853ed655f5 100644
--- a/indra/llinventory/llinventorytype.cpp
+++ b/indra/llinventory/llinventorytype.cpp
@@ -190,7 +190,7 @@ LLInventoryType::EType LLInventoryType::defaultForAssetType(LLAssetType::EType a
 	}
 	else
 	{
-		return IT_NONE;
+		return IT_UNKNOWN;
 	}
 }
 
diff --git a/indra/llinventory/llinventorytype.h b/indra/llinventory/llinventorytype.h
index 8f2267307b..72092b1d8b 100644
--- a/indra/llinventory/llinventorytype.h
+++ b/indra/llinventory/llinventorytype.h
@@ -67,6 +67,7 @@ public:
         IT_SETTINGS = 25,
 		IT_COUNT = 26,
 
+		IT_UNKNOWN = 255,
 		IT_NONE = -1
 	};
 
@@ -117,6 +118,7 @@ public:
         ICONNAME_SETTINGS_DAY,
 
 		ICONNAME_INVALID,
+		ICONNAME_UNKNOWN,
 		ICONNAME_COUNT,
 		ICONNAME_NONE = -1
 	};