diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-10-25 09:34:06 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-10-25 09:34:06 -0400 |
| commit | 7c08ddb3f748d2173948335fd799879e3d58d81c (patch) | |
| tree | 1f72cc9ec78d7b8c4bad57f4ef14c12a04b7a3a0 /indra/llui/lltextbase.h | |
| parent | 1f172281453171175dea76fc469a358e1e932b60 (diff) | |
| parent | 444bdef6d4949b6381b8706ab056588bc6bd88eb (diff) | |
merge
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; |