diff options
| author | Richard Nelson <none@none> | 2010-08-16 14:59:06 -0700 |
|---|---|---|
| committer | Richard Nelson <none@none> | 2010-08-16 14:59:06 -0700 |
| commit | 1fe2cb24f4288840fd682cae8274c193d66a1886 (patch) | |
| tree | 0c9c4de5fb6f6b3b4032ae2499293347d5af6975 /indra/llxuixml/llinitparam.cpp | |
| parent | 720b29b1b42fb16ecff835bc1a103bc66499ab94 (diff) | |
fixed slicing problem with paramblocks where block descriptors are invalid after copying a derived block type to a base block value.
Diffstat (limited to 'indra/llxuixml/llinitparam.cpp')
| -rw-r--r-- | indra/llxuixml/llinitparam.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/indra/llxuixml/llinitparam.cpp b/indra/llxuixml/llinitparam.cpp index 8d6aa405e2..99191d2dbe 100644 --- a/indra/llxuixml/llinitparam.cpp +++ b/indra/llxuixml/llinitparam.cpp @@ -84,8 +84,7 @@ namespace LLInitParam // BaseBlock // BaseBlock::BaseBlock() - : mChangeVersion(0), - mBlockDescriptor(NULL) + : mChangeVersion(0) {} BaseBlock::~BaseBlock() @@ -94,8 +93,6 @@ namespace LLInitParam // called by each derived class in least to most derived order void BaseBlock::init(BlockDescriptor& descriptor, BlockDescriptor& base_descriptor, size_t block_size) { - mBlockDescriptor = &descriptor; - descriptor.mCurrentBlockPtr = this; descriptor.mMaxParamOffset = block_size; |