diff options
| author | Richard Linden <none@none> | 2010-02-12 11:23:20 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-02-12 11:23:20 -0800 |
| commit | e2ea636fe9a922380e65dccdacdd6a98afef8c29 (patch) | |
| tree | 5ab224cbb732a9e1682066e0d0cd6e3172c612df /indra/llui | |
| parent | dc8a9dc57d41723338a0881a29c5652924977ccf (diff) | |
| parent | 7d8e415e2e8bfc475bd36de12ce72c1e029c8ee6 (diff) | |
merge
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/llui.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/llui.h b/indra/llui/llui.h index 5840e76f5c..af8d4ea03b 100644 --- a/indra/llui/llui.h +++ b/indra/llui/llui.h @@ -426,8 +426,8 @@ namespace LLInitParam { typedef BlockValue<const LLFontGL*> super_t; public: - Mandatory<std::string> name; - Optional<std::string> size, + Optional<std::string> name, + size, style; TypedParam(BlockDescriptor& descriptor, const char* name, const LLFontGL* const value, ParamDescriptor::validation_func_t func, S32 min_count, S32 max_count); |