diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-07-27 19:37:18 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-27 19:37:18 +0300 |
| commit | 0a6f28209e2be86462428a6f779b465e3604e831 (patch) | |
| tree | b968655ced36ef127b028819e9edb509861a76ca /indra/llui/llmultisliderctrl.cpp | |
| parent | e008b44fd88be83426812e67707896e970947c49 (diff) | |
| parent | 817bc25b2732dc23295e6a7ac0da5ad142e33434 (diff) | |
Merge branch 'develop' into marchcat/b-develop
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 01e2fc6ac9..6b9a1b1c13 100644 --- a/indra/llui/llmultisliderctrl.cpp +++ b/indra/llui/llmultisliderctrl.cpp @@ -245,7 +245,7 @@ bool LLMultiSliderCtrl::setLabelArg( const std::string& key, const LLStringExpli res = mLabelBox->setTextArg(key, text); if (res && mLabelWidth == 0) { - S32 label_width = mFont->getWidth(mLabelBox->getText()); + S32 label_width = mFont->getWidth(mLabelBox->getWText().c_str()); LLRect rect = mLabelBox->getRect(); S32 prev_right = rect.mRight; rect.mRight = rect.mLeft + label_width; |