diff options
author | Loren Shih <seraph@lindenlab.com> | 2010-04-01 17:54:08 -0400 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2010-04-01 17:54:08 -0400 |
commit | 2854008e8edd3419fe37a8c4971223eda5945bfa (patch) | |
tree | 83640a42fcc5f71200a19e173a95da433760cf74 /indra/newview/llexpandabletextbox.h | |
parent | 1ec47c39a6c4a6e7e518d0b91a87f50596362f06 (diff) | |
parent | 406b595e8c6811c2550340ba316328289d8b856f (diff) |
automated merge
Diffstat (limited to 'indra/newview/llexpandabletextbox.h')
-rw-r--r-- | indra/newview/llexpandabletextbox.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llexpandabletextbox.h b/indra/newview/llexpandabletextbox.h index 9d4a8aef76..5872592fae 100644 --- a/indra/newview/llexpandabletextbox.h +++ b/indra/newview/llexpandabletextbox.h @@ -54,7 +54,6 @@ protected: public: struct Params : public LLInitParam::Block<Params, LLTextEditor::Params> { - Mandatory<std::string> more_label; Params(); }; |