diff options
| author | Richard Nelson <richard@lindenlab.com> | 2011-09-30 16:57:08 -0700 |
|---|---|---|
| committer | Richard Nelson <richard@lindenlab.com> | 2011-09-30 16:57:08 -0700 |
| commit | 09e179b2381a4db03309839babae664feb9b0886 (patch) | |
| tree | 415517eb2195cc2e9d624273fd65836045420a8d /indra/llui/lltextbase.h | |
| parent | 788c5cdf978e6844663c1d3734fc5d604de5e7cb (diff) | |
param block cleanup
added Flag as value type
moved Batch to BatchBlock
renamed Choice to ChoiceBlock
made merging of parameters for ValueParams consistent (fillFrom and overwriteFrom are inverses of each other now)
made iteration over Multiple<T> type params easier
initial schema param blocks
Diffstat (limited to 'indra/llui/lltextbase.h')
| -rw-r--r-- | indra/llui/lltextbase.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/lltextbase.h b/indra/llui/lltextbase.h index 7d545a1ba6..384d9116fc 100644 --- a/indra/llui/lltextbase.h +++ b/indra/llui/lltextbase.h @@ -237,7 +237,7 @@ public: friend class LLNormalTextSegment; friend class LLUICtrlFactory; - struct LineSpacingParams : public LLInitParam::Choice<LineSpacingParams> + struct LineSpacingParams : public LLInitParam::ChoiceBlock<LineSpacingParams> { Alternative<F32> multiple; Alternative<S32> pixels; |