diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2010-01-22 14:05:37 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2010-01-22 14:05:37 -0800 |
| commit | 4cf79224d099c4fc8bdfd9617e95a776d5a028d4 (patch) | |
| tree | 3ab15a28494eaf1e8b008e33245070fa4af30890 /indra/llcommon | |
| parent | c66053220183d120134734510b416bb02c3ea80f (diff) | |
| parent | 5a83247f038e327465bf88127f60750306507ed3 (diff) | |
Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/lldictionary.h | 9 | ||||
| -rw-r--r-- | indra/llcommon/llfoldertype.cpp | 5 |
2 files changed, 12 insertions, 2 deletions
diff --git a/indra/llcommon/lldictionary.h b/indra/llcommon/lldictionary.h index 8c86a8560e..4a2bfb9f3f 100644 --- a/indra/llcommon/lldictionary.h +++ b/indra/llcommon/lldictionary.h @@ -76,11 +76,16 @@ public: return dictionary_iter->first; } } - llwarns << "Lookup on " << name << " failed" << llendl; - 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() |