diff options
| author | Dave SIMmONs <simon@lindenlab.com> | 2010-11-05 13:30:20 -0700 |
|---|---|---|
| committer | Dave SIMmONs <simon@lindenlab.com> | 2010-11-05 13:30:20 -0700 |
| commit | 447dc782fd4d490387fd98e9fb41135038512767 (patch) | |
| tree | b7875f5dd54d4068d777adbe90a3dd36b99a38eb /indra/llcommon/lldictionary.h | |
| parent | d5d4a065275d1db1093111222f29942ee171f81c (diff) | |
| parent | 124a59263184391b0b4ec418c532b7a715e9b5a3 (diff) | |
Merge latest from lindenlab/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) |