diff options
| author | Richard Linden <none@none> | 2010-02-12 17:08:10 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-02-12 17:08:10 -0800 |
| commit | 7c86d4434822d7a3172bed82c3812032089c1518 (patch) | |
| tree | 2d88ba7cea57adb2dc6bd92992ac8de1f5587806 /indra | |
| parent | e2ea636fe9a922380e65dccdacdd6a98afef8c29 (diff) | |
potential fix for bad font names
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llui/llui.cpp | 10 | ||||
| -rw-r--r-- | indra/llui/lluiimage.h | 1 |
2 files changed, 9 insertions, 2 deletions
diff --git a/indra/llui/llui.cpp b/indra/llui/llui.cpp index 76f07373b4..9d5953e380 100644 --- a/indra/llui/llui.cpp +++ b/indra/llui/llui.cpp @@ -1894,7 +1894,9 @@ namespace LLInitParam blue("blue"), alpha("alpha"), control("") - {} + { + setBlockFromValue(); + } void TypedParam<LLUIColor>::setValueFromBlock() const { @@ -1940,6 +1942,7 @@ namespace LLInitParam style("style") { addSynonym(name, ""); + setBlockFromValue(); } void TypedParam<const LLFontGL*>::setValueFromBlock() const @@ -1979,7 +1982,9 @@ namespace LLInitParam bottom("bottom"), width("width"), height("height") - {} + { + setBlockFromValue(); + } void TypedParam<LLRect>::setValueFromBlock() const { @@ -2064,6 +2069,7 @@ namespace LLInitParam x("x"), y("y") { + setBlockFromValue(); } void TypedParam<LLCoordGL>::setValueFromBlock() const diff --git a/indra/llui/lluiimage.h b/indra/llui/lluiimage.h index bdfc44262d..4ea0738026 100644 --- a/indra/llui/lluiimage.h +++ b/indra/llui/lluiimage.h @@ -109,6 +109,7 @@ namespace LLInitParam TypedParam(BlockDescriptor& descriptor, const char* name, super_t::value_assignment_t value, ParamDescriptor::validation_func_t func, S32 min_count, S32 max_count) : super_t(descriptor, name, value, func, min_count, max_count) { + setBlockFromValue(); } void setValueFromBlock() const; |