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/llui.h | |
| parent | 892ca49503884daf26cff671047409ced4386547 (diff) | |
| parent | 7dd8dc8be61ec40e33c40b9b37b8f45335df25c4 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
Diffstat (limited to 'indra/llui/llui.h')
| -rw-r--r-- | indra/llui/llui.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/llui/llui.h b/indra/llui/llui.h index c583d58d5a..4e622033b3 100644 --- a/indra/llui/llui.h +++ b/indra/llui/llui.h @@ -408,7 +408,7 @@ namespace LLInitParam ParamValue(const LLRect& value); void updateValueFromBlock(); - void updateBlockFromValue(); + void updateBlockFromValue(bool make_block_authoritative); }; template<> @@ -426,7 +426,7 @@ namespace LLInitParam ParamValue(const LLUIColor& color); void updateValueFromBlock(); - void updateBlockFromValue(); + void updateBlockFromValue(bool make_block_authoritative); }; template<> @@ -441,7 +441,7 @@ namespace LLInitParam ParamValue(const LLFontGL* value); void updateValueFromBlock(); - void updateBlockFromValue(); + void updateBlockFromValue(bool make_block_authoritative); }; template<> @@ -480,7 +480,7 @@ namespace LLInitParam ParamValue(const LLCoordGL& val); void updateValueFromBlock(); - void updateBlockFromValue(); + void updateBlockFromValue(bool make_block_authoritative); }; } |