From f1e0fc68e78d732ff433bb83c0c894ed23bbf3b2 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Wed, 4 Sep 2024 16:31:39 +0200
Subject: #2471 The Destinations ComboBox on Login Screen... (quick fix)

---
 indra/llui/llcombobox.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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;
         }
-- 
cgit v1.2.3