Merge brad/2549-downrez-controls into release/2024.09-ExtraFPS (#2864)

1 files changed, 11 insertions, 1 deletions

diff --git a/indra/newview/llviewertexteditor.cpp b/indra/newview/llviewertexteditor.cpp
index 14228b469f..210cd62d6f 100644
--- a/indra/newview/llviewertexteditor.cpp
+++ b/indra/newview/llviewertexteditor.cpp
@@ -179,6 +179,16 @@ public:
         mToolTip = inv_item->getName() + '\n' + inv_item->getDescription();
     }
 
+    /*virtual*/ LLTextSegmentPtr clone(LLTextBase& target) const
+    {
+        LLTextEditor* editor = dynamic_cast<LLTextEditor*>(&target);
+        llassert(editor);
+        if (!editor)
+            return nullptr;
+
+        return new LLEmbeddedItemSegment(mStart, mImage, mItem, *editor);
+    }
+
     /*virtual*/ bool getDimensionsF32(S32 first_char, S32 num_chars, F32& width, S32& height) const
     {
         if (num_chars == 0)
@@ -503,7 +513,7 @@ S32 LLEmbeddedItems::getIndexFromEmbeddedChar(llwchar wch)
     }
     else
     {
-        LL_WARNS() << "Embedded char " << wch << " not found, using 0" << LL_ENDL;
+        LL_WARNS() << "Embedded char " << (int)wch << " not found, using 0" << LL_ENDL;
         return 0;
     }
 }