diff options
| author | Richard Linden <none@none> | 2010-02-09 17:20:42 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-02-09 17:20:42 -0800 |
| commit | 7d8e415e2e8bfc475bd36de12ce72c1e029c8ee6 (patch) | |
| tree | 21f551849f27e83d8d581464a36a6eb7565a34d8 | |
| parent | 22193b15b82d1a6f0ce8846d122bf3ddcefbf13e (diff) | |
| parent | b1099e21600c8d2c4584ef8f3696ddc5f42c936b (diff) | |
merge
| -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); |