diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-08-04 15:39:33 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-08-04 15:39:33 -0400 |
| commit | f42df4cd9fe8eb9e4a778dc9e5fdf94b4d6cfb59 (patch) | |
| tree | 837c1eebc58b227f7049ee857fa6bd8fbbd25121 /indra/llui/lluiimage.cpp | |
| parent | 94c171d89bae06d0bc259255a917db892019c369 (diff) | |
| parent | 0b81c19cbe809f041e628da334c305ea33fae2e9 (diff) | |
merge changes for storm-1538
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); } } |