diff options
| author | callum <none@none> | 2010-10-11 16:37:27 -0700 |
|---|---|---|
| committer | callum <none@none> | 2010-10-11 16:37:27 -0700 |
| commit | 5a230f5eca6ba30eb53a2083cfd17769f6aee849 (patch) | |
| tree | 7a5fc2cdd81119b501f2e42189b9c4a74d67f167 /indra/llui | |
| parent | 34ca69949fa1bc67caa8cd0f8ed85d924303567a (diff) | |
| parent | b10744dbee7ffa64180f5558cac874e126045fc8 (diff) | |
Merge with head
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/llnotifications.cpp | 3 | ||||
| -rw-r--r-- | indra/llui/llnotifications.h | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/indra/llui/llnotifications.cpp b/indra/llui/llnotifications.cpp index 916ca24d13..133d12ff22 100644 --- a/indra/llui/llnotifications.cpp +++ b/indra/llui/llnotifications.cpp @@ -80,7 +80,8 @@ LLNotificationForm::FormButton::FormButton() LLNotificationForm::FormInput::FormInput() : type("type"), - width("width", 0) + width("width", 0), + value("value") {} LLNotificationForm::FormElement::FormElement() diff --git a/indra/llui/llnotifications.h b/indra/llui/llnotifications.h index 5298549b58..3b50d0b2b6 100644 --- a/indra/llui/llnotifications.h +++ b/indra/llui/llnotifications.h @@ -194,6 +194,7 @@ public: { Mandatory<std::string> type; Optional<S32> width; + Optional<std::string> value; FormInput(); }; |