Merge with default branch

--HG--
branch : product-engine

2 files changed, 12 insertions, 2 deletions

diff --git a/indra/llcommon/lldictionary.h b/indra/llcommon/lldictionary.h
index 95178b41e7..4a2bfb9f3f 100644
--- a/indra/llcommon/lldictionary.h
+++ b/indra/llcommon/lldictionary.h
@@ -76,11 +76,16 @@ public:
 				return dictionary_iter->first;
 			}
 		}
-		llassert(false);
-		return Index(-1);
+		return notFound();
 	}
 
 protected:
+	virtual Index notFound() const
+	{
+		// default is to assert
+		llassert(false);
+		return Index(-1);
+	}
 	void addEntry(Index index, Entry *entry)
 	{
 		if (lookup(index))
diff --git a/indra/llcommon/llfoldertype.cpp b/indra/llcommon/llfoldertype.cpp
index 079e670b1a..2610fe9e6a 100644
--- a/indra/llcommon/llfoldertype.cpp
+++ b/indra/llcommon/llfoldertype.cpp
@@ -59,6 +59,11 @@ class LLFolderDictionary : public LLSingleton<LLFolderDictionary>,
 {
 public:
 	LLFolderDictionary();
+protected:
+	virtual LLFolderType::EType notFound() const
+	{
+		return LLFolderType::FT_NONE;
+	}
 };
 
 LLFolderDictionary::LLFolderDictionary()