diff options
| author | Alexander Gavriliuk <alexandrgproductengine@lindenlab.com> | 2024-09-04 16:31:39 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-09-20 18:13:45 +0300 |
| commit | 4274eb591a1b0806f8c73ca16df65ade60db2200 (patch) | |
| tree | d0878954059f0ac1a0012784708b2ced41fc3f97 | |
| parent | b111dce31a48e1329f30366c2a5541c1434d362b (diff) | |
#2471 The Destinations ComboBox on Login Screen... (quick fix)
| -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; } |