summaryrefslogtreecommitdiff
path: root/indra/llcommon/lldictionary.h
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2010-11-12 17:34:30 -0500
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2010-11-12 17:34:30 -0500
commit3ea3d4cf16894c928cd60c19429dbec158185f96 (patch)
treec6331ca9eb06764e1d8109b6d90002ee34507d04 /indra/llcommon/lldictionary.h
parentd9c0e0ba74d3f042ae7f3a7310f0c0bf23e6eaa9 (diff)
parent63466f0ecae64cad8d2f74ccd1ade29121a26a95 (diff)
merge
Diffstat (limited to 'indra/llcommon/lldictionary.h')
-rw-r--r--indra/llcommon/lldictionary.h4
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)