diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2019-11-12 14:47:13 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2020-03-25 19:06:13 -0400 |
| commit | 7ef10fe11c0221ae4ac1a46eae378aafc178296d (patch) | |
| tree | 88ab337983d4b91195ad4fc8d24e88ed5926f31d /indra/llcommon | |
| parent | 9c315851a3e1451b151f7d6d3e8bf93791c39f80 (diff) | |
DRTVWR-476: Don't test configuration.emptyMap().
LLSD::emptyMap() is a factory for an empty map instance, NOT a predicate on
any particular instance. In fact checking configuration.isUndefined() and
testing whether the map is empty are both subsumed by (! configuration).
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/llerror.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llerror.cpp b/indra/llcommon/llerror.cpp index 2ae2cb6cbc..9a475464f4 100644 --- a/indra/llcommon/llerror.cpp +++ b/indra/llcommon/llerror.cpp @@ -436,7 +436,7 @@ namespace return false; } - if (configuration.isUndefined() || !configuration.isMap() || configuration.emptyMap()) + if (! configuration || !configuration.isMap()) { LL_WARNS() << filename() << " missing, ill-formed, or simply undefined" " content; not changing configuration" |