diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-11-04 18:10:29 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-11-04 18:10:29 -0700 |
| commit | 4bbe823302427a705ea541d968f6058571a13c2f (patch) | |
| tree | d932a7a3483b674a7600b0e4bff3d0bda3344b35 /indra/llcommon/lldictionary.h | |
| parent | ba3307b8d0f2ceb40454174a6593f3f98ce98b65 (diff) | |
| parent | f7af29ab40c2405504969a453eba3919be1af5c5 (diff) | |
merge with STORM-105
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) |