diff options
author | Monroe Linden <monroe@lindenlab.com> | 2009-10-05 15:50:24 -0700 |
---|---|---|
committer | Monroe Linden <monroe@lindenlab.com> | 2009-10-05 15:50:24 -0700 |
commit | 39ee2367a7e771890017fc3d663780437ea69bb2 (patch) | |
tree | b84c3ade59dba5ae032a3123afb9c3c5f78c9b68 /indra/llui/llcheckboxctrl.cpp | |
parent | 374deb8da13c63f80dc1b245488eb254eb86f5d2 (diff) | |
parent | 6ef3f20933c5df684298bc1b8f338ce9dfd49070 (diff) |
Merging due to changes since my last pull.
Diffstat (limited to 'indra/llui/llcheckboxctrl.cpp')
-rw-r--r-- | indra/llui/llcheckboxctrl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llcheckboxctrl.cpp b/indra/llui/llcheckboxctrl.cpp index 455b17ffc7..7f0f9751db 100644 --- a/indra/llui/llcheckboxctrl.cpp +++ b/indra/llui/llcheckboxctrl.cpp @@ -97,7 +97,7 @@ LLCheckBoxCtrl::LLCheckBoxCtrl(const LLCheckBoxCtrl::Params& p) LLTextBox::Params tbparams = p.label_text; tbparams.rect(label_rect); - tbparams.text(local_label); + tbparams.initial_value(local_label); if (p.font.isProvided()) { tbparams.font(p.font); |