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/llui.h | |
| parent | 9b1174243d3a264f296574329a73f945bf7165a7 (diff) | |
| parent | 1dfa63e73e29ccd1c5442a8984e5fcf4d3db5a65 (diff) | |
merge
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); }; } |