diff options
| author | Richard Linden <none@none> | 2011-07-14 20:58:04 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-07-14 20:58:04 -0700 |
| commit | 1dfa63e73e29ccd1c5442a8984e5fcf4d3db5a65 (patch) | |
| tree | fc4af0ca9ff97f7541e366907b449373625b4598 /indra/llui/lluiimage.cpp | |
| parent | 892ca49503884daf26cff671047409ced4386547 (diff) | |
| parent | 7dd8dc8be61ec40e33c40b9b37b8f45335df25c4 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
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); } } |