diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-07 13:37:37 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-07 13:37:37 +0100 |
| commit | 988d797b31acd3ecd2a396e5679dd7e74104f855 (patch) | |
| tree | ed76f69f1dced3ff5072ecc0ed081f983a67f97e /indra/newview/llexpandabletextbox.cpp | |
| parent | b5e12269e18bc9074b96f115085d5540ef1d7545 (diff) | |
| parent | adce2ecdf8f3a0efcd4907699d286012124ac496 (diff) | |
merge from viewer-trunk
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); |