diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-22 15:18:08 -0800 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-22 15:18:08 -0800 |
| commit | 9e0920df2c8ada63397ea6e439b02ee5b40d1bf6 (patch) | |
| tree | 26f6af13d1dcd9d02c48bd7897b3604481f3734c /indra/llcommon | |
| parent | b96e52b72ab598a57d981c850b5f14b1ac406325 (diff) | |
| parent | 4cf79224d099c4fc8bdfd9617e95a776d5a028d4 (diff) | |
Merge from v2 trunk.
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/lldictionary.h | 9 | ||||
| -rw-r--r-- | indra/llcommon/llerrorlegacy.h | 4 | ||||
| -rw-r--r-- | indra/llcommon/llfoldertype.cpp | 5 |
3 files changed, 16 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/llerrorlegacy.h b/indra/llcommon/llerrorlegacy.h index 7a970b1466..9920921a58 100644 --- a/indra/llcommon/llerrorlegacy.h +++ b/indra/llcommon/llerrorlegacy.h @@ -75,6 +75,10 @@ const int LL_ERR_PRICE_MISMATCH = -23018; #define SHOW_ASSERT #else // _DEBUG +#ifdef LL_RELEASE_WITH_DEBUG_INFO +#define SHOW_ASSERT +#endif // LL_RELEASE_WITH_DEBUG_INFO + #ifdef RELEASE_SHOW_DEBUG #define SHOW_DEBUG #endif diff --git a/indra/llcommon/llfoldertype.cpp b/indra/llcommon/llfoldertype.cpp index b5e1977cf0..16ae4cddde 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() |