From 7ef10fe11c0221ae4ac1a46eae378aafc178296d Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Tue, 12 Nov 2019 14:47:13 -0500 Subject: 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). --- indra/llcommon/llerror.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra') 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" -- cgit v1.2.3