Merge branch develop into project/fonts-update

# Conflicts:
#	indra/llrender/llfontfreetype.cpp

1 files changed, 19 insertions, 0 deletions

diff --git a/indra/llinventory/llfoldertype.cpp b/indra/llinventory/llfoldertype.cpp
index 7e1be17ecc..670405e9b5 100644
--- a/indra/llinventory/llfoldertype.cpp
+++ b/indra/llinventory/llfoldertype.cpp
@@ -29,6 +29,7 @@
 #include "llfoldertype.h"
 #include "lldictionary.h"
 #include "llmemory.h"
+#include "llsd.h"
 #include "llsingleton.h"
 
 ///----------------------------------------------------------------------------
@@ -220,3 +221,21 @@ const std::string &LLFolderType::badLookup()
     static const std::string sBadLookup = "llfoldertype_bad_lookup";
     return sBadLookup;
 }
+
+LLSD LLFolderType::getTypeNames()
+{
+    LLSD type_names;
+    for (S32 type = FT_TEXTURE; type < FT_COUNT; ++type)
+    {
+        if (lookupIsEnsembleType((LLFolderType::EType)type))
+            continue;
+
+        const FolderEntry* entry = LLFolderDictionary::getInstance()->lookup((LLFolderType::EType)type);
+        // skip llfoldertype_bad_lookup
+        if (entry)
+        {
+            type_names.append(entry->mName);
+        }
+    }
+    return type_names;
+}