summaryrefslogtreecommitdiff
path: root/indra/llinventory
diff options
context:
space:
mode:
authorGraham Linden <graham@lindenlab.com>2018-06-06 19:48:12 +0100
committerGraham Linden <graham@lindenlab.com>2018-06-06 19:48:12 +0100
commitcaa5bd3cb9f22a42de9fc1f37bb98b17e2405b5b (patch)
treedae7aec5a510f94e7ccc52bf38541e4a4441790b /indra/llinventory
parent5b4eb9fb93af87cbbe163ad6f87d98362a963389 (diff)
Fix legacy haze validation returning warnings as errors.
Add assert that calculated spans are > 0 to avoid div by 0 NaNs. Make span calc return 1.0 for case where begin == end. Fix order of ops in LLTrackBlenderLoopingTime ctor causing skies to be init'd with water instances.
Diffstat (limited to 'indra/llinventory')
-rw-r--r--indra/llinventory/llsettingssky.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llinventory/llsettingssky.cpp b/indra/llinventory/llsettingssky.cpp
index 263e721d00..4763215cff 100644
--- a/indra/llinventory/llsettingssky.cpp
+++ b/indra/llinventory/llsettingssky.cpp
@@ -226,7 +226,7 @@ bool validateLegacyHaze(LLSD &value)
}
if (result["warnings"].size() > 0)
{
- LL_WARNS("SETTINGS") << "Legacy Haze Config Validation warnings: " << result["errors"] << LL_ENDL;
+ LL_WARNS("SETTINGS") << "Legacy Haze Config Validation warnings: " << result["warnings"] << LL_ENDL;
return false;
}
return true;