summaryrefslogtreecommitdiff
path: root/indra/llxuixml/llinitparam.h
diff options
context:
space:
mode:
authorcallum <none@none>2010-12-22 15:22:43 -0800
committercallum <none@none>2010-12-22 15:22:43 -0800
commitfa776d805437a89bcd322513ce43e702853f5f1b (patch)
treed20fbea8008160e03cc1cfc0970a8d314098d5e2 /indra/llxuixml/llinitparam.h
parent064bdb00908f7b36e5ce65db28c7bd0ee9c9c0eb (diff)
parentc86d6a7bbb7c0db7665b76cf52b12b90c6e98c6d (diff)
Merge with tip of viewer-development
Diffstat (limited to 'indra/llxuixml/llinitparam.h')
-rw-r--r--indra/llxuixml/llinitparam.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/llxuixml/llinitparam.h b/indra/llxuixml/llinitparam.h
index 8cb5bd80fc..1f9045754a 100644
--- a/indra/llxuixml/llinitparam.h
+++ b/indra/llxuixml/llinitparam.h
@@ -278,6 +278,9 @@ namespace LLInitParam
S32 mParseGeneration;
};
+ // used to indicate no matching value to a given name when parsing
+ struct NoParamValue{};
+
class BaseBlock;
class Param
@@ -303,8 +306,8 @@ namespace LLInitParam
private:
friend class BaseBlock;
- bool mIsProvided;
U16 mEnclosingBlockOffset;
+ bool mIsProvided;
};
// various callbacks and constraints associated with an individual param