Merge branch 'develop' into maxim/voice-moderation

Author: maxim-productengine

.github/labeler.yaml

@@ -1,81 +1,109 @@
 llappearance:
-  - indra/llappearance/**/*
+- changed-files:
+  - any-glob-to-any-file: indra/llappearance/**
 
 llaudio:
-  - indra/llaudio/**/*
+- changed-files:
+  - any-glob-to-any-file: indra/llaudio/**
 
 llcharacter:
-  - indra/llcharacter/**/*
+- changed-files:
+  - any-glob-to-any-file: indra/llcharacter/**
 
 llcommon:
-  - indra/llcommon/**/*
+- changed-files:
+  - any-glob-to-any-file: indra/llcommon/**
 
 llcorehttp:
-  - indra/llcorehttp/**/*
+- changed-files:
+  - any-glob-to-any-file: indra/llcorehttp/**
 
 llcrashlogger:
-  - indra/llcrashlogger/**/*
+- changed-files:
+  - any-glob-to-any-file: indra/llcrashlogger/**
 
 llfilesystem:
-  - indra/llfilesystem/**/*
+- changed-files:
+  - any-glob-to-any-file: indra/llfilesystem/**
 
 llimage:
-  - indra/llimage/**/*
+- changed-files:
+  - any-glob-to-any-file: indra/llimage/**
 
 llimagej2coj:
-  - indra/llimagej2coj/**/*
+- changed-files:
+  - any-glob-to-any-file: indra/llimagej2coj/**
 
 llinventory:
-  - indra/llinventory/**/*
+- changed-files:
+  - any-glob-to-any-file: indra/llinventory/**
 
 llkdu:
-  - indra/llkdu/**/*
+- changed-files:
+  - any-glob-to-any-file: indra/llkdu/**
 
 llmath:
-  - indra/llmath/**/*
+- changed-files:
+  - any-glob-to-any-file: indra/llmath/**
 
 llmeshoptimizer:
-  - indra/llmeshoptimizer/**/*
+- changed-files:
+  - any-glob-to-any-file: indra/llmeshoptimizer/**
 
 llmessage:
-  - indra/llmessage/**/*
+- changed-files:
+  - any-glob-to-any-file: indra/llmessage/**
 
 llplugin:
-  - indra/llplugin/**/*
+- changed-files:
+  - any-glob-to-any-file: indra/llplugin/**
 
 llprimitive:
-  - indra/llprimitive/**/*
+- changed-files:
+  - any-glob-to-any-file: indra/llprimitive/**
 
 llrender:
-  - indra/llrender/**/*
+- changed-files:
+  - any-glob-to-any-file: indra/llrender/**
 
 llui:
-  - indra/llui/**/*
+- changed-files:
+  - any-glob-to-any-file: indra/llui/**
 
 llwindow:
-  - indra/llwindow/**/*
+- changed-files:
+  - any-glob-to-any-file: indra/llwindow/**
 
 llxml:
-  - indra/llxml/**/*
+- changed-files:
+  - any-glob-to-any-file: indra/llxml/**
 
 cmake:
-  - '**/*.cmake'
-  - '**/*/cmake/*'
-  - '**/CMakeLists.txt'
+- changed-files:
+  - any-glob-to-any-file:
+    - '**/*.cmake'
+    - '**/*/cmake/*'
+    - '**/CMakeLists.txt'
 
 python:
-  - '**/*.py'
+- changed-files:
+  - any-glob-to-any-file: '**/*.py'
 
 c/cpp:
-  - '**/*.c'
-  - '**/*.cpp'
-  - '**/*.cxx'
-  - '**/*.h'
-  - '**/*.hpp'
-  - '**/*.hxx'
-  - '**/*.i'
-  - '**/*.inl'
-  - '**/*.y'
-
-'team:viewer':
-  - '*'
+- changed-files:
+  - any-glob-to-any-file:
+    - '**/*.c'
+    - '**/*.cpp'
+    - '**/*.cxx'
+    - '**/*.h'
+    - '**/*.hpp'
+    - '**/*.hxx'
+    - '**/*.i'
+    - '**/*.inl'
+    - '**/*.y'
+
+objc:
+- changed-files:
+  - any-glob-to-any-file:
+    - '**/*.m'
+    - '**/*.mm'

.github/workflows/build.yaml

@@ -91,7 +91,7 @@ jobs:
           ref: ${{ github.event.pull_request.head.sha || github.sha }}
 
       - name: Setup python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: "3.11"
       - name: Checkout build variables

.github/workflows/check-pr.yaml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check PR description
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
         with:
           script: |
             const description = context.payload.pull_request.body || '';

.github/workflows/cla.yaml

@@ -23,4 +23,4 @@ jobs:
           path-to-signatures: signatures.json
           remote-organization-name: secondlife
           remote-repository-name: cla-signatures
-          allowlist: [email protected],[email protected],rye
+          allowlist: [email protected],[email protected],rye,bot*

.github/workflows/label.yaml

@@ -9,7 +9,7 @@ jobs:
       pull-requests: write
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/labeler@v4
+      - uses: actions/labeler@v6
         with:
           configuration-path: .github/labeler.yaml
           repo-token: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/pre-commit.yaml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v5
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v6
         with:
           python-version: 3.x
       - uses: pre-commit/[email protected]

.github/workflows/tag-release.yaml

@@ -35,7 +35,7 @@ jobs:
           echo NIGHTLY_DATE=${NIGHTLY_DATE} >> ${GITHUB_ENV}
           echo TAG_ID="$(echo ${{ github.sha }} | cut -c1-8)-${{ inputs.project || '${NIGHTLY_DATE}' }}" >> ${GITHUB_ENV}
       - name: Update Tag
-        uses: actions/github-script@v7.0.1
+        uses: actions/github-script@v8
         with:
           # use a real access token instead of GITHUB_TOKEN default.
           # required so that the results of this tag creation can trigger the build workflow

indra/llui/llscrolllistcell.cpp

@@ -98,6 +98,7 @@ const LLSD LLScrollListCell::getAltValue() const
 LLScrollListIcon::LLScrollListIcon(const LLScrollListCell::Params& p)
 :   LLScrollListCell(p),
     mIcon(LLUI::getUIImage(p.value().asString())),
+    mIconSize(0),
     mColor(p.color),
     mAlignment(p.font_halign)
 {}
@@ -140,37 +141,56 @@ void LLScrollListIcon::setValue(const LLSD& value)
     }
 }
 
-
 void LLScrollListIcon::setColor(const LLColor4& color)
 {
     mColor = color;
 }
 
+void LLScrollListIcon::setIconSize(S32 size)
+{
+    mIconSize = size;
+}
+
 S32 LLScrollListIcon::getWidth() const
 {
     // if no specified fix width, use width of icon
-    if (LLScrollListCell::getWidth() == 0 && mIcon.notNull())
+    if (LLScrollListCell::getWidth() != 0)
+    {
+        return LLScrollListCell::getWidth();
+    }
+    if (mIconSize != 0)
+    {
+        return mIconSize;
+    }
+    if (mIcon.notNull())
     {
         return mIcon->getWidth();
     }
-    return LLScrollListCell::getWidth();
+    return 0;
 }
 
 
 void LLScrollListIcon::draw(const LLColor4& color, const LLColor4& highlight_color)
 {
     if (mIcon)
     {
+        S32 draw_width = mIcon->getWidth();
+        S32 draw_height = mIcon->getHeight();
+        if (mIconSize != 0)
+        {
+            draw_width = mIconSize;
+            draw_height = mIconSize;
+        } // else will draw full icon even if cell is smaller
         switch(mAlignment)
         {
         case LLFontGL::LEFT:
-            mIcon->draw(0, 0, mColor);
+            mIcon->draw(0, 0, draw_width, draw_height, mColor);
             break;
         case LLFontGL::RIGHT:
-            mIcon->draw(getWidth() - mIcon->getWidth(), 0, mColor);
+            mIcon->draw(getWidth() - draw_width, 0, draw_width, draw_height, mColor);
             break;
         case LLFontGL::HCENTER:
-            mIcon->draw((getWidth() - mIcon->getWidth()) / 2, 0, mColor);
+            mIcon->draw((getWidth() - draw_width) / 2, 0, draw_width, draw_height, mColor);
             break;
         default:
             break;

indra/llui/llscrolllistcell.h

@@ -197,11 +197,13 @@ class LLScrollListIcon : public LLScrollListCell
     /*virtual*/ const LLSD      getValue() const;
     /*virtual*/ void    setColor(const LLColor4&);
     /*virtual*/ void    setValue(const LLSD& value);
+    void                setIconSize(S32 size);
 
 private:
     LLPointer<LLUIImage>    mIcon;
     LLColor4                mColor;
     LLFontGL::HAlign        mAlignment;
+    S32                     mIconSize;
 };
 
 

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; }