diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-03 16:08:44 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-03 16:08:44 +0000 |
| commit | a171848fd4fed2fe915bcb42de96359112cf95e1 (patch) | |
| tree | 5f4d85f4469f2d737864b3a07b367fa81040f3a3 /indra/llxuixml/llinitparam.cpp | |
| parent | cc5920bed7790db49a062fb98ce54191f06ed98c (diff) | |
| parent | fc70ca5403acdd99b2235dbf4e513a4dd806c850 (diff) | |
merge from viewer2.
Diffstat (limited to 'indra/llxuixml/llinitparam.cpp')
| -rw-r--r-- | indra/llxuixml/llinitparam.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/indra/llxuixml/llinitparam.cpp b/indra/llxuixml/llinitparam.cpp index d908c85da6..fb0a04dc58 100644 --- a/indra/llxuixml/llinitparam.cpp +++ b/indra/llxuixml/llinitparam.cpp @@ -84,8 +84,7 @@ namespace LLInitParam // BaseBlock // BaseBlock::BaseBlock() - : mLastChangedParam(0), - mChangeVersion(0), + : mChangeVersion(0), mBlockDescriptor(NULL) {} @@ -348,7 +347,6 @@ namespace LLInitParam if (deserialize_func && deserialize_func(*paramp, p, name_stack, name_stack.first == name_stack.second ? -1 : name_stack.first->second)) { - mLastChangedParam = (*it)->mParamHandle; return true; } } @@ -417,9 +415,11 @@ namespace LLInitParam void BaseBlock::setLastChangedParam(const Param& last_param, bool user_provided) { - mLastChangedParam = getHandleFromParam(&last_param); + if (user_provided) + { mChangeVersion++; } + } const std::string& BaseBlock::getParamName(const BlockDescriptor& block_data, const Param* paramp) const { @@ -472,7 +472,6 @@ namespace LLInitParam { Param* paramp = getParamFromHandle(it->mParamHandle); param_changed |= merge_func(*paramp, *other_paramp, true); - mLastChangedParam = it->mParamHandle; } } return param_changed; @@ -493,7 +492,6 @@ namespace LLInitParam { Param* paramp = getParamFromHandle(it->mParamHandle); param_changed |= merge_func(*paramp, *other_paramp, false); - mLastChangedParam = it->mParamHandle; } } return param_changed; |