summaryrefslogtreecommitdiff
path: root/indra/llui/llmultisliderctrl.cpp
diff options
context:
space:
mode:
authorMark Palange (Mani) <palange@lindenlab.com>2009-10-05 13:39:53 -0700
committerMark Palange (Mani) <palange@lindenlab.com>2009-10-05 13:39:53 -0700
commit81a63ac0886a31a566535a3483e5013f5bc0b424 (patch)
tree1bb0319755a5e26e0bc7f9f20632ae8f31538971 /indra/llui/llmultisliderctrl.cpp
parent0f5bbec3747f3ff2b1d580506d35dc080fcd1a98 (diff)
parent9818f158366a0df980a2e4b9251177d9a9209cfb (diff)
merge with latest from lindenlab/svn-imports-viewer-20
Diffstat (limited to 'indra/llui/llmultisliderctrl.cpp')
-rw-r--r--indra/llui/llmultisliderctrl.cpp2
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);