diff options
| author | Alexander Gavriliuk <alexandrgproductengine@lindenlab.com> | 2024-09-04 16:31:39 +0200 |
|---|---|---|
| committer | Guru <alexandrgproductengine@lindenlab.com> | 2024-09-04 17:46:19 +0200 |
| commit | f1e0fc68e78d732ff433bb83c0c894ed23bbf3b2 (patch) | |
| tree | 6d8186b21996c895ce48a347fc4a548e1ab206f9 /indra | |
| parent | 2fc8d5ff3cfa1b9ad00b310cd4a6cdb557b9415c (diff) | |
#2471 The Destinations ComboBox on Login Screen... (quick fix)
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llui/llcombobox.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/llui/llcombobox.cpp b/indra/llui/llcombobox.cpp index b64794a244..a1c16ccdec 100644 --- a/indra/llui/llcombobox.cpp +++ b/indra/llui/llcombobox.cpp @@ -521,12 +521,16 @@ bool LLComboBox::setCurrentByIndex(S32 index) if (item->getEnabled()) { mList->selectItem(item, -1, true); + LLSD::String label = item->getColumn(0)->getValue().asString(); if (mTextEntry) { - LLSD::String label = item->getColumn(0)->getValue().asString(); mTextEntry->setText(label); mTextEntry->setTentative(false); } + if (!mAllowTextEntry) + { + mButton->setLabel(label); + } mLastSelectedIndex = index; return true; } |