diff options
| author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-10-27 15:17:20 -0400 |
|---|---|---|
| committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-10-27 15:17:20 -0400 |
| commit | fa220db72a2d0b7cef665cdab53c07cdf4eac4cf (patch) | |
| tree | 3007ca2d839d04ef16692ddbaa59cdd6bf6877af /indra/llui/lltextbase.h | |
| parent | fae5abfd0903f09f1485f1f10ebea410ae4f9845 (diff) | |
| parent | d2af1ae8b09d76ee50a9a67a0f42fbfd6657d816 (diff) | |
merge up from viewer-pre-beta
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; |