diff options
| author | Logan Dethrow <log@lindenlab.com> | 2011-08-08 18:09:11 -0400 |
|---|---|---|
| committer | Logan Dethrow <log@lindenlab.com> | 2011-08-08 18:09:11 -0400 |
| commit | 1fa2afbe2007690612f360eff3603a353ee95672 (patch) | |
| tree | bd5a48c23a2280afcd0115cc6dd1d70764162b1c /indra/llui/lluiimage.cpp | |
| parent | fe14e50a45a450cd7bcdfe73a8bbda03c018053f (diff) | |
| parent | 4ab5831b3eed23c06d2ccd3cf55f6c018613c788 (diff) | |
merge
Diffstat (limited to 'indra/llui/lluiimage.cpp')
| -rw-r--r-- | indra/llui/lluiimage.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llui/lluiimage.cpp b/indra/llui/lluiimage.cpp index f37947a50b..1d9ce29ba9 100644 --- a/indra/llui/lluiimage.cpp +++ b/indra/llui/lluiimage.cpp @@ -172,15 +172,15 @@ namespace LLInitParam } } - void ParamValue<LLUIImage*, TypeValues<LLUIImage*> >::updateBlockFromValue() + void ParamValue<LLUIImage*, TypeValues<LLUIImage*> >::updateBlockFromValue(bool make_block_authoritative) { if (getValue() == NULL) { - name.set("none", false); + name.set("none", make_block_authoritative); } else { - name.set(getValue()->getName(), false); + name.set(getValue()->getName(), make_block_authoritative); } } |