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.cpp | |
| parent | 1ec47c39a6c4a6e7e518d0b91a87f50596362f06 (diff) | |
| parent | 406b595e8c6811c2550340ba316328289d8b856f (diff) | |
automated merge
Diffstat (limited to 'indra/newview/llexpandabletextbox.cpp')
| -rw-r--r-- | indra/newview/llexpandabletextbox.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llexpandabletextbox.cpp b/indra/newview/llexpandabletextbox.cpp index 362010d65a..149ba2478d 100644 --- a/indra/newview/llexpandabletextbox.cpp +++ b/indra/newview/llexpandabletextbox.cpp @@ -112,13 +112,12 @@ private: }; LLExpandableTextBox::LLTextBoxEx::Params::Params() -: more_label("more_label") { } LLExpandableTextBox::LLTextBoxEx::LLTextBoxEx(const Params& p) : LLTextEditor(p), - mExpanderLabel(p.more_label), + mExpanderLabel(p.label), mExpanderVisible(false) { setIsChrome(TRUE); |