diff options
| author | Richard Linden <none@none> | 2011-07-07 13:34:13 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-07-07 13:34:13 -0700 |
| commit | 88a90aabcb5bdede24bb451d443239e1e116c4ea (patch) | |
| tree | 9399a4aefc1a9017986e1c29f9c9077d6e3c74c7 /indra/llxuixml/llinitparam.h | |
| parent | 66dcc72870b19c6ada65a643ca33c779c9c9989b (diff) | |
| parent | 8f7579e4e46bb8da9fece3125ae31c3bb885be96 (diff) | |
Automated merge with http://hg.secondlife.com/viewer-development
Diffstat (limited to 'indra/llxuixml/llinitparam.h')
| -rw-r--r-- | indra/llxuixml/llinitparam.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/llxuixml/llinitparam.h b/indra/llxuixml/llinitparam.h index a853999e94..35c889b69f 100644 --- a/indra/llxuixml/llinitparam.h +++ b/indra/llxuixml/llinitparam.h @@ -34,6 +34,8 @@ #include <boost/unordered_map.hpp> #include <boost/shared_ptr.hpp> +#include "llerror.h" + namespace LLInitParam { template<typename T> const T& defaultValue() { static T value; return value; } @@ -302,8 +304,9 @@ namespace LLInitParam private: friend class BaseBlock; - U16 mEnclosingBlockOffset; - bool mIsProvided; + U32 mEnclosingBlockOffset:31; + U32 mIsProvided:1; + }; // various callbacks and constraints associated with an individual param |