diff options
author | Leyla Farazha <leyla@lindenlab.com> | 2010-09-16 12:02:24 -0700 |
---|---|---|
committer | Leyla Farazha <leyla@lindenlab.com> | 2010-09-16 12:02:24 -0700 |
commit | 60db8577a90be3ea3d4a06ab06232802be953286 (patch) | |
tree | 0fcedbdf478b3f518a0d5dc69b7d234406355d75 /indra/llui/lllineeditor.h | |
parent | ae623c8068145f968f09ccf9bbdd90e993ca4283 (diff) | |
parent | 1dbcc3fff79b55038178e493df0cc0c3a4d66221 (diff) |
Merge
Diffstat (limited to 'indra/llui/lllineeditor.h')
-rw-r--r-- | indra/llui/lllineeditor.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/indra/llui/lllineeditor.h b/indra/llui/lllineeditor.h index b988bc412e..a1aa6b71c6 100644 --- a/indra/llui/lllineeditor.h +++ b/indra/llui/lllineeditor.h @@ -59,13 +59,13 @@ public: typedef boost::function<void (LLLineEditor* caller)> keystroke_callback_t; - struct MaxLength : public LLInitParam::Choice<MaxLength>
- {
- Alternative<S32> bytes, chars;
-
- MaxLength() : bytes("max_length_bytes", 254),
- chars("max_length_chars", 0)
- {}
+ struct MaxLength : public LLInitParam::Choice<MaxLength> + { + Alternative<S32> bytes, chars; + + MaxLength() : bytes("max_length_bytes", 254), + chars("max_length_chars", 0) + {} }; struct Params : public LLInitParam::Block<Params, LLUICtrl::Params> |