diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-03-19 15:25:22 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-03-19 15:25:22 -0400 |
| commit | 6807214bb988e09e678534f23c8380e811df8831 (patch) | |
| tree | fc030ee780f7c929c70d7a65d0343fa57b2c739d /indra/llui/tests/llurlmatch_test.cpp | |
| parent | ca17a74f1848b16b8a4f2412ed093aef4bad5830 (diff) | |
| parent | 04e78ce4fdd3bbc0e4daa1daabbff2de1c425601 (diff) | |
merge changes for 3.5.0-beta3 (chui)
Diffstat (limited to 'indra/llui/tests/llurlmatch_test.cpp')
| -rw-r--r-- | indra/llui/tests/llurlmatch_test.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/indra/llui/tests/llurlmatch_test.cpp b/indra/llui/tests/llurlmatch_test.cpp index 963473c92a..109d3ca7bb 100644 --- a/indra/llui/tests/llurlmatch_test.cpp +++ b/indra/llui/tests/llurlmatch_test.cpp @@ -63,14 +63,14 @@ S32 LLUIImage::getHeight() const namespace LLInitParam { - ParamValue<LLUIColor, TypeValues<LLUIColor> >::ParamValue(const LLUIColor& color) + ParamValue<LLUIColor>::ParamValue(const LLUIColor& color) : super_t(color) {} - void ParamValue<LLUIColor, TypeValues<LLUIColor> >::updateValueFromBlock() + void ParamValue<LLUIColor>::updateValueFromBlock() {} - void ParamValue<LLUIColor, TypeValues<LLUIColor> >::updateBlockFromValue(bool) + void ParamValue<LLUIColor>::updateBlockFromValue(bool) {} bool ParamCompare<const LLFontGL*, false>::equals(const LLFontGL* a, const LLFontGL* b) @@ -79,14 +79,14 @@ namespace LLInitParam } - ParamValue<const LLFontGL*, TypeValues<const LLFontGL*> >::ParamValue(const LLFontGL* fontp) + ParamValue<const LLFontGL*>::ParamValue(const LLFontGL* fontp) : super_t(fontp) {} - void ParamValue<const LLFontGL*, TypeValues<const LLFontGL*> >::updateValueFromBlock() + void ParamValue<const LLFontGL*>::updateValueFromBlock() {} - void ParamValue<const LLFontGL*, TypeValues<const LLFontGL*> >::updateBlockFromValue(bool) + void ParamValue<const LLFontGL*>::updateBlockFromValue(bool) {} void TypeValues<LLFontGL::HAlign>::declareValues() @@ -98,10 +98,10 @@ namespace LLInitParam void TypeValues<LLFontGL::ShadowType>::declareValues() {} - void ParamValue<LLUIImage*, TypeValues<LLUIImage*> >::updateValueFromBlock() + void ParamValue<LLUIImage*>::updateValueFromBlock() {} - void ParamValue<LLUIImage*, TypeValues<LLUIImage*> >::updateBlockFromValue(bool) + void ParamValue<LLUIImage*>::updateBlockFromValue(bool) {} bool ParamCompare<LLUIImage*, false>::equals( |