From 67a57fbd9278bd3dc13ffed4a0e50f43e03e9a9d Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Sun, 10 May 2026 23:56:32 +0200
Subject: [PATCH] Add missing changes

---
 indra/llui/llscrolllistctrl.cpp | 21 ++++++++-------------
 indra/llui/llscrolllistctrl.h   |  1 +
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/indra/llui/llscrolllistctrl.cpp b/indra/llui/llscrolllistctrl.cpp
index c6773e3c93..df7c18d3a4 100644
--- a/indra/llui/llscrolllistctrl.cpp
+++ b/indra/llui/llscrolllistctrl.cpp
@@ -62,6 +62,7 @@
 #include <boost/bind.hpp>
 
 #include "fsregistrarutils.h"
+#include <ranges>
 
 static LLDefaultChildRegistry::Register<LLScrollListCtrl> r("scroll_list");
 
@@ -447,20 +448,11 @@ S32 LLScrollListCtrl::getItemCount() const
     // <FS:Ansariel> Fix for FS-specific people list (radar)
     if (mIsFiltered)
     {
-        S32 count(0);
-        item_list::const_iterator iter;
-        for(iter = mItemList.begin(); iter != mItemList.end(); iter++)
-        {
-            LLScrollListItem* item  = *iter;
+        return (S32)std::ranges::count_if(mItemList, [&](const LLScrollListItem* item) {
             std::string filterColumnValue = item->getColumn(mFilterColumn)->getValue().asString();
             std::transform(filterColumnValue.begin(), filterColumnValue.end(), filterColumnValue.begin(), ::tolower);
-            if (filterColumnValue.find(mFilterString) == std::string::npos)
-            {
-                continue;
-            }
-            count++;
-        }
-        return count;
+            return filterColumnValue.find(mFilterString) != std::string::npos;
+            });
     }
     // </FS:Ansariel> Fix for FS-specific people list (radar)
 
@@ -1911,7 +1903,10 @@ void LLScrollListCtrl::draw()
 
     updateColumns();
 
-    mCommentText->setVisible(mItemList.empty());
+    // <FS:Ansariel> Fix for FS-specific people list (radar)
+    //mCommentText->setVisible(mItemList.empty());
+    mCommentText->setVisible(getItemCount() == 0);
+    // </FS:Ansariel>
 
     drawItems();
 
diff --git a/indra/llui/llscrolllistctrl.h b/indra/llui/llscrolllistctrl.h
index e8594d2d8e..0c8e8dd91e 100644
--- a/indra/llui/llscrolllistctrl.h
+++ b/indra/llui/llscrolllistctrl.h
@@ -352,6 +352,7 @@ public:
     void            setFilterString(const std::string& str);
     void            setFilterColumn(S32 col) { mFilterColumn = col; }
     bool            isFiltered(const LLScrollListItem* item) const;
+    bool            isFiltered() const { return mIsFiltered; }
     // </FS:Ansariel> Fix for FS-specific people list (radar)
 
     // support right-click context menus for avatar/group lists