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/llmultisliderctrl.cpp | |
| parent | 374deb8da13c63f80dc1b245488eb254eb86f5d2 (diff) | |
| parent | 6ef3f20933c5df684298bc1b8f338ce9dfd49070 (diff) | |
Merging due to changes since my last pull.
Diffstat (limited to 'indra/llui/llmultisliderctrl.cpp')
| -rw-r--r-- | indra/llui/llmultisliderctrl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llmultisliderctrl.cpp b/indra/llui/llmultisliderctrl.cpp index 0fbb7ced54..a9f462173d 100644 --- a/indra/llui/llmultisliderctrl.cpp +++ b/indra/llui/llmultisliderctrl.cpp @@ -98,7 +98,7 @@ LLMultiSliderCtrl::LLMultiSliderCtrl(const LLMultiSliderCtrl::Params& p) LLTextBox::Params params; params.name("MultiSliderCtrl Label"); params.rect(label_rect); - params.text(p.label); + params.initial_value(p.label()); params.font(p.font); mLabelBox = LLUICtrlFactory::create<LLTextBox> (params); addChild(mLabelBox); |