diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2010-12-09 11:07:50 -0500 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2010-12-09 11:07:50 -0500 |
| commit | b9cf73c29b4b87a391c78415e4c09c31b4ac045c (patch) | |
| tree | d843f4e78bc6874001cb81fc993cc59d0a179a83 /indra/llcommon/lldictionary.h | |
| parent | a59c43f1adff35107e59fdfc3016d4329324bbaf (diff) | |
| parent | d9b4570883652d647c05083c18fac1a088efd6e2 (diff) | |
merge from http://hg.secondlife.com/viewer-development
Diffstat (limited to 'indra/llcommon/lldictionary.h')
| -rw-r--r-- | indra/llcommon/lldictionary.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llcommon/lldictionary.h b/indra/llcommon/lldictionary.h index 552a805b70..bc3bc3e74a 100644 --- a/indra/llcommon/lldictionary.h +++ b/indra/llcommon/lldictionary.h @@ -78,7 +78,9 @@ protected: virtual Index notFound() const { // default is to assert - llassert(false); + // don't assert -- makes it impossible to work on mesh-development and viewer-development simultaneously + // -- davep 2010.10.29 + //llassert(false); return Index(-1); } void addEntry(Index index, Entry *entry) |