diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2011-07-19 17:26:12 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2011-07-19 17:26:12 -0700 |
| commit | 15f98992fa6634d2d980d193d349ca3c5cdb6a95 (patch) | |
| tree | dbfe28f95302fb6ee1ae0a7e19e4a2c44961771a /indra/llui/lluiimage.cpp | |
| parent | 9b1174243d3a264f296574329a73f945bf7165a7 (diff) | |
| parent | 1dfa63e73e29ccd1c5442a8984e5fcf4d3db5a65 (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); } } |