diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-07-19 09:13:05 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-07-19 09:13:05 +0100 |
| commit | bfdfff3f0743550a8f8b42e8959df909c200a073 (patch) | |
| tree | 277dc5b477cad2804b5bcfc0ab091a4378ea5b0b /indra/newview/llexpandabletextbox.cpp | |
| parent | b36abda510c3d48d95199c0ce810d2cb9c223644 (diff) | |
| parent | 053fa9dc9a0ed2cedaa33b1aee4615adc04e909d (diff) | |
merge from PE's viewer-public
Diffstat (limited to 'indra/newview/llexpandabletextbox.cpp')
| -rw-r--r-- | indra/newview/llexpandabletextbox.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llexpandabletextbox.cpp b/indra/newview/llexpandabletextbox.cpp index 92fda31cc2..8ccc5fb248 100644 --- a/indra/newview/llexpandabletextbox.cpp +++ b/indra/newview/llexpandabletextbox.cpp @@ -34,6 +34,7 @@ #include "llexpandabletextbox.h" #include "llscrollcontainer.h" +#include "lltrans.h" #include "llwindow.h" #include "llviewerwindow.h" @@ -117,7 +118,7 @@ LLExpandableTextBox::LLTextBoxEx::Params::Params() LLExpandableTextBox::LLTextBoxEx::LLTextBoxEx(const Params& p) : LLTextEditor(p), - mExpanderLabel(p.label), + mExpanderLabel(p.label.isProvided() ? p.label : LLTrans::getString("More")), mExpanderVisible(false) { setIsChrome(TRUE); |