summaryrefslogtreecommitdiff
path: root/indra/llinventory/llsettingsbase.h
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2021-01-13 20:47:20 +0200
committerAndrey Kleshchev <andreykproductengine@lindenlab.com>2021-01-13 20:47:20 +0200
commitebffbd3c9a41b7c44b719f76a054abfd38e19709 (patch)
tree25f80d38ddc505338849a5379a6636ecfac2f11f /indra/llinventory/llsettingsbase.h
parent663e45c7eade823e4eb88195057333cbd37e0b00 (diff)
SL-14575 Pass validation flags into EEP validators.
Diffstat (limited to 'indra/llinventory/llsettingsbase.h')
-rw-r--r--indra/llinventory/llsettingsbase.h20
1 files changed, 10 insertions, 10 deletions
diff --git a/indra/llinventory/llsettingsbase.h b/indra/llinventory/llsettingsbase.h
index f7a9d5b7cd..1f0589f571 100644
--- a/indra/llinventory/llsettingsbase.h
+++ b/indra/llinventory/llsettingsbase.h
@@ -270,7 +270,7 @@ public:
public:
static const U32 VALIDATION_PARTIAL;
- typedef boost::function<bool(LLSD &)> verify_pr;
+ typedef boost::function<bool(LLSD &, U32)> verify_pr;
Validator(std::string name, bool required, LLSD::Type type, verify_pr verify = verify_pr(), LLSD defval = LLSD()) :
mName(name),
@@ -287,15 +287,15 @@ public:
bool verify(LLSD &data, U32 flags);
// Some basic verifications
- static bool verifyColor(LLSD &value);
- static bool verifyVector(LLSD &value, S32 length);
- static bool verifyVectorMinMax(LLSD &value, LLSD minvals, LLSD maxvals);
- static bool verifyVectorNormalized(LLSD &value, S32 length);
- static bool verifyQuaternion(LLSD &value);
- static bool verifyQuaternionNormal(LLSD &value);
- static bool verifyFloatRange(LLSD &value, LLSD range);
- static bool verifyIntegerRange(LLSD &value, LLSD range);
- static bool verifyStringLength(LLSD &value, S32 length);
+ static bool verifyColor(LLSD &value, U32 flags);
+ static bool verifyVector(LLSD &value, U32 flags, S32 length);
+ static bool verifyVectorMinMax(LLSD &value, U32 flags, LLSD minvals, LLSD maxvals);
+ static bool verifyVectorNormalized(LLSD &value, U32 flags, S32 length);
+ static bool verifyQuaternion(LLSD &value, U32 flags);
+ static bool verifyQuaternionNormal(LLSD &value, U32 flags);
+ static bool verifyFloatRange(LLSD &value, U32 flags, LLSD range);
+ static bool verifyIntegerRange(LLSD &value, U32 flags, LLSD range);
+ static bool verifyStringLength(LLSD &value, U32 flags, S32 length);
private:
std::string mName;