Merge branch 'main' into release/maint-c

# Conflicts:
#	indra/llui/lltexteditor.cpp
#	indra/newview/llcontrolavatar.cpp

1 files changed, 7 insertions, 10 deletions

diff --git a/indra/llui/llcombobox.cpp b/indra/llui/llcombobox.cpp
index 1573ccb0d7..71dd93d07d 100644
--- a/indra/llui/llcombobox.cpp
+++ b/indra/llui/llcombobox.cpp
@@ -188,6 +188,8 @@ LLComboBox::~LLComboBox()
     // explicitly disconect this signal, since base class destructor might fire top lost
     mTopLostSignalConnection.disconnect();
     mImageLoadedConnection.disconnect();
+
+    LLUI::getInstance()->removePopup(this);
 }
 
 
@@ -482,8 +484,6 @@ void LLComboBox::onFocusLost()
 
 void LLComboBox::setButtonVisible(BOOL visible)
 {
-    static LLUICachedControl<S32> drop_shadow_button ("DropShadowButton", 0);
-
     mButton->setVisible(visible);
     if (mTextEntry)
     {
@@ -491,7 +491,7 @@ void LLComboBox::setButtonVisible(BOOL visible)
         if (visible)
         {
             S32 arrow_width = mArrowImage ? mArrowImage->getWidth() : 0;
-            text_entry_rect.mRight -= llmax(8,arrow_width) + 2 * drop_shadow_button;
+            text_entry_rect.mRight -= llmax(8,arrow_width) + 2 * BTN_DROP_SHADOW;
         }
         //mTextEntry->setRect(text_entry_rect);
         mTextEntry->reshape(text_entry_rect.getWidth(), text_entry_rect.getHeight(), TRUE);
@@ -530,19 +530,18 @@ void LLComboBox::setEnabledByValue(const LLSD& value, BOOL enabled)
 
 void LLComboBox::createLineEditor(const LLComboBox::Params& p)
 {
-    static LLUICachedControl<S32> drop_shadow_button ("DropShadowButton", 0);
     LLRect rect = getLocalRect();
     if (mAllowTextEntry)
     {
         S32 arrow_width = mArrowImage ? mArrowImage->getWidth() : 0;
-        S32 shadow_size = drop_shadow_button;
+        S32 shadow_size = BTN_DROP_SHADOW;
         mButton->setRect(LLRect( getRect().getWidth() - llmax(8,arrow_width) - 2 * shadow_size,
                                 rect.mTop, rect.mRight, rect.mBottom));
         mButton->setTabStop(FALSE);
         mButton->setHAlign(LLFontGL::HCENTER);
 
         LLRect text_entry_rect(0, getRect().getHeight(), getRect().getWidth(), 0);
-        text_entry_rect.mRight -= llmax(8,arrow_width) + 2 * drop_shadow_button;
+        text_entry_rect.mRight -= llmax(8,arrow_width) + 2 * BTN_DROP_SHADOW;
         // clear label on button
         std::string cur_label = mButton->getLabelSelected();
         LLLineEditor::Params params = p.combo_editor;
@@ -1081,13 +1080,11 @@ void LLComboBox::onSetHighlight() const
 
 void LLComboBox::imageLoaded()
 {
-    static LLUICachedControl<S32> drop_shadow_button("DropShadowButton", 0);
-
     if (mAllowTextEntry)
     {
         LLRect rect = getLocalRect();
         S32 arrow_width = mArrowImage ? mArrowImage->getWidth() : 0;
-        S32 shadow_size = drop_shadow_button;
+        S32 shadow_size = BTN_DROP_SHADOW;
         mButton->setRect(LLRect(getRect().getWidth() - llmax(8, arrow_width) - 2 * shadow_size,
             rect.mTop, rect.mRight, rect.mBottom));
         if (mButton->getVisible())
@@ -1096,7 +1093,7 @@ void LLComboBox::imageLoaded()
             if (mTextEntry)
             {
                 LLRect text_entry_rect(0, getRect().getHeight(), getRect().getWidth(), 0);
-                text_entry_rect.mRight -= llmax(8, arrow_width) + 2 * drop_shadow_button;
+                text_entry_rect.mRight -= llmax(8, arrow_width) + 2 * BTN_DROP_SHADOW;
                 mTextEntry->reshape(text_entry_rect.getWidth(), text_entry_rect.getHeight(), TRUE);
             }
         }