diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2012-07-28 09:48:18 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2012-07-28 09:48:18 -0400 |
commit | f37d109e251a273a1b620c416cef3991981e6184 (patch) | |
tree | 66403f3d3585d214137666e0cf5eeb656ee84df2 /indra/llui/lltextbase.cpp | |
parent | fd7bfb03c946b0190bf0965e19b1b679eac3c383 (diff) | |
parent | 27cbfef0269146eb296bbd2b810a6d331e5cb7d2 (diff) |
Automated merge with ssh://hg.lindenlab.com/nat/viewer-maint-1175
Diffstat (limited to 'indra/llui/lltextbase.cpp')
-rw-r--r-- | indra/llui/lltextbase.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp index 8314386632..7aeeae298f 100644 --- a/indra/llui/lltextbase.cpp +++ b/indra/llui/lltextbase.cpp @@ -131,7 +131,7 @@ struct LLTextBase::line_end_compare // // register LLTextBase::Params under name "textbase" -static LLWidgetNameRegistry::StaticRegistrar sRegisterTextBaseParams(typeid(LLTextBase::Params).name(), "textbase"); +static LLWidgetNameRegistry::StaticRegistrar sRegisterTextBaseParams(&typeid(LLTextBase::Params), "textbase"); LLTextBase::LineSpacingParams::LineSpacingParams() : multiple("multiple", 1.f), |