From d7bd769129100332791569cbffa07f54d2fca991 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Mon, 22 Sep 2025 15:46:04 +0300
Subject: #4715 disable ZoomIn an object item when the region is not connected
 to the current region

---
 indra/llui/lltextbase.cpp | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

(limited to 'indra/llui/lltextbase.cpp')

diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp
index 3fe0df1848..69729fa421 100644
--- a/indra/llui/lltextbase.cpp
+++ b/indra/llui/lltextbase.cpp
@@ -185,6 +185,7 @@ LLTextBase::LLTextBase(const LLTextBase::Params &p)
     mURLClickSignal(NULL),
     mIsFriendSignal(NULL),
     mIsObjectBlockedSignal(NULL),
+    mIsObjectReachableSignal(NULL),
     mMaxTextByteLength( p.max_text_length ),
     mFont(p.font),
     mFontShadow(p.font_shadow),
@@ -290,6 +291,7 @@ LLTextBase::~LLTextBase()
     delete mURLClickSignal;
     delete mIsFriendSignal;
     delete mIsObjectBlockedSignal;
+    delete mIsObjectReachableSignal;
 }
 
 void LLTextBase::initFromParams(const LLTextBase::Params& p)
@@ -2281,6 +2283,15 @@ void LLTextBase::createUrlContextMenu(S32 x, S32 y, const std::string &in_url)
                 unblockButton->setVisible(is_blocked);
             }
         }
+
+        if (mIsObjectReachableSignal)
+        {
+            bool is_reachable = *(*mIsObjectReachableSignal)(LLUUID(LLUrlAction::getObjectId(url)));
+            if (LLView* zoom_btn = menu->getChild<LLView>("zoom_in"))
+            {
+                zoom_btn->setEnabled(is_reachable);
+            }
+        }
         menu->show(x, y);
         LLMenuGL::showPopup(this, menu, x, y);
     }
@@ -3387,6 +3398,15 @@ boost::signals2::connection LLTextBase::setIsObjectBlockedCallback(const is_bloc
     return mIsObjectBlockedSignal->connect(cb);
 }
 
+boost::signals2::connection LLTextBase::setIsObjectReachableCallback(const is_obj_reachable_signal_t::slot_type& cb)
+{
+    if (!mIsObjectReachableSignal)
+    {
+        mIsObjectReachableSignal = new is_obj_reachable_signal_t();
+    }
+    return mIsObjectReachableSignal->connect(cb);
+}
+
 //
 // LLTextSegment
 //
-- 
cgit v1.2.3


From c2460e2dbd6dc3525703f5eb7312714716bb5bc8 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com>
Date: Tue, 23 Sep 2025 00:13:11 +0300
Subject: #4724 Fix performance problems with My Outfits

---
 indra/llui/lltextbase.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'indra/llui/lltextbase.cpp')

diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp
index 69729fa421..1de12896eb 100644
--- a/indra/llui/lltextbase.cpp
+++ b/indra/llui/lltextbase.cpp
@@ -1448,6 +1448,8 @@ void LLTextBase::reshape(S32 width, S32 height, bool called_from_parent)
         // up-to-date mVisibleTextRect
         updateRects();
 
+        // Todo: This might be wrong. updateRects already sets needsReflow conditionaly.
+        // Reflow is expensive and doing it at any twith can be too much.
         needsReflow();
     }
 }
-- 
cgit v1.2.3


From d23379939c73daa7236fd279458f6037f8baf57e Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com>
Date: Mon, 27 Oct 2025 22:13:34 +0200
Subject: #4879 An Emoji in a display name can affect text in chat

An emoji was spliting inlineview thus affecting displayed text.
---
 indra/llui/lltextbase.cpp | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

(limited to 'indra/llui/lltextbase.cpp')

diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp
index 1de12896eb..44151a4355 100644
--- a/indra/llui/lltextbase.cpp
+++ b/indra/llui/lltextbase.cpp
@@ -1038,8 +1038,37 @@ S32 LLTextBase::insertStringNoUndo(S32 pos, const LLWString &wstr, LLTextBase::s
     {
         LLStyleSP emoji_style;
         LLEmojiDictionary* ed = LLEmojiDictionary::instanceExists() ? LLEmojiDictionary::getInstance() : NULL;
+        LLTextSegment* segmentp = nullptr;
+        segment_vec_t::iterator seg_iter;
+        if (segments && segments->size() > 0)
+        {
+            seg_iter = segments->begin();
+            segmentp = *seg_iter;
+        }
         for (S32 text_kitty = 0, text_len = static_cast<S32>(wstr.size()); text_kitty < text_len; text_kitty++)
         {
+            if (segmentp)
+            {
+                if (segmentp->getEnd() <= pos + text_kitty)
+                {
+                    seg_iter++;
+                    if (seg_iter != segments->end())
+                    {
+                        segmentp = *seg_iter;
+                    }
+                    else
+                    {
+                        segmentp = nullptr;
+                    }
+                }
+                if (segmentp && !segmentp->getPermitsEmoji())
+                {
+                    // Some segments, like LLInlineViewSegment do not permit splitting
+                    // and should not be interrupted by emoji segments
+                    continue;
+                }
+            }
+
             llwchar code = wstr[text_kitty];
             bool isEmoji = ed ? ed->isEmoji(code) : LLStringOps::isEmoji(code);
             if (isEmoji)
@@ -3448,6 +3477,7 @@ S32 LLTextSegment::getNumChars(S32 num_pixels, S32 segment_offset, S32 line_offs
 void LLTextSegment::updateLayout(const LLTextBase& editor) {}
 F32 LLTextSegment::draw(S32 start, S32 end, S32 selection_start, S32 selection_end, const LLRectf& draw_rect) { return draw_rect.mLeft; }
 bool LLTextSegment::canEdit() const { return false; }
+bool LLTextSegment::getPermitsEmoji() const { return true; }
 void LLTextSegment::unlinkFromDocument(LLTextBase*) {}
 void LLTextSegment::linkToDocument(LLTextBase*) {}
 const LLUIColor& LLTextSegment::getColor() const { static const LLUIColor white = LLUIColorTable::instance().getColor("White", LLColor4::white); return white; }
-- 
cgit v1.2.3