diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-02-25 21:20:45 -0800 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-02-25 21:20:45 -0800 |
| commit | 5c73a908353cdd7210e3148f7162d30afab7873a (patch) | |
| tree | 3ff858042b69b20a9eb3062b7cabd0c390e1b5cf /indra/llxuixml | |
| parent | 9b05fecbf6b3d65dae5a010fc35821dc116a44d0 (diff) | |
| parent | 5eee046bb7d62e24df6c35018b3c5383f87ab587 (diff) | |
automated merge
Diffstat (limited to 'indra/llxuixml')
| -rw-r--r-- | indra/llxuixml/llinitparam.cpp | 3 | ||||
| -rw-r--r-- | indra/llxuixml/llinitparam.h | 18 |
2 files changed, 12 insertions, 9 deletions
diff --git a/indra/llxuixml/llinitparam.cpp b/indra/llxuixml/llinitparam.cpp index 4c050844f8..d908c85da6 100644 --- a/indra/llxuixml/llinitparam.cpp +++ b/indra/llxuixml/llinitparam.cpp @@ -85,7 +85,8 @@ namespace LLInitParam // BaseBlock::BaseBlock() : mLastChangedParam(0), - mChangeVersion(0) + mChangeVersion(0), + mBlockDescriptor(NULL) {} BaseBlock::~BaseBlock() diff --git a/indra/llxuixml/llinitparam.h b/indra/llxuixml/llinitparam.h index 7e1e4a3d21..a84e47f998 100644 --- a/indra/llxuixml/llinitparam.h +++ b/indra/llxuixml/llinitparam.h @@ -321,13 +321,13 @@ namespace LLInitParam typedef bool(*validation_func_t)(const Param*); ParamDescriptor(param_handle_t p, - merge_func_t merge_func, - deserialize_func_t deserialize_func, - serialize_func_t serialize_func, - validation_func_t validation_func, - inspect_func_t inspect_func, - S32 min_count, - S32 max_count) + merge_func_t merge_func, + deserialize_func_t deserialize_func, + serialize_func_t serialize_func, + validation_func_t validation_func, + inspect_func_t inspect_func, + S32 min_count, + S32 max_count) : mParamHandle(p), mMergeFunc(merge_func), mDeserializeFunc(deserialize_func), @@ -336,6 +336,7 @@ namespace LLInitParam mInspectFunc(inspect_func), mMinCount(min_count), mMaxCount(max_count), + mGeneration(0), mNumRefs(0) {} @@ -371,7 +372,8 @@ namespace LLInitParam public: BlockDescriptor() : mMaxParamOffset(0), - mInitializationState(UNINITIALIZED) + mInitializationState(UNINITIALIZED), + mCurrentBlockPtr(NULL) {} typedef enum e_initialization_state |