diff options
| author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-08-22 17:18:34 -0400 |
|---|---|---|
| committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-08-22 17:18:34 -0400 |
| commit | 015cf59c96a4613996fc34b898fe9751f27f9c8c (patch) | |
| tree | 412a776e4bb8ae72960ea02d40ea7c98be1c1065 /indra/llui/lluiimage.cpp | |
| parent | f99cf295e1d7e297996d4ea32a2202273010d8a3 (diff) | |
| parent | b73291e9bd6a706c5c8913f1c40bd8324f772c4a (diff) | |
merged .hgtags
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); } } |