diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-08-31 21:25:47 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-09-01 20:43:42 +0800 |
| commit | 95582654e49422d51b55665c3f2821c848ad1cb8 (patch) | |
| tree | d6d03a887b8e1b6c3be1b139d63b1638c5d0fdcd /indra/llui/llsliderctrl.h | |
| parent | ab3f483a3e5ed213882a83b882095cfdb6a4de57 (diff) | |
| parent | b0fefd62adbf51f32434ba077e9f52d8a9241d15 (diff) | |
Merge remote-tracking branch 'secondlife/release/2024.08-DeltaFPS' into 2024.08-DeltaFPS
Diffstat (limited to 'indra/llui/llsliderctrl.h')
| -rw-r--r-- | indra/llui/llsliderctrl.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/llsliderctrl.h b/indra/llui/llsliderctrl.h index a55e3bf6e9..311377a61f 100644 --- a/indra/llui/llsliderctrl.h +++ b/indra/llui/llsliderctrl.h @@ -107,8 +107,8 @@ public: F32 getMaxValue() const { return mSlider->getMaxValue(); } void setLabel(const LLStringExplicit& label) { if (mLabelBox) mLabelBox->setText(label); } - void setLabelColor(const LLColor4& c) { mTextEnabledColor = c; } - void setDisabledLabelColor(const LLColor4& c) { mTextDisabledColor = c; } + void setLabelColor(const LLUIColor& c) { mTextEnabledColor = c; } + void setDisabledLabelColor(const LLUIColor& c) { mTextDisabledColor = c; } boost::signals2::connection setSliderMouseDownCallback( const commit_signal_t::slot_type& cb ); boost::signals2::connection setSliderMouseUpCallback( const commit_signal_t::slot_type& cb ); |