Merge branch 'main' into release/maint-c

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

1 files changed, 17 insertions, 0 deletions

diff --git a/indra/llui/llaccordionctrl.cpp b/indra/llui/llaccordionctrl.cpp
index 89969acb1b..3feb989ed5 100644
--- a/indra/llui/llaccordionctrl.cpp
+++ b/indra/llui/llaccordionctrl.cpp
@@ -936,3 +936,20 @@ S32 LLAccordionCtrl::calcExpandedTabHeight(S32 tab_index /* = 0 */, S32 availabl
     expanded_tab_height /= num_expanded;
     return expanded_tab_height;
 }
+
+void LLAccordionCtrl::collapseAllTabs()
+{
+    if (mAccordionTabs.size() > 0)
+    {
+        for (size_t i = 0; i < mAccordionTabs.size(); ++i)
+        {
+            LLAccordionCtrlTab *tab = mAccordionTabs[i];
+
+            if (tab->getDisplayChildren())
+            {
+                tab->setDisplayChildren(false);
+            }
+        }
+        arrange();
+    }
+}